]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_GLUSTER_DEBUG_LEVEL
authorPeter Krempa <pkrempa@redhat.com>
Fri, 15 Jul 2022 14:20:01 +0000 (16:20 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 11 Aug 2022 12:38:31 +0000 (14:38 +0200)
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>
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 f2c00ac58d148a4cebdf2192deb8eae90c383eb1..a7f0c1d783e5c5944f89ef46dbfa0804263705cd 100644 (file)
@@ -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 },
index 3492dbefd3fdb6a21e8fa8c0c15686ebb453bb45..92747663ecaa1a019022e2be4191dd163929fe10 100644 (file)
@@ -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 */
index f3be803693154a203362c5752874f2089b043cd3..739aca98ae88c14db6a1ba86739b3bd9b1810b99 100644 (file)
@@ -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'/>
index cf1310be6af5f60ee792303deb545670961a6c36..bb8608d0220fdbb52ede4411342c4e3e57092acc 100644 (file)
@@ -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'/>
index 715e5713df14c1393b07e36ccc5001ad784eb174..f10d4a5ad616cf4515c3d5f1484c95e388255bef 100644 (file)
@@ -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'/>
index 6b4532ba7c41b742dc65845eb06e66ebb009b7d3..c045957590c91da34a6337e6e29e89b711ec94c3 100644 (file)
   <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'/>
index 201681ea3c2eaa1a49b7aaaa15e5b1a4e675b85f..4072446a2e71d1812796c2d6b6e4d17f04eee6a7 100644 (file)
@@ -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'/>
index fad58ae6adbece4b80c4436b196f75d78f3bc939..48b04f70009dde95dece3a2ef7a24e24b8aeaa04 100644 (file)
@@ -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'/>
index 618ede882e5562cff87c04b61136bd8fccfb3703..e46d8e3c64173e34555aa90ac41f8ecbdfb4fee2 100644 (file)
@@ -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'/>
index c2e74cc04ec4511caee18db16003b7cc32f0dd27..422c981dd7863f8f620a91d3cb7d7169a42e8f0c 100644 (file)
   <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'/>
index e05dfc246c062d7d1041c81f660b4e2676cb955e..5735078021f2e9dc7e95f57d7fdd7c9e7a9837a1 100644 (file)
@@ -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'/>
index f28f3019c371fcb9221301cf831646370d9669ed..a5b09c87366fee51735a800d24a46163a1e4d2ba 100644 (file)
   <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'/>
index c07c1125f88241648de89d145f9e568c1df9a30f..e2652f93441d9862ca298e2b0f6c4bb5f239e737 100644 (file)
@@ -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'/>
index c34aa566996e82a5e9d2b0dbc5f456302e767d8b..0c84b9bdfac5f47d68349a81685c12edb5f839fe 100644 (file)
@@ -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'/>
index bcd0f600b282395d4e71e1caa1ad3d6ccfb543f3..40a7b492207630d5c3c0fbc6e1cf1e93b7dd0884 100644 (file)
@@ -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'/>
index 62a7a009b9a36364cb8babad2025099a7540d130..a3b071a70f3858657556eb1d1c1f471b09260908 100644 (file)
@@ -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'/>
index 1b6511a9d98830b5b1830e292a1d4d3d60a150a2..a942b9cea2dfbac13b7b6345a97179e80557af13 100644 (file)
   <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'/>
index 4702f5d7c1de1a08d7206db874d4a695629e136d..de0ea389564ad6c4b628bcd8c18267e51798616a 100644 (file)
@@ -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'/>
index 0711eae34c6ee17112349c109ca1a549be537218..b2fbf7b0b1e1b54b3f9839f43ecd70176eddcbad 100644 (file)
@@ -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'/>
index ecf4ee767febc731e5fee88e298c74c3b07054f1..b485d651193181ba79215668d3919e75f1e3f4f3 100644 (file)
   <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'/>
index e266a72ed8e476e04e0ff0c93b1757b668a059b3..f6d47d66fd67f8baa86dbab9a868563a9fa4ccb9 100644 (file)
   <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'/>
index 176be83cac83bf351397c30c7115537ae2851a8d..90232f2fdd9c0f5550a0b1b66fbab1d1b0dbeed6 100644 (file)
@@ -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'/>
index a961abac1cd835c1a92e1c9f880d3c300dc45f9b..481b12457640125e2b13b657ef6b32bd89f1b90b 100644 (file)
@@ -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'/>
index b1bcd07c9b8b84d7313c61b0c3cb94ab71040dbb..b44ae212fb83bff7225dd9e90098e2be9b2879e4 100644 (file)
   <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'/>
index d1738ff4ff2b2bd8145eedeb98ea10425069c115..dc17500ec36131d185cbea5fdc9b7087b5bcf06b 100644 (file)
@@ -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'/>
index a1c5f02c52be3cbb8786aeccdbcd5f68ff5bc874..55b5736b6f0db37441901bb693c38d1305a053e8 100644 (file)
@@ -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'/>
index afc86d57b7f8a65172f4dbebbb1d08ea469093c3..be8b256c41cda8d762652edc892c1fa560c163b4 100644 (file)
   <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'/>
index c3d5347d64b1edc71ff92a7900cbe0668f4d6ba0..931a96b04e7c3909438f543cccd478a8b507c69f 100644 (file)
   <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'/>