qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY

All supported qemus have this and we already deleted alternate code. Retire the feature flag. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-03-20 06:50:22 +03:00 · 2025-03-12 16:58:07 +01:00 · 2025-03-12 16:58:07 +01:00 · e6815547c8
commit e6815547c8
parent 2f4e76a770
31 changed files with 2 additions and 32 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -565,7 +565,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              /* 355 */
              "vhost-user-fs", /* QEMU_CAPS_DEVICE_VHOST_USER_FS */
              "query-named-block-nodes.flat", /* X_QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT */
-              "blockdev-snapshot.allow-write-only-overlay", /* QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY */
+              "blockdev-snapshot.allow-write-only-overlay", /* X_QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY */
              "blockdev-reopen", /* X_QEMU_CAPS_BLOCKDEV_REOPEN */
              "storage.werror", /* X_QEMU_CAPS_STORAGE_WERROR */

@ -1573,7 +1573,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
    { "blockdev-add/arg-type/+nbd/tls-hostname", QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME },
    { "blockdev-add/arg-type/+qcow2/discard-no-unref", QEMU_CAPS_QCOW2_DISCARD_NO_UNREF },
    { "blockdev-add/arg-type/+virtio-blk-vhost-vdpa/$fdset", QEMU_CAPS_DEVICE_VIRTIO_BLK_VHOST_VDPA},
-    { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
    { "calc-dirty-rate/arg-type/mode", QEMU_CAPS_DIRTYRATE_MODE },
    { "chardev-add/arg-type/backend/+socket/data/reconnect", QEMU_CAPS_CHARDEV_RECONNECT },
    { "chardev-add/arg-type/backend/+socket/data/reconnect-ms", QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -544,7 +544,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    /* 355 */
    QEMU_CAPS_DEVICE_VHOST_USER_FS, /* -device vhost-user-fs */
    X_QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT, /* query-named-block-nodes supports the 'flat' option */
-    QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */
+    X_QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */
    X_QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */
    X_QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */

--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
@ -67,7 +67,6 @@
  <flag name='smp-dies'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='aio.io_uring'/>
  <flag name='tcg'/>
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
@ -124,7 +124,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
@ -124,7 +124,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@ -93,7 +93,6 @@
  <flag name='rng-builtin'/>
  <flag name='tpm-spapr'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='tcg'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@ -125,7 +125,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@ -102,7 +102,6 @@
  <flag name='rng-builtin'/>
  <flag name='tpm-spapr'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@ -125,7 +125,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@ -99,7 +99,6 @@
  <flag name='rng-builtin'/>
  <flag name='tpm-spapr'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@ -125,7 +125,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@ -92,7 +92,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@ -124,7 +124,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@ -125,7 +125,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@ -125,7 +125,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@ -64,7 +64,6 @@
  <flag name='smp-dies'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='aio.io_uring'/>
  <flag name='tcg'/>
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@ -125,7 +125,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@ -98,7 +98,6 @@
  <flag name='rng-builtin'/>
  <flag name='cpu.kvm-no-adjvtime'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
@ -102,7 +102,6 @@
  <flag name='smp-dies'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
@ -91,7 +91,6 @@
  <flag name='smp-dies'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
@ -64,7 +64,6 @@
  <flag name='smp-dies'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='aio.io_uring'/>
  <flag name='tcg'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
@ -125,7 +125,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
@ -30,7 +30,6 @@
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
  <flag name='rng-builtin'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='aio.io_uring'/>
  <flag name='tcg'/>
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@ -125,7 +125,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
@ -95,7 +95,6 @@
  <flag name='smp-dies'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
@ -67,7 +67,6 @@
  <flag name='smp-dies'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='aio.io_uring'/>
  <flag name='tcg'/>
--- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
@ -124,7 +124,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
@ -75,7 +75,6 @@
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
  <flag name='rng-builtin'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='tcg'/>
--- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
@ -67,7 +67,6 @@
  <flag name='smp-dies'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='aio.io_uring'/>
  <flag name='tcg'/>
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
@ -125,7 +125,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
@ -124,7 +124,6 @@
  <flag name='i8042'/>
  <flag name='rng-builtin'/>
  <flag name='vhost-user-fs'/>
-  <flag name='blockdev-snapshot.allow-write-only-overlay'/>
  <flag name='fsdev.multidevs'/>
  <flag name='pcie-root-port.hotplug'/>
  <flag name='aio.io_uring'/>