]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_DEL
authorPeter Krempa <pkrempa@redhat.com>
Tue, 19 Jul 2022 16:09:43 +0000 (18:09 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 11 Aug 2022 13:07:14 +0000 (15:07 +0200)
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
28 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml

index f0f0f9f00d05fe2f4b5328a6da3f6d95009583d3..975383d2b62b2872bab911738eb411bc2029cb71 100644 (file)
@@ -487,7 +487,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
 
               /* 300 */
               "hda-output", /* QEMU_CAPS_HDA_OUTPUT */
-              "blockdev-del", /* QEMU_CAPS_BLOCKDEV_DEL */
+              "blockdev-del", /* X_QEMU_CAPS_BLOCKDEV_DEL */
               "vmgenid", /* QEMU_CAPS_DEVICE_VMGENID */
               "vhost-vsock", /* QEMU_CAPS_DEVICE_VHOST_VSOCK */
               "chardev-fd-pass", /* X_QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE */
@@ -1212,7 +1212,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS },
     { "query-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES },
     { "qom-list-properties", QEMU_CAPS_QOM_LIST_PROPERTIES },
-    { "blockdev-del", QEMU_CAPS_BLOCKDEV_DEL },
     { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE },
     { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE },
     { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE },
index dd03bbe25d872ec08cfd8642c7c0c64d6ba706a3..39e8f0674dac99d2450675a7c4199ed007e8df2b 100644 (file)
@@ -466,7 +466,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
 
     /* 300 */
     QEMU_CAPS_HDA_OUTPUT, /* -device hda-output */
-    QEMU_CAPS_BLOCKDEV_DEL, /* blockdev-del is supported */
+    X_QEMU_CAPS_BLOCKDEV_DEL, /* blockdev-del is supported */
     QEMU_CAPS_DEVICE_VMGENID, /* -device vmgenid */
     QEMU_CAPS_DEVICE_VHOST_VSOCK, /* -device vhost-vsock-* */
     X_QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE, /* Passing pre-opened FDs for chardevs on commandline */
index f74719af6159af27cf453e24e499adea6401948a..8b6b00600c081b7aecf37d68ddc97a4776ddfce2 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
index 6c53e53b9d0531dcc8136c80ff0e3840919fe5d2..176ada07973b0b40ee64f09a9a6ac489f8ea154b 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='machine.pseries.cap-hpt-max-page-size'/>
   <flag name='machine.pseries.cap-htm'/>
index c05089585ad204ef1c7cea10b1590b17cdd2d55c..ed0c7d00006e76a847b72b15d80136bcc1ff33d3 100644 (file)
@@ -75,7 +75,6 @@
   <flag name='virtual-css-bridge.cssid-unrestricted'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
index aaaf1d64f045c8c4fcf55fa52694d1cff7fa7534..e79ae14ff06eb6fb152e04739dd9019bd45631f6 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
index b5e7b8274c80985aae1a18ab317a0b85761510fc..a5684067b85c62bf609af96713f0d53ac6b2d302 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
index 3438fc14bbb76bf4b4be8dfd6350a3d9f6a3432f..6bf0c5cef60c8ad0e98f3c7ce78e366f4e6e2364 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='machine.pseries.cap-hpt-max-page-size'/>
index fa67a21ee8d3a59b77769337d678f4c1507ddf59..8131713d64c7e011327b076637d355ed6f7b2cad 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
index 6a82e24659af9809e2b5367b55f9a8a2c85a415a..7ccf0455213fc92e9d21e0590488d8fe36c7bd31 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
index 58cd77585cd413037c3d5d377f432151567ab411..b3499c5062c3d22218dca6a39eb62209f0a7aca2 100644 (file)
@@ -40,7 +40,6 @@
   <flag name='qom-list-properties'/>
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
-  <flag name='blockdev-del'/>
   <flag name='egl-headless'/>
   <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
index 6616a6bf1596dcd8e03f6d39fc0f4ca256248ae1..26e9b8c5c2c52c662ed7be782a5209fb3daa96f5 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
index ffc66a8593a8064bb2cb677fcfb4c13775c726a7..531ee42bd909f728a4cc05f858748d64f003387a 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
index 4f75dc8aadeec55e3da71d153dd809fa7d452e03..6942a28eb78631e0ff64da0d728fa5620a4b6cf8 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='machine.pseries.cap-hpt-max-page-size'/>
index 2e3fcd2e3923d0bfdcc169ada9dd97c158499078..1b1812083cae7fd41cd4c365334e4d71037844b2 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
index 22c75094ddd097a94998f9061d5ffe5fcd13e738..811ba2cae772fd78e46fde907b521bb8dfc04996 100644 (file)
@@ -73,7 +73,6 @@
   <flag name='virtual-css-bridge.cssid-unrestricted'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
index add8c94704f0339325b311557270c59d657cd7ea..4d79c6a155081389c89561168ea69c6bb758db49 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
index 79ea999de3b8377be460def91ba269bfbe6c7ec4..14923ef2591fbd07a450a409b91af11eefda78d7 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
index a4a4e45eccd83db4defa6e99ba35fe6b8f08a4e7..53ef416e2d67511e63471aecfc2dcdfab48e2445 100644 (file)
@@ -73,7 +73,6 @@
   <flag name='virtual-css-bridge.cssid-unrestricted'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
index 95d7caa4ad01df9702e8dbc74e39ee7f08417e91..0b0ede3a9494a68a219a9b20fcbf84dbea53e3de 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
index d5d98e72a643f9c4ef7a5b120a3d5efd10130b16..9addb44fffed965ae36c56a4d2697ea8e70b3551 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
index 684227b087b032ef5cd11f5ac759d0c7b1daf154..8bd8df794868366efcfb9a7665d1b788e495256f 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
index 294e83309fb7071be88d486df954a5e9ecef7129..a278d8bb0835b78256354642952c2298ceb1e2bd 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='machine.pseries.cap-hpt-max-page-size'/>
index 0c22ddb46816f978f2398b5499efcd279dd6fd94..8cb0b586530457d6353c1e813bed7c246ee31619 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
index e1a3113b6855ec44ac4cf9b11c5f6d30d6549c13..f0d203b8d24e175037f511c6bc16c2e41b235e2d 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
index 63c8e09ea9f128888b4cab128b702bb3aff9f095..447bdf9fe88e3adda53f40824fe6c43c6f867d49 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='machine.pseries.cap-hpt-max-page-size'/>
index 891f18aa3dffb2bd86a18114420c1ccdcbcc4b38..2eeabbfc4454dd49ed3c89eb98456770b564c6c8 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
index 070c00fd290e787c9cc1174410023d99156fa618..f61f3a7cd33934ac9f3ed8cc9c6491afdaa60c2b 100644 (file)
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>