[PATCH 77/80] qemu: capabilities: Retire QEMU_CAPS_QUERY_NAMED_BLOCK_NODES

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 7342eb3596..d0fbe8d7f8 100644 --- 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 }, { "query-cpus-fast", QEMU_CAPS_QUERY_CPUS_FAST }, { "qom-list-properties", QEMU_CAPS_QOM_LIST_PROPERTIES }, { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f8d4d3df05..d06a7e6751 100644 --- 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 */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 2928f00c67..e285dd4899 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 7dc9b425ae..22a441e9c6 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 2ff0e9f8df..19c38fe572 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 744356169f..338ab4f925 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index f4e9e68dd0..c975dc1f27 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 3aeac68121..dda389f637 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index c1e72e3d9e..39650685a5 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index bebdf2ea75..b6dd2db3c0 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 46d6932662..095a036ef5 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 3ac32468f5..3b1c85d760 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 0c20e6c535..d617366402 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index c5ddbb1d09..e1ac1c645c 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 98b02aa2da..ba46833b94 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 5244458ebf..290f423cd5 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 0824e37c24..02aac89249 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 2e0bb0a374..58c19cdcd8 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 1a17bb6dfd..cd468e2a5e 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 75eda4d489..d462be83f9 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 4943e0dc94..94eb08aae6 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index eb5ba3786e..10c5efd07a 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 82c38be8a6..d9f644e797 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 58224325e5..bb51d7bca3 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 7848f4aca4..68526f345e 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index c6c946f758..524b692784 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 0af79c8ea6..f9f55d61bb 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 558507c573..3e45438116 100644 --- 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'/> -- 2.36.1