[libvirt] [PATCH 1/9] qemu: always assume QEMU_CAPS_PCI_CONFIGFD

At the time of its addition in QEMU commit v1.3.0-rc0~572^2 the configfd argument was already supported. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 3 +-- src/qemu/qemu_hotplug.c | 3 +-- 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.10.0.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 - 15 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a075677421..222c344c97 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1193,7 +1193,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioSCSI[] = { }; static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = { - { "configfd", QEMU_CAPS_PCI_CONFIGFD }, { "bootindex", QEMU_CAPS_PCI_BOOTINDEX }, }; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3d3a978759..b8c6dfe54b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -98,7 +98,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 35 */ X_QEMU_CAPS_TDF, /* -tdf flag (user-mode pit catchup) */ - QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */ + X_QEMU_CAPS_PCI_CONFIGFD, /* pci-assign.configfd */ X_QEMU_CAPS_NODEFCONFIG, /* -nodefconfig */ X_QEMU_CAPS_BOOT_MENU, /* -boot menu=on support */ X_QEMU_CAPS_ENABLE_KQEMU, /* -enable-kqemu flag */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c9e3a91e32..6436086560 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5400,8 +5400,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd, bootIndex = *bootHostdevNet; *bootHostdevNet = 0; } - if ((backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_CONFIGFD)) { + if (backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { int configfd = qemuOpenPCIConfig(hostdev); if (configfd >= 0) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a30cb1f1a0..633e7fc18f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1644,8 +1644,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) goto error; releaseaddr = true; - if (backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_PCI_CONFIGFD)) { + if (backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) { configfd = qemuOpenPCIConfig(hostdev); if (configfd >= 0) { if (virAsprintf(&configfd_name, "fd-%s", info->alias) < 0) diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 243f3dcdef..122f324668 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='no-hpet'/> - <flag name='pci-configfd'/> <flag name='spice'/> <flag name='hda-duplex'/> <flag name='pci-bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 68c1384cf9..7e7981ccfd 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='no-hpet'/> - <flag name='pci-configfd'/> <flag name='spice'/> <flag name='hda-duplex'/> <flag name='pci-bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index d29ee50719..a118d466fd 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='no-hpet'/> - <flag name='pci-configfd'/> <flag name='spice'/> <flag name='hda-duplex'/> <flag name='pci-bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index f48f78005b..d3575aaea0 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='no-hpet'/> - <flag name='pci-configfd'/> <flag name='spice'/> <flag name='hda-duplex'/> <flag name='pci-bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 0896de4a06..236fb8a138 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='no-hpet'/> - <flag name='pci-configfd'/> <flag name='spice'/> <flag name='hda-duplex'/> <flag name='pci-bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 41c2f27f63..be6ae99d61 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='no-hpet'/> - <flag name='pci-configfd'/> <flag name='spice'/> <flag name='hda-duplex'/> <flag name='pci-bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 62dbcec155..662d714512 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='no-hpet'/> - <flag name='pci-configfd'/> <flag name='spice'/> <flag name='hda-duplex'/> <flag name='pci-bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index e7a283d45e..c215ec2997 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='no-hpet'/> - <flag name='pci-configfd'/> <flag name='spice'/> <flag name='hda-duplex'/> <flag name='pci-bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 8d43092c86..1e9b9bfd4e 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='no-hpet'/> - <flag name='pci-configfd'/> <flag name='spice'/> <flag name='hda-duplex'/> <flag name='pci-bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 6f0403ba48..fd6cea9995 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='no-hpet'/> - <flag name='pci-configfd'/> <flag name='spice'/> <flag name='hda-duplex'/> <flag name='pci-bootindex'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 37ddad077c..e0e4da9b4e 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -5,7 +5,6 @@ <usedQMP/> <flag name='kvm'/> <flag name='no-hpet'/> - <flag name='pci-configfd'/> <flag name='spice'/> <flag name='hda-duplex'/> <flag name='pci-bootindex'/> -- 2.16.4