diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index bf87b3a005..20b019ba4a 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", /* 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 },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 7924959089..9ed0b90f19 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 */
     X_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 62add1180b..13e661e550 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 80870a07c3..8cba4628ee 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 0585dd9b3f..a1eadd72df 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 139e3e5f0f..e59e18e476 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 37091bb4d0..97de590d08 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 411f6c7cbd..48221af25e 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 83509f3b81..e73aa7e10a 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 6eef7625d8..18546d5295 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index abb9a17862..f62de29bb1 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 70b4513b2f..8ce8f410ec 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index a0d0a78798..eae1af3e4b 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 13de8596b7..37186e1459 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index a425b19e8f..7d1e859717 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 4cacfb4a5f..83976374bf 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index ea08ccbdfe..31ffcd37f3 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 29bb107e80..9da12a4708 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index c54ee5b8da..83d80c671d 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 1da4dae164..f7629fa5ba 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index a13685a71c..13644a5a84 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 8c3e6cbff3..f8aec3e536 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 356be20363..915eb61a32 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index a2d312c9d1..569c4994f1 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 000949d814..cb39ab5e22 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 4432327d96..6b333566ff 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 009145f421..58009cc690 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='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index daf9e9fa50..0d78ea29c2 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='disk-write-cache'/>
   <flag name='nbd-tls'/>