]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Don't try to allocate PCI addresses for ARM
authorCole Robinson <crobinso@redhat.com>
Tue, 30 Jul 2013 22:56:15 +0000 (18:56 -0400)
committerCole Robinson <crobinso@redhat.com>
Mon, 2 Sep 2013 20:53:40 +0000 (16:53 -0400)
src/qemu/qemu_command.c

index f0e348976ecf91f0dad84350033a61c11242e2ef..e62d43aac5aed5f8093ed85674a81569db49af6f 100644 (file)
@@ -1773,6 +1773,16 @@ cleanup:
     return ret;
 }
 
+static bool
+qemuDomainSupportsPCI(virDomainDefPtr def) {
+    if (def->os.arch != VIR_ARCH_ARMV7L)
+        return true;
+
+    if (STREQ(def->os.machine, "versatilepb"))
+        return true;
+
+    return false;
+}
 
 int
 qemuDomainAssignPCIAddresses(virDomainDefPtr def,
@@ -1838,8 +1848,10 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
         if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, false)))
             goto cleanup;
 
-        if (qemuAssignDevicePCISlots(def, qemuCaps, addrs) < 0)
-            goto cleanup;
+        if (qemuDomainSupportsPCI(def)) {
+            if (qemuAssignDevicePCISlots(def, qemuCaps, addrs) < 0)
+                goto cleanup;
+        }
     }
 
     if (obj && obj->privateData) {