qemu: capabilities: Retire QEMU_CAPS_GLUSTER_DEBUG_LEVEL

The debug level of gluster backend became configurable in qemu-2.8. This also removes the only old-style syntax for the 'blockdev-add' command prior to stabilization. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-01-22 04:25:18 +00:00 · 2022-07-15 16:20:01 +02:00 · 2022-07-15 16:20:01 +02:00 · c250c5a3db
commit c250c5a3db
parent 73011dd0ab
28 changed files with 2 additions and 30 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -402,7 +402,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "query-qmp-schema", /* X_QEMU_CAPS_QUERY_QMP_SCHEMA */

              /* 240 */
-              "gluster.debug_level", /* QEMU_CAPS_GLUSTER_DEBUG_LEVEL */
+              "gluster.debug_level", /* X_QEMU_CAPS_GLUSTER_DEBUG_LEVEL */
              "vhost-scsi", /* QEMU_CAPS_DEVICE_VHOST_SCSI */
              "drive-iotune-group", /* X_QEMU_CAPS_DRIVE_IOTUNE_GROUP */
              "query-cpu-model-expansion", /* QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION */
@ -1583,8 +1583,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioIOMMU[] =

 /* see documentation for virQEMUQAPISchemaPathGet for the query format */
 static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
-    { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
-    { "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
    { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
    { "blockdev-add/arg-type/+qcow2/encrypt/+luks/key-secret", QEMU_CAPS_QCOW2_LUKS },
    { "blockdev-add/arg-type/+file/drop-cache", QEMU_CAPS_MIGRATION_FILE_DROP_CACHE },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -381,7 +381,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    X_QEMU_CAPS_QUERY_QMP_SCHEMA, /* query-qmp-schema command */

    /* 240 */
-    QEMU_CAPS_GLUSTER_DEBUG_LEVEL, /* -drive gluster.debug_level={0..9} */
+    X_QEMU_CAPS_GLUSTER_DEBUG_LEVEL, /* -drive gluster.debug_level={0..9} */
    QEMU_CAPS_DEVICE_VHOST_SCSI, /* -device vhost-scsi-{ccw,pci} */
    X_QEMU_CAPS_DRIVE_IOTUNE_GROUP, /* -drive throttling.group=<name> */
    QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion */
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -85,7 +85,6 @@
  <flag name='virtio-net.rx_queue_size'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -82,7 +82,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='virtio-net.host_mtu'/>
  <flag name='pcie-root-port'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -50,7 +50,6 @@
  <flag name='virtio-pci-disable-legacy'/>
  <flag name='query-hotpluggable-cpus'/>
  <flag name='virtio-net.rx_queue_size'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -109,7 +109,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -87,7 +87,6 @@
  <flag name='virtio-net.rx_queue_size'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -83,7 +83,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='virtio-net.host_mtu'/>
  <flag name='nvdimm'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -87,7 +87,6 @@
  <flag name='virtio-net.rx_queue_size'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='virtio-net.host_mtu'/>
  <flag name='spice-rendernode'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -109,7 +109,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -29,7 +29,6 @@
  <flag name='chardev-logfile'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='query-hotpluggable-cpus'/>
-  <flag name='gluster.debug_level'/>
  <flag name='spice-rendernode'/>
  <flag name='block-write-threshold'/>
  <flag name='query-named-block-nodes'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -109,7 +109,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -86,7 +86,6 @@
  <flag name='virtio-net.rx_queue_size'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -82,7 +82,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='virtio-net.host_mtu'/>
  <flag name='nvdimm'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -86,7 +86,6 @@
  <flag name='virtio-net.rx_queue_size'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='virtio-net.host_mtu'/>
  <flag name='spice-rendernode'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -49,7 +49,6 @@
  <flag name='virtio-pci-disable-legacy'/>
  <flag name='query-hotpluggable-cpus'/>
  <flag name='virtio-net.rx_queue_size'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -109,7 +109,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -87,7 +87,6 @@
  <flag name='virtio-net.rx_queue_size'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -49,7 +49,6 @@
  <flag name='virtio-pci-disable-legacy'/>
  <flag name='query-hotpluggable-cpus'/>
  <flag name='virtio-net.rx_queue_size'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -108,7 +108,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -107,7 +107,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@ -93,7 +93,6 @@
  <flag name='virtio-net.rx_queue_size'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@ -82,7 +82,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='virtio-net.host_mtu'/>
  <flag name='nvdimm'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@ -107,7 +107,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@ -93,7 +93,6 @@
  <flag name='virtio-net.rx_queue_size'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@ -88,7 +88,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='virtio-net.host_mtu'/>
  <flag name='nvdimm'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@ -107,7 +107,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@ -107,7 +107,6 @@
  <flag name='virtio-vga'/>
  <flag name='ivshmem-plain'/>
  <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
  <flag name='vhost-scsi'/>
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>