]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_QUERY_NAMED_BLOCK_NODES
authorPeter Krempa <pkrempa@redhat.com>
Fri, 22 Jul 2022 09:34:59 +0000 (11:34 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 11 Aug 2022 13:26:02 +0000 (15:26 +0200)
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 a4f595151bcc7d2cbf3d7928819cf8824abfdf24..bfc8f37c6f7106a7bb14c4fea18fdc4efb2b4378 100644 (file)
@@ -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 },
index f46e01ed814c0903a8a48d4aa6884a5be9b8024c..55878ed84e69f52dc0925b032c5f3a60f96495af 100644 (file)
@@ -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 */
index 9227cb6271a7e82d69451bff6c99537cfe54e8c6..fe454c4bd1e0bd5f3cb500e9844a594ca3b25013 100644 (file)
@@ -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'/>
index bdcc7d127d91e2122a5d271b34474a2df86f4adb..333c54c1892e8022421712be449e833e45d5e9de 100644 (file)
@@ -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'/>
index 4ce4a018c25907b637f35fbccedd970c65057ea8..87bd16535443ec8312cd7c8b987f6ad986caaead 100644 (file)
@@ -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'/>
index f729c4af5ecf16c67af0b8b0771363ed22575453..8f311e5892182905ea978405816d236a140e3a19 100644 (file)
   <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'/>
index 5bcfe88001fc0fc057713769ef05ca13ae880592..532f2443933c660f5d77be0db1499c04a7be3985 100644 (file)
@@ -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'/>
index 57dd8259b36a6d60a6ffc2058a6dd55887375292..cc54160fc1176497ff62815679d11c9edf281443 100644 (file)
@@ -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'/>
index 0beb82dc39ad007ba145559713cc48633893cbc9..c9ee6976d641c7550334fc3d73c5593c3e702d7a 100644 (file)
@@ -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'/>
index a29a59b4b7ba54361a9f44c3e0cc33d99556ac30..47ea4d41a530a63e285a89403e2a8332f297f17c 100644 (file)
   <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'/>
index 7a79c33fce1a43ca71fb800665165dc9f88391ae..5e61c805356ac9651f899927b12c24e5b4db8731 100644 (file)
@@ -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'/>
index b5f1ad4eb38ea1a295a89bad1e36bf62bfca5ca8..7c3e01171b45fd7b3ad3a420e9b27120fb6ff289 100644 (file)
   <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'/>
index 0325abbd6a1e0f514a2bd0d099add3a399359c89..fc2338bb9bc56fa5253b05852fa7b3167eec5977 100644 (file)
@@ -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'/>
index 3879d8f45033078dacb1931dd52629455c0bc42a..f1223be33f2ba63a9c8d0052b4f78a50095e0b46 100644 (file)
@@ -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'/>
index ba5e0f126d4d3ee18cac1a0453200a98d4b35daa..ca1e06129a694f17ec9cb96eb67d0bd75c9bd034 100644 (file)
@@ -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'/>
index 394f2faa7ebd1b651b57a2097b0b2195ad5086a6..694620afc1e1567e411cb4afce82a730345eef3b 100644 (file)
@@ -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'/>
index 72e6c10c4c3ec29a4a0bb1e2301ac4e74788e5fe..504b2918aad4474ce7c2bf10de7039309c2dfd18 100644 (file)
   <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'/>
index 05519801042287761f52f59111cc67f834c019e6..0b8f25275b0031ea653047edb1a06545c1a53afb 100644 (file)
@@ -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'/>
index f62cec0b2c6f9d7df996f151aee0a9961ff48bb3..fd42527da6ea51b16f1d0fd1535906a59a562e5c 100644 (file)
@@ -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'/>
index 2dacec1b8ec491b8c4300ec2623c29a630fbc01c..2a830ab1237aedfa22c3539f3ca751bb39937c53 100644 (file)
   <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'/>
index 9098c04304c00eca5a98534a27460d27a8c37bd1..6b6362297c06858863c6bb431aeffbf5796fcc76 100644 (file)
   <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'/>
index 4d3118a8080f044dcf9fcfa91549df9e9a55273d..38976deb07f904fc058f011189928f85bf094e68 100644 (file)
@@ -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'/>
index 4ad1c06d54299170ec7488d5077b6b52549cc292..24b9de238c0262d6a6bf01047db7b05744da81fd 100644 (file)
@@ -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'/>
index 05585b60c52e1cf3cb93afa2747e165dc61b5e32..5a54c33685f0782441f24e221e58a23db5706c9c 100644 (file)
   <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'/>
index b15d1a08b0e13adb128c5f7a6556e72f26ebeda7..5f84dae750f0a2f46d418d8c7efe02a55f1128e7 100644 (file)
@@ -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'/>
index e8be5facb1db4f8eab831e3ae2b68e27a6d1c24d..b9a6be05dcaf36d2de1454f8e74a80ca722c82c8 100644 (file)
@@ -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'/>
index 172ba4557073d609dc8ff92579180ae124c6397e..b9331453ff616e1783ae559158ae8b8f7595818b 100644 (file)
   <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'/>
index ac143d28304b062372695f14a6bb14c0dedd48a5..da52e740f109ecd0d4e93c0d819f84c517436e14 100644 (file)
   <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'/>