]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_REOPEN
authorPeter Krempa <pkrempa@redhat.com>
Wed, 12 Mar 2025 15:51:20 +0000 (16:51 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 13 Mar 2025 14:38:16 +0000 (15:38 +0100)
'blockdev-reopen' is supported since qemu-6.1. Since we now don't have
any code using this capability we can retire it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
31 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml

index f0c48bb2be4e8db4ff2964e8540c6657abc751ea..82e7dc5ccc8e8b0b2fa17d55953033bbcdf3f117 100644 (file)
@@ -566,7 +566,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "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-reopen", /* QEMU_CAPS_BLOCKDEV_REOPEN */
+              "blockdev-reopen", /* X_QEMU_CAPS_BLOCKDEV_REOPEN */
               "storage.werror", /* X_QEMU_CAPS_STORAGE_WERROR */
 
               /* 360 */
@@ -1241,7 +1241,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE },
     { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON },
     { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD },
-    { "blockdev-reopen", QEMU_CAPS_BLOCKDEV_REOPEN },
     { "set-action", QEMU_CAPS_SET_ACTION },
     { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE },
     { "sev-inject-launch-secret", QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET },
@@ -5594,8 +5593,7 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps G_GNUC_UNUSED)
 void
 virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps)
 {
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN) &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING))
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP);
 }
 
index 1fedfdaeb1550f9a67bbbfef57379452f82736ea..620289572ea23a5b016bcd6f7ae549b18de88e49 100644 (file)
@@ -545,7 +545,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     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 */
-    QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */
+    X_QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */
     X_QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
 
     /* 360 */
index a35578fab44ef4b3c26171e0af165f4da8f2b7d7..3f34d4853c8e6635d81d54fb1981c059923c60cb 100644 (file)
@@ -68,7 +68,6 @@
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
index 6be2a75358b89b0aa6969ae477afeaf867eb7d2a..db1c6494537b8e2326b49a6140c062260c6dc49a 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 3b9dec3c672b628a8f5573bdf01ffecd37d268d9..0c5336b9f44498012cae6b975b8d7f67b7e47d69 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 4bc090f96051c2d3441b097d44748d654b918407..2094c2e7612c9481abf7c94219aee8cfeec9db8d 100644 (file)
@@ -94,7 +94,6 @@
   <flag name='tpm-spapr'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='tcg'/>
index f24d1b00d55f336e5359e41142548189f58a73ba..0d74ef5490631802689267fd0b373f030414f65a 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index c02c4a23b37eebd49ffc53ac505c93ea4a1ac1bb..a19cdd7391322c48a74ad47f232368d6e50f3671 100644 (file)
   <flag name='tpm-spapr'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 324e1b824f4dd64c778b0bf66c6fcef7d4650cd3..9fe235e7cb3a989537006205d3854b6e93fe6771 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 6a93c860e008c7dfeec3419c8203e599defa5776..1cffb4d46c9bbbd4958d7102cf59a9d50d0f9988 100644 (file)
   <flag name='tpm-spapr'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 77b6a93061f914eaaa9f6400ccd895e480d2c54a..2fd7c14d89aa5b6b1ab988903946d1961df836c4 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index bbf3dded5b789554745bd72a7319c9954141185f..775979c09efc859d3302ab3192f50ee69f24f671 100644 (file)
@@ -93,7 +93,6 @@
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 3d3d729b72801752b75accb2510fb10a764bb6b7..8fdfa14e24c4b86db951a6486d5c9a20042b99b4 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 1472ed5556f76b5d6f84fd9f43a518a2cf27064e..6c78c3e6973c486f89db5dfbe9ea6543e7f49659 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 29dd31151d4203a8f35a838f9a29fd8ff420b14b..a0604e94b7d29df320dc8ba66c67a40ecd6de5c2 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 44885a6e6dcd42bf115c21a78bd941d71a85efbf..c667c62418cfa1c16b0a481269265bd3e7d4782b 100644 (file)
@@ -65,7 +65,6 @@
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
index 4a67276bb914716664e9d066a6dfd6b4703f4ae1..b1f6c765fc5217b282d935e0f181a7f750dc2eb3 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index e19e15688a5f242e2e27697d2f16684ad0d1f322..7783054d8a98aa1b23ed6d99eb9ee5705a3439a5 100644 (file)
@@ -99,7 +99,6 @@
   <flag name='cpu.kvm-no-adjvtime'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index ac856a760bcf1c5fb33feb806613cba7f15c008b..4db71213c4243c63fc8cac5aeef3cee5372acd1f 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 3a5d881db4943cbf80dac0f7e12c674f38ece05c..2f710ae116e434bef380233855603deb6ff4cb1a 100644 (file)
@@ -92,7 +92,6 @@
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 558cf8654c0500685a81e0c27826b672aeb22f75..67afe4be0b42b1918b4b41c0540d1c16c6ff521e 100644 (file)
@@ -65,7 +65,6 @@
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
index 899cdb33ee2ea6964af351c102de0f4c7f871262..847f1bb11b99d1e3df2c3919970a1c5d1790d018 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 10ac1add8fef86b4d66d88b5ecdf6cd5f6a03a16..15dc88b1666a179f208eb93d9de62fd7473b8d96 100644 (file)
@@ -31,7 +31,6 @@
   <flag name='smp-dies'/>
   <flag name='rng-builtin'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
index 39939b367c0cf51b6549b80d65e5a3cc393ecd7c..12464925dcda7f71f35f72daf25474b85277948a 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 613c32f17382487cd85b2068700156f655fa0fdc..acba45001ca61660ad7ae0d6cc3ea51f90f87819 100644 (file)
@@ -96,7 +96,6 @@
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index 35b14f2cccd75786603eeed8009d73774f0d7f9b..30704ce4250f4cd827dea8ae9e9865f87dac889b 100644 (file)
@@ -68,7 +68,6 @@
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
index 0c2b277a8c8c6c391e3cadbf45528d6a254ee0f1..d9ac11c13f4738b53e0ba25da9ca42afde5bdc8f 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index f4552c3765f1134fb28521fbe1e701d0f5b3a75c..2d1eb90d61644be869b1d738f3204ad32fa394ea 100644 (file)
@@ -76,7 +76,6 @@
   <flag name='smp-dies'/>
   <flag name='rng-builtin'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='tcg'/>
index 643cdeb1e0cda76f4868eda35093feff9ffdeb99..b7d7446c6de30ed8a6cb7ea15c6a00cd50ca7291 100644 (file)
@@ -68,7 +68,6 @@
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
index cd0adf5a64dd28616462c9048a34c48e87e8a5df..ba0141f71e04824c53b800c9b770b827581d8031 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>
index bf2fafe2e06ca22e02b6a4824ca8d674be867cfd..d97b77fa42c6e469dddc3c02f19b7a4c449444c8 100644 (file)
   <flag name='rng-builtin'/>
   <flag name='vhost-user-fs'/>
   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-  <flag name='blockdev-reopen'/>
   <flag name='fsdev.multidevs'/>
   <flag name='pcie-root-port.hotplug'/>
   <flag name='aio.io_uring'/>