qemu introduced these options in 2eb1cd0768 ("s390x: CPACF: Handle key
wrap machine options") released in qemu-v2.3.0 but was exposed in
query-command-line-options only in 5bcfa0c543 ("util/qemu-config: fix
missing machine command line options").
The problem is that they are exposed even for architectures which don't
actually in fact support those.
Make the two capabilities a bit more useful by assuming them only on
s390 and thus removing them from other arches.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 10 ++++++----
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 --
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 2 --
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 2 --
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 2 --
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 2 --
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 2 --
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 2 --
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 2 --
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 2 --
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 2 --
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 2 --
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 2 --
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 2 --
33 files changed, 6 insertions(+), 68 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d26a3c97c1..69a3f11fe4 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3207,8 +3207,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
{ "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
{ "fsdev", "fmode", QEMU_CAPS_FSDEV_CREATEMODE }, /* Could have also checked fsdev->dmode */
{ "fw_cfg", "file", QEMU_CAPS_FW_CFG },
- { "machine", "aes-key-wrap", QEMU_CAPS_AES_KEY_WRAP },
- { "machine", "dea-key-wrap", QEMU_CAPS_DEA_KEY_WRAP },
{ "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP },
{ "machine", "loadparm", QEMU_CAPS_LOADPARM },
{ "numa", NULL, QEMU_CAPS_NUMA }, /* not needed after qemuCaps->version < 3000000 */
@@ -5000,6 +4998,12 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT);
break;
+ case VIR_ARCH_S390:
+ case VIR_ARCH_S390X:
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_AES_KEY_WRAP);
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEA_KEY_WRAP);
+ break;
+
case VIR_ARCH_ALPHA:
case VIR_ARCH_PPC:
case VIR_ARCH_PPCEMB:
@@ -5007,8 +5011,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
case VIR_ARCH_SH4EB:
case VIR_ARCH_RISCV32:
case VIR_ARCH_RISCV64:
- case VIR_ARCH_S390:
- case VIR_ARCH_S390X:
case VIR_ARCH_SPARC:
case VIR_ARCH_SPARC64:
case VIR_ARCH_ARMV6L:
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 0eefa61e1c..62326b50d7 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -82,8 +82,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 8124a6c5fe..4ed9ffec2e 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -59,8 +59,6 @@
<flag name='migrate-rdma'/>
<flag name='ivshmem'/>
<flag name='VGA.vgamem_mb'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='aarch64-off'/>
<flag name='migration-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 6873374877..4fb441ca0a 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -59,8 +59,6 @@
<flag name='ivshmem'/>
<flag name='VGA.vgamem_mb'/>
<flag name='pc-dimm'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='rtl8139'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index fec85973b5..3e439f4634 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -82,8 +82,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 9175e95f1e..9303420502 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -58,8 +58,6 @@
<flag name='ivshmem'/>
<flag name='VGA.vgamem_mb'/>
<flag name='pc-dimm'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='rtl8139'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 15b63bb26e..6c976825d8 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -26,8 +26,6 @@
<flag name='memory-backend-file'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='migration-event'/>
<flag name='virtio-net'/>
<flag name='incoming-defer'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index eb4416ab29..1eebed0100 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -26,8 +26,6 @@
<flag name='memory-backend-file'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='migration-event'/>
<flag name='virtio-net'/>
<flag name='incoming-defer'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index d5616a462e..dfd6a27e9f 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -81,8 +81,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index e696cb7b31..0f350acb55 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -59,8 +59,6 @@
<flag name='ivshmem'/>
<flag name='VGA.vgamem_mb'/>
<flag name='pc-dimm'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='rtl8139'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index b31e58d6c5..8e1f44b84c 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -81,8 +81,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index df579cbe64..9c971b7b9f 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -61,8 +61,6 @@
<flag name='migrate-rdma'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='aarch64-off'/>
<flag name='migration-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 1d46cf51c8..64a464bf58 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -61,8 +61,6 @@
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index ddb359d1ef..21b8e7d9c4 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -65,8 +65,6 @@
<flag name='migrate-rdma'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='gpex-pcihost'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index ca7cf1e860..65be37ed65 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -65,8 +65,6 @@
<flag name='migrate-rdma'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='gpex-pcihost'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 1662376d8b..5bb31c097a 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -80,8 +80,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 5e05c3b821..6f06d64255 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -80,8 +80,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 4a9ef1eeee..b7751b8e47 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -62,8 +62,6 @@
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='aarch64-off'/>
<flag name='migration-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 5c5106a445..9465395f5d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -61,8 +61,6 @@
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 7c60a271f1..cabf541df2 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -81,8 +81,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index cf2baad491..2e0ed342b4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -64,8 +64,6 @@
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='aarch64-off'/>
<flag name='migration-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 3a7818c508..e5e264ab65 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -62,8 +62,6 @@
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 559668186d..0959a9432a 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -65,8 +65,6 @@
<flag name='migrate-rdma'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='gpex-pcihost'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 0d7b45ef65..edc91ed7d1 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -81,8 +81,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 603cf7735d..eb60861eaf 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -26,8 +26,6 @@
<flag name='memory-backend-file'/>
<flag name='iothread'/>
<flag name='migrate-rdma'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='migration-event'/>
<flag name='incoming-defer'/>
<flag name='chardev-file-append'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 995a3b621d..e5cdb1be6f 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -81,8 +81,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 8c37099fe5..dabd0a8e63 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -63,8 +63,6 @@
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='aarch64-off'/>
<flag name='migration-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 7fd7bfe243..7b88d7d9e0 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -61,8 +61,6 @@
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='ioh3420'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 1ac244226d..d5fdc5b732 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -64,8 +64,6 @@
<flag name='migrate-rdma'/>
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='gpex-pcihost'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 29b254fd50..17cf24a92d 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -80,8 +80,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='gpex-pcihost'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index c7c9bc236a..aacde02c76 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -62,8 +62,6 @@
<flag name='VGA.vgamem_mb'/>
<flag name='vmware-svga.vgamem_mb'/>
<flag name='pc-dimm'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='aarch64-off'/>
<flag name='migration-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 31581dd568..bc5106189a 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -79,8 +79,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='gpex-pcihost'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index bc705780e7..98f62d6b6c 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -79,8 +79,6 @@
<flag name='qxl.vgamem_mb'/>
<flag name='pc-dimm'/>
<flag name='machine-vmport-opt'/>
- <flag name='aes-key-wrap'/>
- <flag name='dea-key-wrap'/>
<flag name='pci-serial'/>
<flag name='migration-event'/>
<flag name='gpex-pcihost'/>
--
2.31.1
