External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_AES_KEY_WRAP and QEMU_CAPS_DEA_KEY_WRAP

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-03-06 21:19:51 +01:00
parent 5fe571aa1f
commit 0ec1907bac
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_capabilities.c
View File

@ -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;

4
src/qemu/qemu_capabilities.h
View File

@ -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= */

2
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
View File

@ -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'/>

2
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
View File

@ -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
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
View File

@ -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'/>