qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_DEL

Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2022-07-19 18:09:43 +02:00 · 2022-07-19 18:09:43 +02:00 · b27549e631
parent e06c1fa7ee
commit b27549e631
28 changed files with 2 additions and 29 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -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 },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -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 */
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -107,7 +107,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -105,7 +105,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -139,7 +139,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -109,7 +109,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -107,7 +107,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -106,7 +106,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -139,7 +139,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -138,7 +138,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -108,7 +108,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -105,7 +105,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -104,7 +104,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -138,7 +138,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -109,7 +109,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -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'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -137,7 +137,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -136,7 +136,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@ -116,7 +116,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@ -105,7 +105,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@ -136,7 +136,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@ -116,7 +116,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@ -111,7 +111,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@ -136,7 +136,6 @@
  <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'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@ -136,7 +136,6 @@
  <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'/>