qemu_capabilities: Introduce QEMU_CAPS_VIRTIO_IOMMU_AW_BITS

This capability tracks whether the virtio-iommu device has
aw-bits attribute.

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 f456e8a3784df32cc981864c7d9b1d9f4ace2488..b4d52eebcdd99519c19bb8d3c5c685b649c560ea 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -755,6 +755,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "disk-timed-stats", /* QEMU_CAPS_DISK_TIMED_STATS */
               "query-accelerators", /* QEMU_CAPS_QUERY_ACCELERATORS */
               "mshv", /* QEMU_CAPS_MSHV */
+              "virtio-iommu.aw-bits", /* QEMU_CAPS_VIRTIO_IOMMU_AW_BITS */
     );
 
 
@@ -1612,6 +1613,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioMemPCI[] =
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioIOMMU[] = {
     { "boot-bypass", QEMU_CAPS_VIRTIO_IOMMU_BOOT_BYPASS, NULL },
+    { "aw-bits", QEMU_CAPS_VIRTIO_IOMMU_AW_BITS, NULL },
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlkCCW[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index f180844e667862ae4ff961f513993d1fde61fbd6..b02385ab0fb67383e1dfa89910e5d0c81ac0106f 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -730,6 +730,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DISK_TIMED_STATS, /* timed stats support ('stats-intervals' property of disk frontends) */
     QEMU_CAPS_QUERY_ACCELERATORS, /* query-accelerators command */
     QEMU_CAPS_MSHV, /* -accel mshv */
+    QEMU_CAPS_VIRTIO_IOMMU_AW_BITS, /* virtio-iommu.aw-bits */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;

diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml
index 90e8d868ccbbda96b7bd1f023cdce22c1b04d1a5..c2bffe88ada33e861cf8878d089cd7890447563f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml
@@ -163,6 +163,7 @@
   <flag name='nvme-ns'/>
   <flag name='usb-bot'/>
   <flag name='acpi-generic-initiator'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10000000</version>
   <microcodeVersion>61700285</microcodeVersion>
   <package>v10.0.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml
index 4b3cded2d14994ceffdc45fdf8cd6af6d60897cd..0b9613b9210f75e14310a5683371872cb107a437 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml
@@ -170,6 +170,7 @@
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='usb-bot'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10000000</version>
   <microcodeVersion>42900285</microcodeVersion>
   <package>v10.0.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
index 82a66a65246a60dcaf1318c28ee7c5bc62dcff7e..410f7c324cdda5c1c79affe1a0bcaab06b0a0496 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
@@ -136,6 +136,7 @@
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='usb-bot'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10000000</version>
   <microcodeVersion>39100285</microcodeVersion>
   <package>v10.0.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
index cfce1c963d2734f7913fd301d88eda9c1724d39b..a7166aba4450c6c1e6e9b2e69489001bc6a76805 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
@@ -209,6 +209,7 @@
   <flag name='amd-iommu'/>
   <flag name='usb-bot'/>
   <flag name='acpi-generic-initiator'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10000000</version>
   <microcodeVersion>43100285</microcodeVersion>
   <package>v10.0.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
index f94c8388d6687034cfa1e587313cb0260f1742db..4177eb06b6548632ce8205d636122d7cbec5e8ff 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
@@ -209,6 +209,7 @@
   <flag name='amd-iommu.pci-id'/>
   <flag name='usb-bot'/>
   <flag name='acpi-generic-initiator'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10000000</version>
   <microcodeVersion>43100285</microcodeVersion>
   <package>v10.0.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml
index 8d59566cc0e81c48e4a7a1387f0357387c2a4f94..9faa853da2f1e59212a459bac94749a3a1fd32f6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml
@@ -140,6 +140,7 @@
   <flag name='nvme-ns'/>
   <flag name='usb-bot'/>
   <flag name='qom-list-get'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10001000</version>
   <microcodeVersion>39100286</microcodeVersion>
   <package>v10.1.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml
index 377541ff5301465626366e76cd2c7f452a2e532f..d5566234a20356372b56ba8f3af2048d0bbe165b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml
+++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml
@@ -192,6 +192,7 @@
   <flag name='tdx-guest'/>
   <flag name='qom-list-get'/>
   <flag name='acpi-generic-initiator'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10001000</version>
   <microcodeVersion>43100286</microcodeVersion>
   <package>v10.1.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml
index 520a3d8ee8f6f0bf865d960f5def4bc15b86eb1b..12d2b262a549d2cb1a59989cd92b8056a4fffaad 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml
@@ -214,6 +214,7 @@
   <flag name='tdx-guest'/>
   <flag name='qom-list-get'/>
   <flag name='acpi-generic-initiator'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10001000</version>
   <microcodeVersion>43100286</microcodeVersion>
   <package>v10.1.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml
index d0c22d2541b88e66c6b6dc976077cd1f700d6423..7154cdb66cc0668b903719de768e025767cfe7e4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml
@@ -182,6 +182,7 @@
   <flag name='acpi-generic-initiator'/>
   <flag name='disk-timed-stats'/>
   <flag name='query-accelerators'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10002000</version>
   <microcodeVersion>61700287</microcodeVersion>
   <package>v10.2.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml
index 2b6708be6abae77a209f52f071c0ad010401629c..0d627136e8a06aec47c53650f93b643e6d663993 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml
+++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml
@@ -202,6 +202,7 @@
   <flag name='disk-timed-stats'/>
   <flag name='query-accelerators'/>
   <flag name='mshv'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10002000</version>
   <microcodeVersion>43100287</microcodeVersion>
   <package>v10.2.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
index 06f7bf784d9b9974612a297d1f2df5d459d2337e..5eae7045124f2c77f50128527002c957bd1ce53f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
@@ -215,6 +215,7 @@
   <flag name='acpi-generic-initiator'/>
   <flag name='disk-timed-stats'/>
   <flag name='query-accelerators'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10002000</version>
   <microcodeVersion>43100287</microcodeVersion>
   <package>v10.2.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml
index f626f3ea4607f7e4d8483a9dd4ffcce0166eecb6..3600be03010ae17f8e637d40267bfb7300b1fff3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml
@@ -182,6 +182,7 @@
   <flag name='acpi-generic-initiator'/>
   <flag name='disk-timed-stats'/>
   <flag name='query-accelerators'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10002050</version>
   <microcodeVersion>61700286</microcodeVersion>
   <package>v10.2.0-476-gcf3e71d8fc</package>

diff --git a/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml
index f5ef2b2e4529b5e1be56bee5ba6ef44cb9a19f07..6aa17de84390d3b7e74aca505818b4b73cb96c6c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml
@@ -215,6 +215,7 @@
   <flag name='acpi-generic-initiator'/>
   <flag name='disk-timed-stats'/>
   <flag name='query-accelerators'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>10002050</version>
   <microcodeVersion>43100286</microcodeVersion>
   <package>v10.2.0-476-gcf3e71d8fc</package>

diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
index 1f2e27a21837225bb7cc914569b738a0f19c9ac2..43c174e0e61dce4b3429282c40c6e09dc2b61fd4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@@ -204,6 +204,7 @@
   <flag name='amd-iommu'/>
   <flag name='usb-bot'/>
   <flag name='acpi-generic-initiator'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>9000000</version>
   <microcodeVersion>43100245</microcodeVersion>
   <package>v9.0.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
index 85c013a724cd0449e944398c5642d08d389c1004..b5ca67b44507bda1a62525807fe999675ea883c2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
@@ -162,6 +162,7 @@
   <flag name='nvme-ns'/>
   <flag name='usb-bot'/>
   <flag name='acpi-generic-initiator'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>9001000</version>
   <microcodeVersion>0</microcodeVersion>
   <package>v9.1.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
index b961f7980802a6587dc647b9804d7021ad3fa75e..78b7493b5345e473751531b74a3306660a903dd8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
@@ -126,6 +126,7 @@
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='usb-bot'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>9001000</version>
   <microcodeVersion>39100246</microcodeVersion>
   <package>v9.1.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
index 35ddf307366f18c885a3f39976c9e982f67c73e5..d68bb783e8e911167fe4f447db84d894969d93d0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
@@ -203,6 +203,7 @@
   <flag name='amd-iommu'/>
   <flag name='usb-bot'/>
   <flag name='acpi-generic-initiator'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>9001000</version>
   <microcodeVersion>43100246</microcodeVersion>
   <package>v9.1.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
index 79784d553fa6964f870e4a1a19348e2250a6aca3..9c843f9e5c5c8e61bf5e9e2865363bc28ec6444a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
@@ -135,6 +135,7 @@
   <flag name='nvme-ns'/>
   <flag name='usb-bot'/>
   <flag name='acpi-generic-initiator'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>9002002</version>
   <microcodeVersion>61700247</microcodeVersion>
   <package></package>

diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
index e9f79261f7f0861e6ce96ad988c282ed13d43283..01fb50038d07e176117dd55c3f5c8d98c56cb351 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
@@ -129,6 +129,7 @@
   <flag name='nvme'/>
   <flag name='nvme-ns'/>
   <flag name='usb-bot'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>9002000</version>
   <microcodeVersion>39100247</microcodeVersion>
   <package>v9.2.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
index 0e52c3e23da3bc4678b78224d070f66ea73db65d..ac936bc17b044175f64f38eaffebbcf585cf6afe 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
@@ -207,6 +207,7 @@
   <flag name='amd-iommu'/>
   <flag name='usb-bot'/>
   <flag name='acpi-generic-initiator'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>9002000</version>
   <microcodeVersion>43100247</microcodeVersion>
   <package>v9.2.0</package>

diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
index 95f8a4d8789423a4e3b3592307762cd796b0bf9a..fd851d9201d194c899bd43b2a9642bd62a1755b5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
@@ -205,6 +205,7 @@
   <flag name='amd-iommu'/>
   <flag name='usb-bot'/>
   <flag name='acpi-generic-initiator'/>
+  <flag name='virtio-iommu.aw-bits'/>
   <version>9002000</version>
   <microcodeVersion>43100247</microcodeVersion>
   <package>v9.2.0</package>