It will be used for the device-iotlb property of amd-iommu device. Signed-off-by: Han Han <hhan@xxxxxxxxxx> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 + 15 files changed, 16 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4fe354200d..750f01116c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -719,6 +719,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 465 */ "amd-iommu", /* QEMU_CAPS_DEVICE_AMD_IOMMU */ "amd-iommu.intremap", /* QEMU_CAPS_AMD_IOMMU_INTREMAP */ + "amd-iommu.device-iotlb", /* QEMU_CAPS_AMD_IOMMU_DEVICE_IOTLB */ ); @@ -1549,6 +1550,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioIOMMU[] = static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsAmdIOMMU[] = { { "intremap", QEMU_CAPS_AMD_IOMMU_INTREMAP, NULL }, + { "device-iotlb", QEMU_CAPS_AMD_IOMMU_DEVICE_IOTLB, NULL }, }; /* see documentation for virQEMUQAPISchemaPathGet for the query format */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2b87b1ff97..62b34bdb7c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -698,6 +698,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 465 */ QEMU_CAPS_DEVICE_AMD_IOMMU, /* -device amd-iommu */ QEMU_CAPS_AMD_IOMMU_INTREMAP, /* amd-iommu.intremap */ + QEMU_CAPS_AMD_IOMMU_DEVICE_IOTLB, /* amd-iommu.device-iotlb */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml index 2bbe431a54..e8c4112bdd 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -163,6 +163,7 @@ <flag name='netdev.user'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>5002000</version> <microcodeVersion>43100243</microcodeVersion> <package>v5.2.0</package> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml index ed5415ac50..ae1c2647b3 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -175,6 +175,7 @@ <flag name='netdev.user'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>6000000</version> <microcodeVersion>43100242</microcodeVersion> <package>v6.0.0</package> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml index 208378cd3d..adb7d3125a 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -181,6 +181,7 @@ <flag name='netdev.user'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>6001000</version> <microcodeVersion>43100243</microcodeVersion> <package>v6.1.0</package> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml index d122272fd5..78d70da077 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -183,6 +183,7 @@ <flag name='netdev.user'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>6002000</version> <microcodeVersion>43100244</microcodeVersion> <package>v6.2.0</package> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml index 7a5c0d0bff..e73f5d5c21 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -191,6 +191,7 @@ <flag name='machine-i8042-opt'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>7000000</version> <microcodeVersion>43100243</microcodeVersion> <package>v7.0.0</package> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index ae41f4a327..a1b81d9453 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -196,6 +196,7 @@ <flag name='machine-i8042-opt'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>7001000</version> <microcodeVersion>43100244</microcodeVersion> <package>v7.1.0</package> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 1f02202c1e..1e5aa020f4 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -200,6 +200,7 @@ <flag name='machine-i8042-opt'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>7002000</version> <microcodeVersion>43100245</microcodeVersion> <package>v7.2.0</package> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index f24418b5bd..fd00740292 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -200,6 +200,7 @@ <flag name='machine-i8042-opt'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>7002000</version> <microcodeVersion>43100245</microcodeVersion> <package>v7.2.0</package> diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index f80b9e9541..db3595077a 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -204,6 +204,7 @@ <flag name='machine-i8042-opt'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>8000000</version> <microcodeVersion>43100244</microcodeVersion> <package>v8.0.0</package> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index 6b1442e477..b1e9f6b1fa 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -206,6 +206,7 @@ <flag name='machine-i8042-opt'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>8001000</version> <microcodeVersion>43100245</microcodeVersion> <package>v8.1.0</package> diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml index f1b183ca7d..947ed3aa99 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -209,6 +209,7 @@ <flag name='machine-i8042-opt'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>8002000</version> <microcodeVersion>43100246</microcodeVersion> <package>v8.2.0</package> diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml index 1caa710622..5cbcc5f210 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -211,6 +211,7 @@ <flag name='machine-i8042-opt'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>9000000</version> <microcodeVersion>43100245</microcodeVersion> <package>v9.0.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 62a2d48dce..bda7a6d28d 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -209,6 +209,7 @@ <flag name='machine-i8042-opt'/> <flag name='amd-iommu'/> <flag name='amd-iommu.intremap'/> + <flag name='amd-iommu.device-iotlb'/> <version>9001000</version> <microcodeVersion>43100246</microcodeVersion> <package>v9.1.0</package> -- 2.46.2