[PATCH 24/80] qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_DEL

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - 28 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5ef2997ed4..b91f46bb12 100644 --- 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 */ @@ -1213,7 +1213,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "query-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES }, { "query-cpus-fast", QEMU_CAPS_QUERY_CPUS_FAST }, { "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 }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 89aa63cffe..5f982b11d5 100644 --- 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 */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 1d16f61a72..419a987068 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.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='egl-headless'/> <flag name='vfio-pci.display'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 8a64694a8d..ceaedd3863 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.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='machine.pseries.cap-hpt-max-page-size'/> <flag name='machine.pseries.cap-htm'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 9b80f2b915..d1ed2a781c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -76,7 +76,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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index b8ac4b3799..784a837e91 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -140,7 +140,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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 10a3a1024d..b67c55b192 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -110,7 +110,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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 94cdb860c4..5527659aaa 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.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='machine.pseries.cap-hpt-max-page-size'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 49c4021e58..e8e6ab7e9d 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 2070c01937..d08eadc5b4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -140,7 +140,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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index b7c835bb14..a971ccf740 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -41,7 +41,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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index b68f5857b4..8a33f277ab 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index e9df6a479e..83d814613d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index aa7bd3b392..fd07ed826e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.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='tpm-emulator'/> <flag name='machine.pseries.cap-hpt-max-page-size'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 61fbbcfd91..7c3adbe8b1 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.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='egl-headless'/> <flag name='vfio-pci.display'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 3ed4721e55..edadf9ff2c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -74,7 +74,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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index cc5bccabe2..838add4a26 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 416ed10e6d..f59c32fe9d 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -110,7 +110,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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index e5d7782874..e39ec10987 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -74,7 +74,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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index dfb2caa06e..89f397c458 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 161725a1e4..f372d93e28 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 7034e01a3d..9e847c3dcd 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -117,7 +117,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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 8c1c8e0904..da23234b5b 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.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='tpm-emulator'/> <flag name='machine.pseries.cap-hpt-max-page-size'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 606eb10e8c..1e88f23deb 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.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'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index ad4b64f2a8..92b996df23 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -117,7 +117,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'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 0bceeba596..24dae3160c 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -112,7 +112,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'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 6ae458e577..2cf01d010e 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.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'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 69b5ae7958..c6089f29a0 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.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'/> -- 2.36.1