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

This commit is contained in:
Cole Robinson 2013-07-30 18:56:15 -04:00
parent 3a2beaee1d
commit 68e5e93e4e

View File

@ -1773,6 +1773,16 @@ cleanup:
return ret; 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 int
qemuDomainAssignPCIAddresses(virDomainDefPtr def, qemuDomainAssignPCIAddresses(virDomainDefPtr def,
@ -1838,8 +1848,10 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, false))) if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, false)))
goto cleanup; goto cleanup;
if (qemuAssignDevicePCISlots(def, qemuCaps, addrs) < 0) if (qemuDomainSupportsPCI(def)) {
goto cleanup; if (qemuAssignDevicePCISlots(def, qemuCaps, addrs) < 0)
goto cleanup;
}
} }
if (obj && obj->privateData) { if (obj && obj->privateData) {