qemu: add capability detection for query-cpus-fast

Detect whether QEMU supports the QMP query-cpus-fast API
and set QEMU_CAPS_QUERY_CPUS_FAST in this case.

Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f379fc6d229a55fd0fd12ca9596086b8669e5e85..598a56911ee6e4c0feccd2f1e0a0c08110170171 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -469,6 +469,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "qcow2-luks",
               "pcie-pci-bridge",
               "seccomp-blacklist",
+
+              /* 290 */
+              "query-cpus-fast",
     );
 
 
@@ -979,6 +982,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "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 },
 };
 
 struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 200e9106576b5d736717d1f3c95471a2eabd580c..3962c9c4434a75b9b5a3d5ced3df28607325fa7f 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -454,6 +454,9 @@ typedef enum {
     QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */
     QEMU_CAPS_SECCOMP_BLACKLIST, /* -sandbox.elevateprivileges */
 
+    /* 290 */
+    QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */
+
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
 

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 65cfbf41a4ba4c3ec90bc3bd325d42a15487e137..d50a440776c3fdea701c068814e737a193a7c556 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -155,6 +155,7 @@
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='seccomp-blacklist'/>
+  <flag name='query-cpus-fast'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>342346</microcodeVersion>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 53c1a2a524d39f12ac79e6e2450f51cb9a2c08cf..c4cdd248b0b4862942deb832db26839ff32463d3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -152,6 +152,7 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='seccomp-blacklist'/>
+  <flag name='query-cpus-fast'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>419215</microcodeVersion>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 9523cb004d36fb9e317c8193e86a82e68abf815f..122801dd309ebff5d82cd6d2de2c80c968df0fa0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -117,6 +117,7 @@
   <flag name='virtio-tablet-ccw'/>
   <flag name='qcow2-luks'/>
   <flag name='seccomp-blacklist'/>
+  <flag name='query-cpus-fast'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 4a1f2191dcfbcdbf26fcee442b16a0142a600bd7..37c9243a584831f4fd4eb34c7b335825baee0d7b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -193,6 +193,7 @@
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='seccomp-blacklist'/>
+  <flag name='query-cpus-fast'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>390060</microcodeVersion>