qemu: always assume QEMU_CAPS_PCI_CONFIGFD

At the time of the addition of 'pci-assign' in QEMU commit
v1.3.0-rc0~572^2 the configfd argument was already supported.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 408b0bb4e6754bd6e2402e1902bd88936e3f55e5..7391d217b1494a1289f8374884f878109bf14eb6 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1192,7 +1192,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 de4cedf6a692472d50c9a56ed022a73785eed52a..416db3bc146a0d8ab71e2e0d91ccc5f1d6cb8031 100644 (file)
--- 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 c9e3a91e320e7369def37c8fc62256de63346647..64360865601927b8573a5cf377761c49e54ae6ee 100644 (file)
--- 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 a30cb1f1a07a76f35c61a3bbd2b4f00cb7d892ee..633e7fc18f8174a3f45efc175bac82fa88af0651 100644 (file)
--- 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 102c5c35a920541d268617bf743f7a7c4c7db152..0af377b521386bfb126cd0083bd75e08bb4cb0af 100644 (file)
--- 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 d7d6fbafdd72ea8ee73f9435a8fc2bc29e017718..465ec07bc4a7f17c5772507cc6b5c9bfdb14d4c7 100644 (file)
--- 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 833d748ee07bd8a7ed5a75357320b4f057a8e155..ba866f8cd7c302027674d174674ea3fdee11170f 100644 (file)
--- 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 52911b36ef7f9822f6a1651db38e8b76975b0bf3..432546b0100b3e1f6f19b415bfe157780e9de0f4 100644 (file)
--- 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 1dca29b89a9851a001addcf98ec65f0f3e9d3b36..efabdc5403d91c9bd13693a99b11974cb55b42b4 100644 (file)
--- 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 b705ae34bd58121d979f3d7596ac49b0ab048780..1232692f3c3cbd3b03aa26826736847c54b12fbb 100644 (file)
--- 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 55b389e3cad6ceb4cbf0037e80ca6966e45d2826..9cac24bedf57cead7f96c39bf45ee7088f2fc71a 100644 (file)
--- 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 cb26eb292f261bb667c74c8b64c7ee0e60d243a6..da873789817432df5e895bc954d959e89c7b7503 100644 (file)
--- 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 2efcf5f2dd94877432a039211d8222945985bf7a..ce92b24d3eb79c6b4381565ecbb1ee8b85291c1c 100644 (file)
--- 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 1804de671109f68e5f169b2d906e548142f7f5ce..c9a4eccc7964446aa78776c25192592ddb4e185c 100644 (file)
--- 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 8088ab55626499f5e24dacf789b0a0fff15cd4ae..f6eaaf1b8186ff53b12949f08fd743b967d0b76d 100644 (file)
--- 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'/>