]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_QCOW2_LUKS
authorPeter Krempa <pkrempa@redhat.com>
Fri, 15 Jul 2022 14:51:07 +0000 (16:51 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 11 Aug 2022 12:38:31 +0000 (14:38 +0200)
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
28 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml

index bf87b3a0051cd180fa9b67c196aad4cc88d11254..20b019ba4a8f18bedf6fe1218b50e24043626af8 100644 (file)
@@ -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 },
index 792495908976bf26fd583d3b168ddfb9dd1c2251..9ed0b90f194520e139af1f663b1995c12ea56863 100644 (file)
@@ -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 */
index 62add1180b8d9873483518e3e8afe685899c2400..13e661e550adc90513a1b22037ca9b0f752121db 100644 (file)
@@ -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'/>
index 80870a07c339791de5233806cbdfb6e32f258de4..8cba4628ee0f637a702bf5cc3c4d617490a7ae1a 100644 (file)
@@ -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'/>
index 0585dd9b3f7a7950070cc4e30792917a79de797a..a1eadd72dfe4feeb152af3054bcc7a0cf9800475 100644 (file)
@@ -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'/>
index 139e3e5f0f2ffa416d44b682732fb8d75417eade..e59e18e4768868234cee1c5cc833d2dfa7030fab 100644 (file)
   <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'/>
index 37091bb4d06132f6e375bdf69b726ee1125e26dc..97de590d082a686a4f79d9dbde496c5adef88d86 100644 (file)
   <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'/>
index 411f6c7cbd4cf39810fb95f0cad04ceb022c8e57..48221af25ecd9d8b0b186db874b143a0e1acddc6 100644 (file)
@@ -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'/>
index 83509f3b818dc4c249308e8f282cbb2822e6ba57..e73aa7e10aabf82eb182a25d85a9ef9f9a7e497d 100644 (file)
@@ -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'/>
index 6eef7625d8b7d11eca410f953ba2ae294dd7f0ab..18546d52951150b97aae3d7bf036584103f2dcbc 100644 (file)
   <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'/>
index abb9a17862ede961113cad81710aa45bbad56111..f62de29bb162e46ee60788ffb2501a5d551495b5 100644 (file)
@@ -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'/>
index 70b4513b2f903fe5c02832a382709ad6c7abd7ca..8ce8f410ecfb9de520013558544da4853d31b88d 100644 (file)
   <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'/>
index a0d0a78798bb8bb0da2647efeac4c9861b8f61ab..eae1af3e4bfd7bbf2666f2d498be7a5e36393fa5 100644 (file)
   <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'/>
index 13de8596b7f02efeddebde4882921c09cb891e63..37186e1459a71495483d388f8fa14ddd869ba974 100644 (file)
@@ -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'/>
index a425b19e8f2ba21a1989bbd6a5aae16f149b01f6..7d1e8597175aefdbcc2161076dbaa0178c2bf0ed 100644 (file)
@@ -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'/>
index 4cacfb4a5f9e81e9df75a1d29814705c7e41dc3a..83976374bf368c5a4d11f2c50ba890dc4715dc62 100644 (file)
@@ -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'/>
index ea08ccbdfea5cfdad83b2ed6ca4a672418b743ef..31ffcd37f301330e34eaced7a72ad80c076cb0e7 100644 (file)
   <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'/>
index 29bb107e80ac95eca6db33dd2bac3fb9b090f140..9da12a47081e1c7003e4cf82962805d718b62692 100644 (file)
   <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'/>
index c54ee5b8da3636fd138793318d8252f0d8dc80d8..83d80c671d9fbe617be8adf85a9ce93d9af73b2f 100644 (file)
@@ -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'/>
index 1da4dae164f218e59ae70b8d7b836de3c5a93932..f7629fa5baffe560111f1a7707ab33072d2344dd 100644 (file)
   <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'/>
index a13685a71ca0ac7aafe049aeaf29b62e3786cbdd..13644a5a84e7fae6ca0a08d3a11e9c891b026b57 100644 (file)
   <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'/>
index 8c3e6cbff30780b54f9241879348523a69881142..f8aec3e5369164b52a87ffa2366f1dc1abed3eea 100644 (file)
   <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'/>
index 356be203631bd30e607ed376fb333f32922e38f4..915eb61a3262644d97ada81ac2072c11984b85c1 100644 (file)
@@ -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'/>
index a2d312c9d1829c337cf313f81e5f79bafe83e040..569c4994f15bafe01f88ae1305025322d798ada6 100644 (file)
   <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'/>
index 000949d814bf4d8f45d331041c911bb276562acc..cb39ab5e220949fcd076ba431c5d23bd4ea79266 100644 (file)
   <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'/>
index 4432327d9692d15bfb6e141419e0f611588039f7..6b333566ffa01d7c8c1ce95bfd13873076e6e486 100644 (file)
   <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'/>
index 009145f4218a26bd8d9af0d04a6ba0b8bbc72d77..58009cc69065e689a6fc3035c9671cc39d74ba61 100644 (file)
   <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'/>
index daf9e9fa50d9a64081f9e527cf493403ebf78add..0d78ea29c20b6824f66f50b072ac34cb69962def 100644 (file)
   <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'/>