[PATCH 12/15] qemu: capabilities: Retire QEMU_CAPS_AES_KEY_WRAP and QEMU_CAPS_DEA_KEY_WRAP

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 6 ++---- src/qemu/qemu_capabilities.h | 4 ++-- tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 2 -- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9777f5b112..50c303d98f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -322,10 +322,10 @@ VIR_ENUM_IMPL(virQEMUCaps, "qxl-vga.vgamem_mb", /* X_QEMU_CAPS_QXL_VGA_VGAMEM */ "pc-dimm", /* QEMU_CAPS_DEVICE_PC_DIMM */ "machine-vmport-opt", /* QEMU_CAPS_MACHINE_VMPORT_OPT */ - "aes-key-wrap", /* QEMU_CAPS_AES_KEY_WRAP */ + "aes-key-wrap", /* X_QEMU_CAPS_AES_KEY_WRAP */ /* 185 */ - "dea-key-wrap", /* QEMU_CAPS_DEA_KEY_WRAP */ + "dea-key-wrap", /* X_QEMU_CAPS_DEA_KEY_WRAP */ "pci-serial", /* QEMU_CAPS_DEVICE_PCI_SERIAL */ "aarch64-off", /* X_QEMU_CAPS_CPU_AARCH64_OFF */ "vhost-user-multiqueue", /* X_QEMU_CAPS_VHOSTUSER_MULTIQUEUE */ @@ -5475,8 +5475,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) switch (qemuCaps->arch) { case VIR_ARCH_S390: case VIR_ARCH_S390X: - virQEMUCapsSet(qemuCaps, QEMU_CAPS_AES_KEY_WRAP); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEA_KEY_WRAP); virQEMUCapsSet(qemuCaps, QEMU_CAPS_LOADPARM); break; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 7f4884fc93..fa068dcbff 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -300,10 +300,10 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_QXL_VGA_VGAMEM, /* -device qxl-vga.vgamem_mb */ QEMU_CAPS_DEVICE_PC_DIMM, /* pc-dimm device */ QEMU_CAPS_MACHINE_VMPORT_OPT, /* -machine xxx,vmport=on/off/auto */ - QEMU_CAPS_AES_KEY_WRAP, /* -machine aes_key_wrap */ + X_QEMU_CAPS_AES_KEY_WRAP, /* -machine aes_key_wrap */ /* 185 */ - QEMU_CAPS_DEA_KEY_WRAP, /* -machine dea_key_wrap */ + X_QEMU_CAPS_DEA_KEY_WRAP, /* -machine dea_key_wrap */ QEMU_CAPS_DEVICE_PCI_SERIAL, /* -device pci-serial */ X_QEMU_CAPS_CPU_AARCH64_OFF, /* -cpu ...,aarch64=off */ X_QEMU_CAPS_VHOSTUSER_MULTIQUEUE, /* vhost-user with -netdev queues= */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index cd13201c68..c3fd0e4ce3 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -23,8 +23,6 @@ <flag name='vfio-pci'/> <flag name='enable-fips'/> <flag name='migrate-rdma'/> - <flag name='aes-key-wrap'/> - <flag name='dea-key-wrap'/> <flag name='virtio-net'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index ac51cd4c1a..0a74ec9f2c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -22,8 +22,6 @@ <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='migrate-rdma'/> - <flag name='aes-key-wrap'/> - <flag name='dea-key-wrap'/> <flag name='virtio-net'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index af03684556..ee9516734a 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -22,8 +22,6 @@ <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='migrate-rdma'/> - <flag name='aes-key-wrap'/> - <flag name='dea-key-wrap'/> <flag name='virtio-net'/> <flag name='virtio-gpu'/> <flag name='virtio-gpu.virgl'/> -- 2.39.2