openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Andrea Bolognani 2017-03-02 15:40:29 +01:00
parent f9f29928ee
commit 5b78337992
16 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/qemu/qemu_capabilities.c
View File

@ -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);

2
src/qemu/qemu_capabilities.h
View File

@ -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 */

1
tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View File

@ -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'/>

3
tests/qemuxml2argvtest.c
View File

@ -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: