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: 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 355ff3958e7b6ac15161d5f330d6a76245edb0ee..d7285c862204ad02886e46162f8545d1b43ac054 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/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);
 }
 

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 2cedffce66a80cf9ce89f6f1b0abe59ab9183af7..f94739d8a126d518cc1f066f1583996f0831e4fc 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/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 */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f54230e067e4c3834c34c7ccc3fa8833d2a91220..5243668c2cb7426da2943c8633626a1a2dbeb3fd 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/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);

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index cc1687237fb9b926b4c2a84e9838ca6ae49a5de8..376731e0349d59353363e975d0227e9b702923d9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 70de6f5d6f2e3b51915430d81c986d3d32e9ca3a..a42f9d1d148d7883526491ea5a2965e571b41691 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index e2528f10d450e469352c2cfef953e9b6056d0760..cdae63e3997fc547f7666e0847d2abff89728d31 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 91824d73719c3f89721090483886d59e61b25856..1f79a696cf9c17e11cceffa1a54f94050f6bc3b5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index c7490dd5316996a217c8111839bb6d65e2b9b9e8..0f4c00150a6117a10a71e22d557fbaeb70a58449 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 50709d5c98b42611a4090a38e6e62eee44206379..ba37abffb6de731aff0d24d2bf682a3aaa496db7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 2cc15206474a830a590861a27c2e5e7209df54fe..032c5569239c5f4557e2aae9d27e1e99524b2c64 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index c2d579ece07207b3659384e8d0842b92adc2f9f8..708bc5de637b24a21f7715bdea9eb0c1fa616dee 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index dd89fcd38a8a79e2ce6f44651b1b25d6d2c1b7ae..8a9447903267541a0a49b17d5c9840cae6d2a9fa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 9cb538320b62bb49c75c55c9ecc04a1f91292131..9695fb90355c517b0b3d63dec010f43b99ddd54c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 1b7b405de208c92b1824dc9fd16b3299381926c3..7cd37e9ff17f0b7e17e33c994fb3c279d4eaaa19 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index a86a12df3b012b2b9586452ba524d9d7209de363..12e1e6815238fb00957b5874ad316cb266ff2355 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index d0dc506c684781bd605e6bff09fb5341a5610187..52e1e620f1f5099e125c59b6642b8d801b2e4f46 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 74b831442c6ebf884004e014932c3364d7be404b..2ff2906ccc2f13d14024e6771075507a9002e94b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 2248546c6772d3b770b365dc91e0fe41fb5ce754..79e6df0b5c3e9e57299c077463ad74dd5b48bbbe 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index a23ecdf24f23a158678bbefee9808b5b83ba32bc..c74931de44d727b4e0abb59a3b4cd1165a8a551f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index dc70b02a3475777656bfc98a40825c90453993e5..51d2d84e045ed2018f33b5b3052176bd4d81a4c5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index fb8734fceb4c42342533d23bd2ac800c4818994d..9d8b547a6fb16a5de35568597281ad38d790d3a9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index cb525a064388106368a8ac17d376486efff62836..e53336e2b52b3978a37aed94fe4f2ce2023805b9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index fdc46175df2a478ea84dcc375bb360fc33709a74..6c9011e49061dd0173d36e2d49e1d615a0c03429 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 9538b544942f574a07925fe9b90218b01cfe069d..aba71b42b1c4006acfc8142987cc270e70cd7ee9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 22c0ad12e7d30247bcacffee094332dcb5dfd86c..a8343b919750349c2cbf8a05cf6a42bcd84fc4fe 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index c8b14b40be5c95c85b3ea4ebd35ca1399e59a1a2..42e7c1c27c7c41c83221216217c692154bf5ca9c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index d06bd702e253c0d07cabd662d30b96fd55f94b4c..218f8fcf8ff6dba01e47035395d33abdce5c7235 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/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'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index cb6014459d5189a9c09793e59ca1e6c39cb3e9c2..a7facf95521df44cee8afc3bca16de064424fe32 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/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'/>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 22719119838c553bf3b75bfccbcc600f9d9b0a78..81f59240661da382819eaa1240a55866bfa0570e 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/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);
 

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index cf04c78ae22be44b5247aa90716fb67bb830b7b4..8a6ab812da07ed2e958fc0fa7a5cabb33033877d 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/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);