From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 30 Jul 2013 22:56:15 +0000 (-0400)
Subject: qemu: Don't try to allocate PCI addresses for ARM
X-Git-Tag: CVE-2013-4297~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68e5e93e4e8b2d6481df7f8b3b9fb20f361a5526;p=thirdparty%2Flibvirt.git

qemu: Don't try to allocate PCI addresses for ARM
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f0e348976e..e62d43aac5 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -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) {