[libvirt] [PATCH 1/2] qemu: Drop QEMU_CAPS_PCI_MULTIBUS

Due to the extra architecture-specific logic, it's already necessary for users to call virQEMUCapsHasPCIMultiBus(), so the capability itself is just a pointless distraction. --- src/qemu/qemu_capabilities.c | 28 ++++-------------------- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 3 --- 16 files changed, 5 insertions(+), 41 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6f60a00..17964a1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2268,9 +2268,9 @@ virQEMUCapsGet(virQEMUCapsPtr qemuCaps, bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps, virDomainDefPtr def) { - bool hasMultiBus = virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); - - if (hasMultiBus) + /* x86_64 and i686 support PCI-multibus on all machine types + * since forever */ + if (ARCH_IS_X86(qemuCaps->arch)) return true; if (def->os.arch == VIR_ARCH_PPC || @@ -3913,17 +3913,6 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid, const c qmperr) < 0) goto cleanup; - /* x86_64 and i686 support PCI-multibus on all machine types - * since forever. For other architectures, it has been changing - * across releases, per machine type, so we can't simply detect - * it here. Thus the rest of the logic is provided in a separate - * helper virQEMUCapsHasPCIMultiBus() which keys off the machine - * stored in virDomainDef and QEMU version number - */ - if (qemuCaps->arch == VIR_ARCH_X86_64 || - qemuCaps->arch == VIR_ARCH_I686) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); - /* -no-acpi is not supported on non-x86 * even if qemu reports it in -help */ if (qemuCaps->arch != VIR_ARCH_X86_64 && @@ -4025,18 +4014,9 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, goto cleanup; } - /* x86_64 and i686 support PCI-multibus on all machine types - * since forever. For other architectures, it has been changing - * across releases, per machine type, so we can't simply detect - * it here. Thus the rest of the logic is provided in a separate - * helper virQEMUCapsHasPCIMultiBus() which keys off the machine - * stored in virDomainDef and QEMU version number - * - * ACPI/HPET/KVM PIT are also x86 specific - */ + /* ACPI/HPET/KVM PIT are x86 specific */ if (qemuCaps->arch == VIR_ARCH_X86_64 || qemuCaps->arch == VIR_ARCH_I686) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0f998c4..f469736 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -119,7 +119,7 @@ typedef enum { /* 50 */ QEMU_CAPS_HDA_DUPLEX, /* -device hda-duplex */ QEMU_CAPS_DRIVE_AIO, /* -drive aio= supported */ - QEMU_CAPS_PCI_MULTIBUS, /* bus=pci.0 vs bus=pci */ + X_QEMU_CAPS_PCI_MULTIBUS, /* bus=pci.0 vs bus=pci */ QEMU_CAPS_PCI_BOOTINDEX, /* pci-assign.bootindex */ QEMU_CAPS_CCID_EMULATED, /* -device ccid-card-emulated */ diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml index 6ea39c6..f258c5f 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml @@ -24,7 +24,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> <flag name='chardev-spicevmc'/> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index aeb5cef..bc76818 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 5b41244..ef48400 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index d7c0b17..96b6fdb 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 25b9f56..5181d85 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 1323a0c..3fbc256 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index f47aa84..f3635d9 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 9248a06..b1b9e15 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 96e62d3..2e23a93 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index faddd50..1286f84 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index c789f0e..0c0b423 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index caa14c4..d650f09 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index dcdc0e6..1025365 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -25,7 +25,6 @@ <flag name='boot-index'/> <flag name='hda-duplex'/> <flag name='drive-aio'/> - <flag name='pci-multibus'/> <flag name='pci-bootindex'/> <flag name='ccid-emulated'/> <flag name='ccid-passthru'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ad9ce8e..3284f40 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -388,9 +388,6 @@ testUpdateQEMUCaps(const struct testInfo *info, virQEMUCapsFilterByMachineType(info->qemuCaps, vm->def->os.machine); - if (ARCH_IS_X86(vm->def->os.arch)) - virQEMUCapsSet(info->qemuCaps, QEMU_CAPS_PCI_MULTIBUS); - ret = 0; cleanup: -- 2.7.4