qemu: Drop QEMU_CAPS_PCI_ROMBAR

The only QEMU versions that don't have such capability are <0.12,
which we no longer support anyway.

Additionally, this solves the issue of some QEMU binaries being
reported as not having such capability just because they lacked
the {kvm-}pci-assign QMP object.

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 611fab00daff634891f258c73319c5f9dfec6238..8098416be5035da7018e663c706a186cba8dab07 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1303,19 +1303,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
     if (version >= 13000)
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIFUNCTION);
 
-    /* Although very new versions of qemu advertise the presence of
-     * the rombar option in the output of "qemu -device pci-assign,?",
-     * this advertisement was added to the code long after the option
-     * itself. According to qemu developers, though, rombar is
-     * available in all qemu binaries from release 0.12 onward.
-     * Setting the capability this way makes it available in more
-     * cases where it might be needed, and shouldn't cause any false
-     * positives (in the case that it did, qemu would produce an error
-     * log and refuse to start, so it would be immediately obvious).
-     */
-    if (version >= 12000)
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_ROMBAR);
-
     if (version >= 11000)
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_HOST);
 
@@ -1614,7 +1601,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioSCSI[] = {
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsPCIAssign[] = {
-    { "rombar", QEMU_CAPS_PCI_ROMBAR },
     { "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 9145f2d2ba9dbbb9004c932bf1720394d55735f4..2d8f82ddf77367ba403b78b1ff275fbaf6f9e1ff 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -152,7 +152,7 @@ typedef enum {
 
     /* 75 */
     QEMU_CAPS_DRIVE_CACHE_UNSAFE, /* Is cache=unsafe supported? */
-    QEMU_CAPS_PCI_ROMBAR, /* -device rombar=0|1 */
+    X_QEMU_CAPS_PCI_ROMBAR, /* -device rombar=0|1 */
     QEMU_CAPS_ICH9_AHCI, /* -device ich9-ahci */
     QEMU_CAPS_NO_ACPI, /* -no-acpi */
     QEMU_CAPS_FSDEV_READONLY, /* -fsdev readonly supported */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f786462c6bed3e6b89de7d334f4bd86d4becc5d4..fc92b7d1232b7b70f86d51e773c27d4392c7e7bd 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -508,8 +508,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
 
 static int
 qemuBuildRomStr(virBufferPtr buf,
-                virDomainDeviceInfoPtr info,
-                virQEMUCapsPtr qemuCaps)
+                virDomainDeviceInfoPtr info)
 {
     if (info->rombar || info->romfile) {
         if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
@@ -517,11 +516,6 @@ qemuBuildRomStr(virBufferPtr buf,
                            "%s", _("rombar and romfile are supported only for PCI devices"));
             return -1;
         }
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_ROMBAR)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           "%s", _("rombar and romfile not supported in this QEMU binary"));
-            return -1;
-        }
 
         switch (info->rombar) {
         case VIR_TRISTATE_SWITCH_OFF:
@@ -3400,7 +3394,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
                       virMacAddrFormat(&net->mac, macaddr));
     if (qemuBuildDeviceAddressStr(&buf, def, &net->info, qemuCaps) < 0)
         goto error;
-    if (qemuBuildRomStr(&buf, &net->info, qemuCaps) < 0)
+    if (qemuBuildRomStr(&buf, &net->info) < 0)
         goto error;
     if (bootindex && virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX))
         virBufferAsprintf(&buf, ",bootindex=%u", bootindex);
@@ -4469,7 +4463,7 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def,
         virBufferAsprintf(&buf, ",bootindex=%u", bootIndex);
     if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0)
         goto error;
-    if (qemuBuildRomStr(&buf, dev->info, qemuCaps) < 0)
+    if (qemuBuildRomStr(&buf, dev->info) < 0)
         goto error;
 
     if (virBufferCheckError(&buf) < 0)

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
index 6f6a5b9b9528736a18d4282ea88b2f77644f5133..39d4cc362f52bebba4b3074a48f1a234e6014315 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='usb-hub'/>
   <flag name='no-shutdown'/>
   <flag name='cache-unsafe'/>
-  <flag name='rombar'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
index 18550e29babdc2ca585adfba3ce79240713d30fc..cbb6d8801c59c80dad9763bf83b40b2af0d1e9f9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='usb-hub'/>
   <flag name='no-shutdown'/>
   <flag name='cache-unsafe'/>
-  <flag name='rombar'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 72f09f7a6beead0e712c3112b77af189255c7d60..cb3aa68e0a84d78c5af5243752d674532065f13f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='usb-hub'/>
   <flag name='no-shutdown'/>
   <flag name='cache-unsafe'/>
-  <flag name='rombar'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index c612c11ecc00cce6a6394dd89831bdb328b447a2..bdd7f5f10e7e11658f242aff86e6ae4f37900012 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='usb-hub'/>
   <flag name='no-shutdown'/>
   <flag name='cache-unsafe'/>
-  <flag name='rombar'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml
index f4603c155f91ed3670a998d79d56267f698c2b84..122082d517ba4164a77d4f7a7f1b4be24665e823 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='usb-hub'/>
   <flag name='no-shutdown'/>
   <flag name='cache-unsafe'/>
