qemu: deprecate QEMU_CAPS_HOST_PCI_MULTIDOMAIN

Implied by QEMU >= 1.2.0.
Delete the negative test cases now that they always pass.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>

src/qemu/qemu_capabilities.c

@@ -3625,7 +3625,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY);
 }
 

src/qemu/qemu_capabilities.h

@@ -280,7 +280,7 @@ typedef enum {
 
     /* 165 */
     QEMU_CAPS_DEVICE_USB_KBD, /* -device usb-kbd */
-    QEMU_CAPS_HOST_PCI_MULTIDOMAIN, /* support domain > 0 in host pci address */
+    X_QEMU_CAPS_HOST_PCI_MULTIDOMAIN, /* support domain > 0 in host pci address */
     QEMU_CAPS_MSG_TIMESTAMP, /* -msg timestamp */
     QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */
     QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metadata */

src/qemu/qemu_command.c

@@ -4467,16 +4467,8 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def,
     }
 
     virBufferAddLit(&buf, ",host=");
-    if (pcisrc->addr.domain) {
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("non-zero domain='%.4x' in host device PCI address "
-                             "not supported in this QEMU binary"),
-                           pcisrc->addr.domain);
-            goto error;
-        }
+    if (pcisrc->addr.domain)
         virBufferAsprintf(&buf, "%.4x:", pcisrc->addr.domain);
-    }
     virBufferAsprintf(&buf, "%.2x:%.2x.%.1x",
                       pcisrc->addr.bus, pcisrc->addr.slot,
                       pcisrc->addr.function);

tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml

@@ -87,7 +87,6 @@
   <flag name='pvpanic'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='usb-audio'/>
   <flag name='splash-timeout'/>
   <flag name='ivshmem'/>

tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml

@@ -91,7 +91,6 @@
   <flag name='spice-file-xfer-disable'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='usb-audio'/>
   <flag name='splash-timeout'/>

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml

@@ -92,7 +92,6 @@
   <flag name='spice-file-xfer-disable'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='usb-audio'/>
   <flag name='splash-timeout'/>

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml

@@ -94,7 +94,6 @@
   <flag name='spice-file-xfer-disable'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml

@@ -71,7 +71,6 @@
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml

@@ -70,7 +70,6 @@
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml

@@ -48,7 +48,6 @@
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml

@@ -94,7 +94,6 @@
   <flag name='spice-file-xfer-disable'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml

@@ -48,7 +48,6 @@
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml

@@ -71,7 +71,6 @@
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml

@@ -70,7 +70,6 @@
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml

@@ -48,7 +48,6 @@
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml

@@ -92,7 +92,6 @@
   <flag name='spice-file-xfer-disable'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -94,7 +94,6 @@
   <flag name='spice-file-xfer-disable'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -94,7 +94,6 @@
   <flag name='spice-file-xfer-disable'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml

@@ -73,7 +73,6 @@
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml

@@ -70,7 +70,6 @@
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -94,7 +94,6 @@
   <flag name='spice-file-xfer-disable'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml

@@ -48,7 +48,6 @@
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml

@@ -94,7 +94,6 @@
   <flag name='spice-file-xfer-disable'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml

@@ -48,7 +48,6 @@
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml

@@ -94,7 +94,6 @@
   <flag name='spice-file-xfer-disable'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml

@@ -69,7 +69,6 @@
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml

@@ -48,7 +48,6 @@
   <flag name='virtio-mmio'/>
   <flag name='boot-strict'/>
   <flag name='spiceport'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml

@@ -94,7 +94,6 @@
   <flag name='spice-file-xfer-disable'/>
   <flag name='spiceport'/>
   <flag name='usb-kbd'/>
-  <flag name='host-pci-multidomain'/>
   <flag name='msg-timestamp'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

tests/qemuxml2argvtest.c

@@ -1200,15 +1200,11 @@ mymain(void)
     DO_TEST("net-mcast", NONE);
     DO_TEST("net-udp", NONE);
     DO_TEST("net-hostdev", NONE);
-    DO_TEST("net-hostdev-multidomain",
-            QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
-    DO_TEST_FAILURE("net-hostdev-multidomain", NONE);
+    DO_TEST("net-hostdev-multidomain", NONE);
     DO_TEST("net-hostdev-vfio",
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("net-hostdev-vfio-multidomain",
-            QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
-    DO_TEST_FAILURE("net-hostdev-vfio-multidomain",
-                    QEMU_CAPS_DEVICE_VFIO_PCI);
+            QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST_FAILURE("net-hostdev-fail",
                     QEMU_CAPS_DEVICE_VFIO_PCI);
 
@@ -1478,15 +1474,13 @@ mymain(void)
     DO_TEST("hostdev-vfio",
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("hostdev-vfio-multidomain",
-            QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
+            QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("hostdev-mdev-precreated",
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST_PARSE_ERROR("hostdev-mdev-src-address-invalid",
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address",
             QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST_FAILURE("hostdev-vfio-multidomain",
-                    QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("pci-rom", NONE);
 
     DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, GIC_NONE, NONE);
@@ -1734,17 +1728,14 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("pseries-hostdevs-1",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("pseries-hostdevs-2",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("pseries-hostdevs-3",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
 

tests/qemuxml2xmltest.c

@@ -602,17 +602,14 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("pseries-hostdevs-1",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("pseries-hostdevs-2",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("pseries-hostdevs-3",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
-            QEMU_CAPS_HOST_PCI_MULTIDOMAIN,
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);