]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Assume support and retire QEMU_CAPS_BLOCK_WRITE_THRESHOLD
authorPeter Krempa <pkrempa@redhat.com>
Fri, 22 Jul 2022 09:37:28 +0000 (11:37 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 11 Aug 2022 13:26:17 +0000 (15:26 +0200)
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>
29 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
src/qemu/qemu_driver.c
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 bfc8f37c6f7106a7bb14c4fea18fdc4efb2b4378..c213d3f9be2aeccebb8eede7f242e8557276ccd5 100644 (file)
@@ -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 },
 };
 
index 55878ed84e69f52dc0925b032c5f3a60f96495af..32dd6bb76eef47613f2a9b6f7e5db8fce826d08c 100644 (file)
@@ -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 */
index bb723723d03c9f3f8d59102a8e4c1dce9bfa1cd8..e078044f9fd8d65cad880cdef2ec411ab4aa6e84 100644 (file)
@@ -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;
 
index fe454c4bd1e0bd5f3cb500e9844a594ca3b25013..782607d29a9edff9dfa4c29ca4354691270a7e08 100644 (file)
@@ -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'/>
index 333c54c1892e8022421712be449e833e45d5e9de..dd921f8df114e326f1591f86f2068ea21fd940e3 100644 (file)
@@ -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'/>
index 87bd16535443ec8312cd7c8b987f6ad986caaead..9cb275d5d061b357020470e57a5330147f9f4711 100644 (file)
@@ -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'/>
index 8f311e5892182905ea978405816d236a140e3a19..e6859d90453a810461ec54b1b98abe5ac3b1ecb5 100644 (file)
   <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'/>
index 532f2443933c660f5d77be0db1499c04a7be3985..19854cb911b30ed4bd9ab43d121e70f442d897b6 100644 (file)
@@ -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'/>
index cc54160fc1176497ff62815679d11c9edf281443..51b581eeb8d260c6d1dbe6c749b5e909b6071c60 100644 (file)
@@ -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'/>
index c9ee6976d641c7550334fc3d73c5593c3e702d7a..9c3127334c71d21a034078fdc10b9ca9ff0c1aea 100644 (file)
@@ -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'/>
index 47ea4d41a530a63e285a89403e2a8332f297f17c..ab771f0c93beedb16e4d82bb989a8f991c692700 100644 (file)
   <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'/>
index 5e61c805356ac9651f899927b12c24e5b4db8731..b64668d4a07695f0bd4cd3597388cf2cd3e71f91 100644 (file)
@@ -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'/>
index 7c3e01171b45fd7b3ad3a420e9b27120fb6ff289..4fce645f5c0f9501ccf1cb6f88175ea256b4618a 100644 (file)
   <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'/>
index fc2338bb9bc56fa5253b05852fa7b3167eec5977..e56ef330405bcfd71768e3cd68036a51cd8c7841 100644 (file)
@@ -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'/>
index f1223be33f2ba63a9c8d0052b4f78a50095e0b46..5f4444e8863bb0d50dc8e4fb17b8b674725b299f 100644 (file)
@@ -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'/>
index ca1e06129a694f17ec9cb96eb67d0bd75c9bd034..e5fc38177d5b66234c85584be31669c8979af51e 100644 (file)
@@ -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'/>
index 694620afc1e1567e411cb4afce82a730345eef3b..642a3395f4e72b2614540992fd0016ed903a98a9 100644 (file)
@@ -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'/>
index 504b2918aad4474ce7c2bf10de7039309c2dfd18..5fd15aae279bfad05f1ddbc5ff17edcc422a5698 100644 (file)
   <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'/>
index 0b8f25275b0031ea653047edb1a06545c1a53afb..59d95992eb52160b043042f7df474c10a806e897 100644 (file)
@@ -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'/>
index fd42527da6ea51b16f1d0fd1535906a59a562e5c..25bca758b71ef9992a312846f1a35b2777fdb54e 100644 (file)
@@ -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'/>
index 2a830ab1237aedfa22c3539f3ca751bb39937c53..e89c36402338d907e764dd11421aa2f8c48a528c 100644 (file)
   <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'/>
index 6b6362297c06858863c6bb431aeffbf5796fcc76..f32a3f48e812a7f2b888e68d63a9cecdb86826e0 100644 (file)
   <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'/>
index 38976deb07f904fc058f011189928f85bf094e68..c01a0d91cc6f07369e111103acf25449714f0ca5 100644 (file)
@@ -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'/>
index 24b9de238c0262d6a6bf01047db7b05744da81fd..02911198732708da90d51246de1e38d5c66961f9 100644 (file)
@@ -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'/>
index 5a54c33685f0782441f24e221e58a23db5706c9c..50c04c60200da420883be0914c65e60698338820 100644 (file)
   <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'/>
index 5f84dae750f0a2f46d418d8c7efe02a55f1128e7..d48167f6086de915e6bf7c840e6847e523344282 100644 (file)
@@ -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'/>
index b9a6be05dcaf36d2de1454f8e74a80ca722c82c8..c4155dd4d592c92a1f939c5fab855a12d4678723 100644 (file)
@@ -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'/>
index b9331453ff616e1783ae559158ae8b8f7595818b..4dba9159484743d447518d183287184870d3e269 100644 (file)
   <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'/>
index da52e740f109ecd0d4e93c0d819f84c517436e14..2ee44edfab3741f1970ad679efc4f71520fe9c98 100644 (file)
   <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'/>