qemu: Assume support and retire QEMU_CAPS_BLOCK_WRITE_THRESHOLD

The event was introduced in qemu-2.3 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-21 20:15:17 +00:00 · 2022-07-22 11:37:28 +02:00 · 2022-07-22 11:37:28 +02:00 · 66c442f80f
commit 66c442f80f
parent 3a7955979c
29 changed files with 2 additions and 35 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -413,7 +413,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "nvdimm", /* QEMU_CAPS_DEVICE_NVDIMM */
              "pcie-root-port", /* QEMU_CAPS_DEVICE_PCIE_ROOT_PORT */
              "query-cpu-definitions", /* QEMU_CAPS_QUERY_CPU_DEFINITIONS */
-              "block-write-threshold", /* QEMU_CAPS_BLOCK_WRITE_THRESHOLD */
+              "block-write-threshold", /* X_QEMU_CAPS_BLOCK_WRITE_THRESHOLD */

              /* 250 */
              "query-named-block-nodes", /* X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES */
@ -1232,7 +1232,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
 /* Use virQEMUCapsQMPSchemaQueries for querying parameters of events */
 struct virQEMUCapsStringFlags virQEMUCapsEvents[] = {
    { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE },
-    { "BLOCK_WRITE_THRESHOLD", QEMU_CAPS_BLOCK_WRITE_THRESHOLD },
    { "DUMP_COMPLETED", QEMU_CAPS_DUMP_COMPLETED },
 };

--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -392,7 +392,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_DEVICE_NVDIMM, /* -device nvdimm */
    QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, /* -device pcie-root-port */
    QEMU_CAPS_QUERY_CPU_DEFINITIONS, /* qmp query-cpu-definitions */
-    QEMU_CAPS_BLOCK_WRITE_THRESHOLD, /* BLOCK_WRITE_THRESHOLD event */
+    X_QEMU_CAPS_BLOCK_WRITE_THRESHOLD, /* BLOCK_WRITE_THRESHOLD event */

    /* 250 */
    X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@ -19550,12 +19550,6 @@ qemuDomainSetBlockThreshold(virDomainPtr dom,
    if (virDomainObjCheckActive(vm) < 0)
        goto endjob;

-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_WRITE_THRESHOLD)) {
-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                       _("this qemu does not support setting device threshold"));
-        goto endjob;
-    }
-
    if (!(src = qemuDomainGetStorageSourceByDevstr(dev, vm->def, priv->backup)))
        goto endjob;

--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -88,7 +88,6 @@
  <flag name='virtio-net.host_mtu'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -84,7 +84,6 @@
  <flag name='virtio-net.host_mtu'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -52,7 +52,6 @@
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -114,7 +114,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -90,7 +90,6 @@
  <flag name='virtio-net.host_mtu'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -86,7 +86,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -89,7 +89,6 @@
  <flag name='virtio-net.host_mtu'/>
  <flag name='spice-rendernode'/>
  <flag name='pcie-root-port'/>
-  <flag name='block-write-threshold'/>
  <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
@ -114,7 +114,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -28,7 +28,6 @@
  <flag name='chardev-logfile'/>
  <flag name='query-hotpluggable-cpus'/>
  <flag name='spice-rendernode'/>
-  <flag name='block-write-threshold'/>
  <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
@ -114,7 +114,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -90,7 +90,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -85,7 +85,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -88,7 +88,6 @@
  <flag name='virtio-net.host_mtu'/>
  <flag name='spice-rendernode'/>
  <flag name='pcie-root-port'/>
-  <flag name='block-write-threshold'/>
  <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
@ -51,7 +51,6 @@
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -114,7 +114,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -91,7 +91,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -51,7 +51,6 @@
  <flag name='query-cpu-model-expansion'/>
  <flag name='virtio-net.host_mtu'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -113,7 +113,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -112,7 +112,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -98,7 +98,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -85,7 +85,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -112,7 +112,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -98,7 +98,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -91,7 +91,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -112,7 +112,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <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
@ -112,7 +112,6 @@
  <flag name='nvdimm'/>
  <flag name='pcie-root-port'/>
  <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
  <flag name='cpu-cache'/>
  <flag name='qemu-xhci'/>
  <flag name='intel-iommu.intremap'/>