qemu: capabilities: Retire QEMU_CAPS_QUERY_NAMED_BLOCK_NODES

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-26 14:03:49 +03:00 · 2022-07-22 11:34:59 +02:00 · 2022-07-22 11:34:59 +02:00 · 3a7955979c
commit 3a7955979c
parent 0bbd7257c4
28 changed files with 2 additions and 29 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -416,7 +416,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "block-write-threshold", /* QEMU_CAPS_BLOCK_WRITE_THRESHOLD */

              /* 250 */
-              "query-named-block-nodes", /* QEMU_CAPS_QUERY_NAMED_BLOCK_NODES */
+              "query-named-block-nodes", /* X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES */
              "cpu-cache", /* QEMU_CAPS_CPU_CACHE */
              "qemu-xhci", /* QEMU_CAPS_DEVICE_QEMU_XHCI */
              "kernel-irqchip", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP */
@ -1210,7 +1210,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
    { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS },
    { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION },
    { "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 },
    { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE },
    { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -395,7 +395,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_BLOCK_WRITE_THRESHOLD, /* BLOCK_WRITE_THRESHOLD event */

    /* 250 */
-    QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */
+    X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */
    QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache properties */
    QEMU_CAPS_DEVICE_QEMU_XHCI, /* -device qemu-xhci */
    X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -89,7 +89,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -85,7 +85,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -53,7 +53,6 @@
  <flag name='virtio-net.host_mtu'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='loadparm'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -115,7 +115,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
  <flag name='intel-iommu.intremap'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -91,7 +91,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -87,7 +87,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -90,7 +90,6 @@
  <flag name='spice-rendernode'/>
  <flag name='pcie-root-port'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -115,7 +115,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
  <flag name='intel-iommu.intremap'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -29,7 +29,6 @@
  <flag name='query-hotpluggable-cpus'/>
  <flag name='spice-rendernode'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='chardev-reconnect'/>
  <flag name='disk-share-rw'/>
  <flag name='isa-serial'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -115,7 +115,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
  <flag name='intel-iommu.intremap'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -91,7 +91,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -86,7 +86,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -89,7 +89,6 @@
  <flag name='spice-rendernode'/>
  <flag name='pcie-root-port'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -52,7 +52,6 @@
  <flag name='virtio-net.host_mtu'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='loadparm'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -115,7 +115,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
  <flag name='intel-iommu.intremap'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -92,7 +92,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -52,7 +52,6 @@
  <flag name='virtio-net.host_mtu'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='loadparm'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -114,7 +114,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
  <flag name='intel-iommu.intremap'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -113,7 +113,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
  <flag name='intel-iommu.intremap'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@ -99,7 +99,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@ -86,7 +86,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@ -113,7 +113,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
  <flag name='intel-iommu.intremap'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@ -99,7 +99,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='virtio-net.tx_queue_size'/>
  <flag name='chardev-reconnect'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@ -92,7 +92,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='qemu-xhci'/>
  <flag name='spapr-pci-host-bridge'/>
  <flag name='spapr-pci-host-bridge.numa_node'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@ -113,7 +113,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
  <flag name='intel-iommu.intremap'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@ -113,7 +113,6 @@
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
  <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
  <flag name='intel-iommu.intremap'/>