qemu: capabilities: Retire QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM

The capability reflects whether QEMU is capable of -device
virtio-*,iommu_platform=. Since the property was introduced in
QEMU commit v2.9.0-rc0~162^2~37 we can safely assume the property
is always present as the minimal version required is 2.11.0.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 32be7e67f1bbea9b24b31e34a7c878b0df229049..2ef3d06adbe215b3071fecd4c210f85985b13303 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -428,7 +428,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "intel-iommu.caching-mode", /* QEMU_CAPS_INTEL_IOMMU_CACHING_MODE */
               "intel-iommu.eim", /* QEMU_CAPS_INTEL_IOMMU_EIM */
               "intel-iommu.device-iotlb", /* QEMU_CAPS_INTEL_IOMMU_DEVICE_IOTLB */
-              "virtio.iommu_platform", /* QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM */
+              "virtio.iommu_platform", /* X_QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM */
 
               /* 260 */
               "virtio.ats", /* QEMU_CAPS_VIRTIO_PCI_ATS */
@@ -1378,7 +1378,6 @@ struct virQEMUCapsDevicePropsFlags {
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
     { "deflate-on-oom", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, NULL },
     { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
-    { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL },
     { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL },
     { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
     { "free-page-reporting", QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPORTING, NULL },
@@ -1409,7 +1408,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = {
     { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL },
     { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
     { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
-    { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL },
     { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL },
     { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
     { "werror", QEMU_CAPS_STORAGE_WERROR, NULL },
@@ -1423,7 +1421,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[] = {
     { "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, NULL },
     { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL },
     { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
-    { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL },
     { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL },
     { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL },
     { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
@@ -1445,7 +1442,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSpaprPCIHostBrid
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioSCSI[] = {
     { "iothread", QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, NULL },
     { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
-    { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL },
     { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL },
     { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
     { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },
@@ -1518,7 +1514,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioGpu[] = {
     { "virgl", QEMU_CAPS_VIRTIO_GPU_VIRGL, NULL },
     { "max_outputs", QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, NULL },
     { "disable-legacy", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, NULL },
-    { "iommu_platform", QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, NULL },
     { "ats", QEMU_CAPS_VIRTIO_PCI_ATS, NULL },
     { "packed", QEMU_CAPS_VIRTIO_PACKED_QUEUES, NULL },
     { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL },

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5b5215416fdbfd45e96caf012cb9c976fea48d3b..e33880eb4d9f49ca367e239d162b00caba11f981 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -408,7 +408,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_INTEL_IOMMU_CACHING_MODE, /* intel-iommu.caching-mode */
     QEMU_CAPS_INTEL_IOMMU_EIM, /* intel-iommu.eim */
     QEMU_CAPS_INTEL_IOMMU_DEVICE_IOTLB, /* intel-iommu.device-iotlb */
-    QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, /* virtio-*-pci.iommu_platform */
+    X_QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, /* virtio-*-pci.iommu_platform */
 
     /* 260 */
     QEMU_CAPS_VIRTIO_PCI_ATS, /* virtio-*-pci.ats */

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 4a82b512d15aad96212c06d6a2800f159623b245..d10ce0260cc5245f693f4c895ab3e4ad867da669 100644 (file)
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1569,14 +1569,6 @@ qemuValidateDomainVirtioOptions(const virDomainVirtioOptions *virtio,
     if (!virtio)
         return 0;
 
-    if (virtio->iommu != VIR_TRISTATE_SWITCH_ABSENT &&
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("the iommu setting is not supported "
-                         "with this QEMU binary"));
-        return -1;
-    }
-
     if (virtio->ats != VIR_TRISTATE_SWITCH_ABSENT &&
         !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_ATS)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 2bade882a47335fb73095d15d85d01e5f21044e5..48b6aade2a88fed7e33ebb25056955980853d259 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -59,7 +59,6 @@
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 2c432bff9e42af6a56d026abf1336626116fae7b..05aeb2356930f5c4ec859709e0c60dddd49b6082 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -132,7 +132,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 8a927796bc1cf076e51678acdd615a653b6a6dcb..8962df414c8185265793f3e189d7234e8dc43d4f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -94,7 +94,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index a68605f4dda4474eaeedd0e8704e34f8f90fdaf4..47cf22f97ab758fbc6e4f052bf977c523675bb54 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -88,7 +88,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index b711c05eff275822f093c1e46fdd0a0f71193d8a..7cd20c3ef1ffd821b8002afbd3b00631545111c7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -59,7 +59,6 @@
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 429c0c260ea15298447ca489983bbc23751b7d85..35662b5fb5b847f0dcb423dd6762d2cc5297510e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -129,7 +129,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 2e81e837a27d163659f9a36a28f7fb0e02534bd4..8cdbaba0620993fcaa46654705d280aca1768bf2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -87,7 +87,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 03efe118d5f91ba79027c767d49630a2912e49d1..4f1a2631d8313ee878c219378efe90e88f37c84c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -44,7 +44,6 @@
   <flag name='vhost-scsi'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
   <flag name='vxhs'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index 1df1ec87281afc416e3b1d864ac906d5138c09c1..c9178769491118cdaa628139ecd3722de0c978df 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -44,7 +44,6 @@
   <flag name='vhost-scsi'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='chardev-reconnect'/>
   <flag name='virtio-gpu.max_outputs'/>
   <flag name='vxhs'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index 19a9f31860effda5360f5fbd013ba4cd4efc9566..710f9c774c512a875ec9a99010bfad4baa4db066 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -61,7 +61,6 @@
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index be1283d449bec86a3d3b61bd42b926f993239cb1..5f9eb70b01f8df0db060dfa42a4a544db8f82cdc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -131,7 +131,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index d0d7e260558df2a4c7f51c8d12a4592f4f556683..32807908d836bff7e0567da4d03770738c7c2d6a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -88,7 +88,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 738e781aaec83a13f84a820597e50963641ca1db..d38eb4e27aa7fa249cb154988c0abbde1a81c58a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -131,7 +131,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 02fc0df0b36a49695c72381d710de8b013ed5aae..b22b8380e7b4d8bd8753b21c0e83ec2099244100 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -96,7 +96,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index bc0cc57eec5c5a3fe83f5579918654c103be5003..b1eb54b2289c07cfc8afc347a01e153f3e9e8997 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -94,7 +94,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 2692dcbe6d7fabd4b9d1fe1aeb1826d3e9c8e0a6..9dad572f9b76aad4e31f9618caa9305eede7d5ce 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -100,7 +100,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index e2bcfd788cbae4d948d0c0f06d00dfd7dfba54bd..fff6ae23bebf9a5eb8ce27b920969eb7e7715abb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -100,7 +100,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index a57d2dbc09f2062a8a7891abde495d1ed343ec3d..f5abb5ae529024162003442b86e2f03e30b0a9c6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -61,7 +61,6 @@
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 624dd5344b3955010587bc99cc43c5ee31fa2dbc..18815717e99961eef01f23335f4b05fa908f0489 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -130,7 +130,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 757cdf0504725e8ae7f7fc49b5142e29ff06aa7b..aa0f3b58872ae3a86a286910dc65a55c3ecb6211 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -130,7 +130,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index a466bc51b9198b3993f260885d38d4c3e6bda072..485488bf3e46a6719257f31071b3986b131d1223 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -98,7 +98,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index bb65c49f5d86f1a5cde5f0ee2ee7eb9f73fff04e..3922b3168921c14fac5bb3e82d1a29a500dff9d7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -94,7 +94,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 8c10fa260db96e13f19459a8f00bde4a61921da8..33ef9b54673d2b8c911e83c3ace23e6735fa0a86 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -61,7 +61,6 @@
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 28ba47afd7e33c8726fdd0b869d28da11c263766..6db2e4c6e34ad2e8ca2319d040331d9365127ae6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -131,7 +131,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 920feb1f07633a721575f35b994bef8f740c538d..68beafe1fe4a73567a2fcb6f2b9d01977972b5c8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -100,7 +100,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index e97419a08b5a076829387c66c476d6868a331b69..f5806b4568838778ea238b77c6660a0b03dd210d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -96,7 +96,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index c6f183769e2569ae038f9fbfe2d9225eaf385986..c856c7ff0b30c1499e4e9b5528efd86731832b36 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -100,7 +100,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 4398da6599f6c0df1c51cb75f214daee43e29efa..dc68cdd220539f78eaedf93181a93de2a11868df 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -131,7 +131,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 40904c880326e6970442756b0a49343b896435ce..dd9da53d7c5b7c6dedefe1cccc23a9663b36cc7c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -131,7 +131,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 042060235e33760a61eca827b654ff226716c704..9da266f179d665deb16629ad8aa3480af2909597 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -100,7 +100,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 61328e1987fa102d0956e3914a56d1f0d98cc9ca..59aece1186c8ce2cc1ceb43d8e3524464a2ba35f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -95,7 +95,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 5f7b02a3966f3dd7860574aa18cc433530411aca..29083ffcd8892f98eacb64614bf6abe6c1ba11cd 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -99,7 +99,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 3c653acbdecc5721f0c9a75c6b99a18b54dff11e..f25d57fe686dd932ea6041530cad21f7d8fec962 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -60,7 +60,6 @@
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index bd2dc77d21066bb2cd29d407f59883d255283000..dd0c27d0ec98ef924eadfec3de45134f3c3f2f1c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -131,7 +131,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 0c897137a4f4edd2c1b99cd620e9420f67c31c41..261c6ed28107c7c1decbb84460478c94670b966d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -101,7 +101,6 @@
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 5d75b2ef63833e09f2b711bdd733ea33a88633f7..14aa449f525fd4e4b44bcfee2b7ed80d1233c0d7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -60,7 +60,6 @@
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index dc0c01c25b78a6d013c0dd7ea388d98cd871bb63..fb4b58d36216b3f3011262e5a9dd9347043b4a16 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -130,7 +130,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 871e85a2d314ed635e5f936a53ed3bf2d7b546ee..290a093101f12162bf05c7c7a520ad038cc760b0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -129,7 +129,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index e5b9bfce0b6274495929b728d5ecf378a94138a9..b2b06bb807671264779affa9910d136d04d26f44 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -129,7 +129,6 @@
   <flag name='intel-iommu.caching-mode'/>
   <flag name='intel-iommu.eim'/>
   <flag name='intel-iommu.device-iotlb'/>
-  <flag name='virtio.iommu_platform'/>
   <flag name='virtio.ats'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>