[PATCH 12/80] qemu: capabilities: Retire QEMU_CAPS_QCOW2_LUKS

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - 28 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a01de90c29..e8b7d91062 100644 --- 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", /* QEMU_CAPS_QUERY_CPUS_FAST */ @@ -1585,7 +1585,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 }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index cfa916c846..7c5df0554b 100644 --- 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 */ QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 9dfe93ef45..c801c11391 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 120e7221a3..cbdc1dd09a 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 9bafdc08ff..290a663904 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 2cb38642e7..a2e36da5bf 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index e5fcc07d14..ba0be2518e 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 8834e745dc..15c4beea98 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 841e935438..9d24daa1a9 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 89ed03e279..18970c1f90 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 551c4dcb79..6052009362 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index e5d4b355b1..630d69d8ff 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 3b30fae3b7..182694aca5 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index f0a1c6d424..14f648efd6 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 4b3a7e4e0b..09998c9564 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 62b6bc6e77..9c24f45f69 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 2f1dbec6dc..25cbeaacf0 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 6ab242ef09..4e386dd29a 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 4b30f544e8..66763ef480 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 935148a8a1..b4f31cdebd 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index c4ae311be8..67e68ce7c8 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 870cf154f1..20ba835984 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index a904dea43a..2d1ca291a9 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index fecb2cb03f..7dc962f9c4 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 5a47530d26..7627b5b03c 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 46db0d7832..5710c609f9 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 99b4d860f9..8c5aea8aa5 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 06e1afe692..84c598a286 100644 --- 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='query-cpus-fast'/> <flag name='disk-write-cache'/> -- 2.36.1