-  <flag name='rombar'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 2428aff5cf6641b45a669faf183b11f0304286c0..f7ae674d031f12704c2964d82a76c10055308a8f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -52,7 +52,6 @@
   <flag name='usb-hub'/>
   <flag name='no-shutdown'/>
   <flag name='cache-unsafe'/>
-  <flag name='rombar'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 68ea0de0f0001154514a70f7c7db5d8ded61c8e4..37ab286726646b3776256c3f9e08173bc019c226 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='usb-hub'/>
   <flag name='no-shutdown'/>
   <flag name='cache-unsafe'/>
-  <flag name='rombar'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 73f0147f9319d26645d440a684958d67d546640a..eb411f57a4b0a559a7d0b3e38e9028db58ebc5c6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='usb-hub'/>
   <flag name='no-shutdown'/>
   <flag name='cache-unsafe'/>
-  <flag name='rombar'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 5970d190a3e9ac58a188b1785556b0a0e6928a11..70788272ec8f076d9a4e6a224b4c262c20c15bb3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='usb-hub'/>
   <flag name='no-shutdown'/>
   <flag name='cache-unsafe'/>
-  <flag name='rombar'/>
   <flag name='ich9-ahci'/>
   <flag name='no-acpi'/>
   <flag name='fsdev-readonly'/>

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 26455d5a4c922dd0fa7bd6b0b7973d26f25dc221..c0bc98ed6e7e53dd7c3bd2e3db589ffec9573ec7 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -167,7 +167,6 @@ mymain(void)
             QEMU_CAPS_VGA_NONE,
             QEMU_CAPS_DRIVE_AIO,
             QEMU_CAPS_NO_SHUTDOWN,
-            QEMU_CAPS_PCI_ROMBAR,
             QEMU_CAPS_NO_ACPI,
             QEMU_CAPS_VIRTIO_BLK_SG_IO,
             QEMU_CAPS_CPU_HOST,
@@ -204,7 +203,6 @@ mymain(void)
             QEMU_CAPS_PIIX4_USB_UHCI,
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_NO_SHUTDOWN,
-            QEMU_CAPS_PCI_ROMBAR,
             QEMU_CAPS_NO_ACPI,
             QEMU_CAPS_VIRTIO_BLK_SG_IO,
             QEMU_CAPS_CPU_HOST,
@@ -243,7 +241,6 @@ mymain(void)
             QEMU_CAPS_VGA_NONE,
             QEMU_CAPS_DRIVE_AIO,
             QEMU_CAPS_NO_SHUTDOWN,
-            QEMU_CAPS_PCI_ROMBAR,
             QEMU_CAPS_NO_ACPI,
             QEMU_CAPS_VIRTIO_BLK_SG_IO,
             QEMU_CAPS_CPU_HOST,
@@ -286,7 +283,6 @@ mymain(void)
             QEMU_CAPS_PCI_OHCI,
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_NO_SHUTDOWN,
-            QEMU_CAPS_PCI_ROMBAR,
             QEMU_CAPS_NO_ACPI,
             QEMU_CAPS_VIRTIO_BLK_SG_IO,
             QEMU_CAPS_CPU_HOST,
@@ -344,7 +340,6 @@ mymain(void)
             QEMU_CAPS_PIIX4_USB_UHCI,
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_NO_SHUTDOWN,
-            QEMU_CAPS_PCI_ROMBAR,
             QEMU_CAPS_NO_ACPI,
             QEMU_CAPS_VIRTIO_BLK_SCSI,
             QEMU_CAPS_VIRTIO_BLK_SG_IO,
@@ -407,7 +402,6 @@ mymain(void)
             QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_NO_SHUTDOWN,
-            QEMU_CAPS_PCI_ROMBAR,
             QEMU_CAPS_NO_ACPI,
             QEMU_CAPS_VIRTIO_BLK_SCSI,
             QEMU_CAPS_VIRTIO_BLK_SG_IO,
@@ -470,7 +464,6 @@ mymain(void)
             QEMU_CAPS_PCI_OHCI,
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_NO_SHUTDOWN,
-            QEMU_CAPS_PCI_ROMBAR,
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_NO_ACPI,
             QEMU_CAPS_FSDEV_READONLY,
@@ -548,7 +541,6 @@ mymain(void)
             QEMU_CAPS_PCI_OHCI,
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_NO_SHUTDOWN,
-            QEMU_CAPS_PCI_ROMBAR,
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_NO_ACPI,
             QEMU_CAPS_FSDEV_READONLY,

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index bac12c3d8aafc0ed248008be265ddbb5f1fff034..1f6b6dfd7845a42462f12b2d2e9dba7b852ed7f6 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1233,8 +1233,7 @@ mymain(void)
                     QEMU_CAPS_PCIDEVICE,
                     QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("pci-rom",
-            QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG,
-            QEMU_CAPS_PCI_ROMBAR);
+            QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG);
 
     DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, NONE);
     DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, 0, NONE);