diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 09a5570312..b8d64290bc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10085,6 +10085,28 @@ qemuDomainNeedsFDC(const virDomainDef *def) } +bool +qemuDomainSupportsPCI(virDomainDefPtr def, + virQEMUCapsPtr qemuCaps) +{ + if ((def->os.arch != VIR_ARCH_ARMV6L) && + (def->os.arch != VIR_ARCH_ARMV7L) && + (def->os.arch != VIR_ARCH_AARCH64) && + !ARCH_IS_RISCV(def->os.arch)) + return true; + + if (STREQ(def->os.machine, "versatilepb")) + return true; + + if ((qemuDomainIsARMVirt(def) || + qemuDomainIsRISCVVirt(def)) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX)) + return true; + + return false; +} + + static bool qemuCheckMemoryDimmConflict(const virDomainDef *def, const virDomainMemoryDef *mem) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b934fe3088..7c6b50184c 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -847,6 +847,8 @@ bool qemuDomainHasPCIRoot(const virDomainDef *def); bool qemuDomainHasPCIeRoot(const virDomainDef *def); bool qemuDomainHasBuiltinIDE(const virDomainDef *def); bool qemuDomainNeedsFDC(const virDomainDef *def); +bool qemuDomainSupportsPCI(virDomainDefPtr def, + virQEMUCapsPtr qemuCaps); void qemuDomainUpdateCurrentMemorySize(virDomainObjPtr vm); diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index c35ecd8585..32fdd59566 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2356,28 +2356,6 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, } -static bool -qemuDomainSupportsPCI(virDomainDefPtr def, - virQEMUCapsPtr qemuCaps) -{ - if ((def->os.arch != VIR_ARCH_ARMV6L) && - (def->os.arch != VIR_ARCH_ARMV7L) && - (def->os.arch != VIR_ARCH_AARCH64) && - !ARCH_IS_RISCV(def->os.arch)) - return true; - - if (STREQ(def->os.machine, "versatilepb")) - return true; - - if ((qemuDomainIsARMVirt(def) || - qemuDomainIsRISCVVirt(def)) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX)) - return true; - - return false; -} - - static void qemuDomainPCIControllerSetDefaultModelName(virDomainControllerDefPtr cont, virDomainDefPtr def,