]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_BLOCK_EXPORT_ADD
authorPeter Krempa <pkrempa@redhat.com>
Tue, 8 Apr 2025 11:54:24 +0000 (13:54 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Wed, 9 Apr 2025 16:01:56 +0000 (18:01 +0200)
The 'block-export-add' command was added in qemu-5.2 so we now use it
unconditionally.

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 665f5e225ebf5456ac2328fd0ceec4a2c2533888..76e9337f091bc09a8a58dd5c14920430089edfdb 100644 (file)
@@ -600,7 +600,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               /* 380 */
               "usb-host.hostdevice", /* QEMU_CAPS_USB_HOST_HOSTDEVICE */
               "virtio-balloon.free-page-reporting", /* QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPORTING */
-              "block-export-add", /* QEMU_CAPS_BLOCK_EXPORT_ADD */
+              "block-export-add", /* X_QEMU_CAPS_BLOCK_EXPORT_ADD */
               "netdev.vhost-vdpa", /* QEMU_CAPS_NETDEV_VHOST_VDPA */
               "fsdev.createmode", /* X_QEMU_CAPS_FSDEV_CREATEMODE */
 
@@ -1243,7 +1243,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS },
     { "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 },
     { "set-action", QEMU_CAPS_SET_ACTION },
     { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE },
     { "sev-inject-launch-secret", QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET },
index 685a938bbc630e48c4653bb5d122c3e613b599cf..aa7274203ed7c5333f66054abf6e66ace19fb112 100644 (file)
@@ -581,7 +581,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     /* 380 */
     QEMU_CAPS_USB_HOST_HOSTDEVICE, /* -device usb-host.hostdevice */
     QEMU_CAPS_VIRTIO_BALLOON_FREE_PAGE_REPORTING, /*virtio balloon free-page-reporting */
-    QEMU_CAPS_BLOCK_EXPORT_ADD, /* 'block-export-add' command is supported */
+    X_QEMU_CAPS_BLOCK_EXPORT_ADD, /* 'block-export-add' command is supported */
     QEMU_CAPS_NETDEV_VHOST_VDPA, /* -netdev vhost-vdpa*/
     X_QEMU_CAPS_FSDEV_CREATEMODE, /* fsdev.createmode */
 
index 4f3669ebb7dc1fd8931af024601d208629c05af4..e0ce0f4a4b3b6f76aa6b7fae240494272cada811 100644 (file)
@@ -72,7 +72,6 @@
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='vhost-user-fs.bootindex'/>
   <flag name='vhost-user-blk'/>
index eaf35bb7033a8b0d336f139ca65d88cf4acfa9cc..df84533c9e7149912a7a90ce6fab21e0c836eec9 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index dea2e3fc893043b24112057b462a5ef41bfb5eab..a92eeee3bcc8063e3280a3df4e2aa64c858dfc86 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index cf5fc6b01751b97031b226c35382d77b9b424d89..d22ab2036846012e4cf9dfd40233f1f74ac6da08 100644 (file)
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index ed43c4767f9ee7011de67b5ca687de5acabded7a..5106109419bb0695abf920a98ae3b3c298e6a90e 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 9a273e531e626b5be5e652a63e9b9e7c23649e0d..6fceaa3477dda18a5cbb19721ee8ef2f1729f19d 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 3214f50be64a32b477c912fe01dcdf211ee94615..232ae833b8eb5793c321468b4b129c4dbf3771bc 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 46a93cadbcae6b6b7927703b8ed99d86a91f9e65..a152693f49e2b29587d4fe76257d0409de4acc02 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index eb5e35b904bcf64a76d604cff72f84e6d142aabb..cf47c29e71e27f0ddf178cf6d1a6aaf053799578 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index f8b79cc7516be5530df2ca9e4d245825de6d0d44..3615cc28fdfeff44cff95aa25ae04221655de4a9 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 6ea91329bc34aa893928fb600fdf5f526019e12e..c6f1957842ba6b8e446a36806cb6cf30a84b2ff4 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index dfecf16eaf7c4e337ce3c4180eb505c6697c4bc5..06b4c62fc6600461b4d76af3491af85c00e58e6b 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 09c9fbe17e92bb9eb0a8c657426fdc86ddd346a4..b5e5b794a636a9cf0cae918208ed3156bc791f97 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 4127437fcc502206e553e476207ca3b309ed969d..d8988eafd77bc08626647ef7ec5aacb33aabddf0 100644 (file)
@@ -69,7 +69,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='numa.hmat'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='vhost-user-fs.bootindex'/>
   <flag name='vhost-user-blk'/>
index eb03dd891a218f3ac30691e2ccc7b60105d00789..4a1c99641bf5f0881545f55fc2e744e57b69d22e 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 31757fcc4f90da3f89470f559f1ef7b2f7e8bb5f..122e6daa089c573d7fcc4813ea16c0dde0cdbda1 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index af50e1acd2a76cd810a837b24eb17f483dbf68e0..6dcd1889a9b3965658cfb46b7f0317d33a274368 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 067526a4f1c3a2294102f256c144ca0a6aa8b5fa..fc3c0df99a2aa1910aa265aee292f96817670ce9 100644 (file)
@@ -99,7 +99,6 @@
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 9b0b5bdd9da104a202a2cfc6da9e066a39d34c22..e536d752155289e571adc71a580c7bd9afa9e706 100644 (file)
@@ -69,7 +69,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='numa.hmat'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='vhost-user-fs.bootindex'/>
   <flag name='vhost-user-blk'/>
index e786f16ec151c17e57fc812a1dc77f41e9bbfc00..8b771baf559cb09c7fdcfcc813bc36e39b3ba6e2 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 74d10dc744a0ccee1d2dcc7ac8542893cf933b93..a5baecfb5c111fdddb872b25e83e16dc245f2e81 100644 (file)
@@ -33,7 +33,6 @@
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
   <flag name='numa.hmat'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='ncr53c90'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
index ec716821506950e3f9a27bab5be3cfb4e8d6f4b6..1e211a6ab11c3c0598b595d2f36251c9cd5350b7 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 2fa5d84c2475b47cfdae8f71244960088b4ff554..61c9029ed9fc37724af6009d021a46064a6e4bb9 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index f2fb085af3c05bff20c5ddcc5d4c912fa1e25b28..5f22c0be8772330f8b1058ee4fea534aa0117957 100644 (file)
@@ -72,7 +72,6 @@
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='vhost-user-fs.bootindex'/>
   <flag name='vhost-user-blk'/>
index 08a4b24ae72e771e48cae5dd883f400ddb20520c..cbeccccb4e935bee23008b86401ef62aef5d851a 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 7c9d245099e1e27f99bb339c6ebf751bfadcb138..144d7411e7c9fb6700160660c29279c68f46a7c3 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 572e829208d5f09310d0f44bf4627466813a1351..e831f64a12fa9811d39abf638f0990900243d418 100644 (file)
@@ -72,7 +72,6 @@
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='vhost-user-fs.bootindex'/>
   <flag name='vhost-user-blk'/>
index be235051e25ca80afc440dcd386853a6eeeb32bf..ff996730b353f45764f894ed9672c3c329cd97de 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
index 73b2897c22998752f6e5275b60b4c7d62f351be3..0d1db857f7bc7ae08b65a272b0743a5434da5dff 100644 (file)
   <flag name='numa.hmat'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
-  <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>