qemu: capabilities: Retire QEMU_CAPS_QCOW2_LUKS

Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2024-07-31 05:57:16 +00:00 · 2022-07-15 16:51:07 +02:00 · 2022-07-15 16:51:07 +02:00 · 78ad796a43
commit 78ad796a43
parent b17e669c84
28 changed files with 2 additions and 29 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -465,7 +465,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "virtio-tablet-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW */

              /* 285 */
-              "qcow2-luks", /* QEMU_CAPS_QCOW2_LUKS */
+              "qcow2-luks", /* X_QEMU_CAPS_QCOW2_LUKS */
              "pcie-pci-bridge", /* QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE */
              "seccomp-blacklist", /* X_QEMU_CAPS_SECCOMP_BLACKLIST */
              "query-cpus-fast", /* X_QEMU_CAPS_QUERY_CPUS_FAST */
@ -1584,7 +1584,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioIOMMU[] =
 /* see documentation for virQEMUQAPISchemaPathGet for the query format */
 static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
    { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
-    { "blockdev-add/arg-type/+qcow2/encrypt/+luks/key-secret", QEMU_CAPS_QCOW2_LUKS },
    { "blockdev-add/arg-type/+file/drop-cache", QEMU_CAPS_MIGRATION_FILE_DROP_CACHE },
    { "blockdev-add/arg-type/+file/$dynamic-auto-read-only", QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC },
    { "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -444,7 +444,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW, /* -device virtio-tablet-ccw */

    /* 285 */
-    QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */
+    X_QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */
    QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */
    X_QEMU_CAPS_SECCOMP_BLACKLIST, /* -sandbox.elevateprivileges */
    X_QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -99,7 +99,6 @@
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -97,7 +97,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -66,7 +66,6 @@
  <flag name='virtio-keyboard-ccw'/>
  <flag name='virtio-mouse-ccw'/>
  <flag name='virtio-tablet-ccw'/>
-  <flag name='qcow2-luks'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
  <flag name='pr-manager-helper'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -130,7 +130,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -101,7 +101,6 @@
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -99,7 +99,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -98,7 +98,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='disk-share-rw'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -130,7 +130,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -34,7 +34,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
  <flag name='pr-manager-helper'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -129,7 +129,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -100,7 +100,6 @@
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -97,7 +97,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -96,7 +96,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='disk-share-rw'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -64,7 +64,6 @@
  <flag name='virtio-keyboard-ccw'/>
  <flag name='virtio-mouse-ccw'/>
  <flag name='virtio-tablet-ccw'/>
-  <flag name='qcow2-luks'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
  <flag name='pr-manager-helper'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -129,7 +129,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -101,7 +101,6 @@
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -64,7 +64,6 @@
  <flag name='virtio-keyboard-ccw'/>
  <flag name='virtio-mouse-ccw'/>
  <flag name='virtio-tablet-ccw'/>
-  <flag name='qcow2-luks'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
  <flag name='pr-manager-helper'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -128,7 +128,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -127,7 +127,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@ -108,7 +108,6 @@
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@ -97,7 +97,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@ -127,7 +127,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@ -108,7 +108,6 @@
  <flag name='disk-share-rw'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@ -103,7 +103,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@ -127,7 +127,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@ -127,7 +127,6 @@
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>