Re: [libvirt] [PATCHv2 1/6] qemu: add capability detection for query-cpus-fast
On 03/05/2018 06:44 AM, Viktor Mihajlovski wrote:
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(a)linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com>
Acked-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 4 +++-
src/qemu/qemu_capabilities.h | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
Now that the 2.12 caps update has been pushed... It's "open season" on
the qemu_capabilities.{c,h}. Since this series has been on list the
longest, I'll start here...
This particular patch will need an update to add the new flag to the
various caps_2.12*.xml files (VIR_TEST_REGENERATE_OUTPUT=1
tests/qemucapabilitiestest does the trick).
diff --git a/src/qemu/qemu_capabilities.c
b/src/qemu/qemu_capabilities.c
index b5eb8cf..6635f5e 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -459,6 +459,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"pl011",
"machine.pseries.max-cpu-compat",
"dump-completed",
+ "query-cpus-fast",
);
@@ -1579,7 +1580,8 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
{ "query-qmp-schema", QEMU_CAPS_QUERY_QMP_SCHEMA },
{ "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-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES},
+ { "query-cpus-fast", QEMU_CAPS_QUERY_CPUS_FAST}
I know this has been ACK'd; however, I recently pushed a small fixup in
this area that you'll have a merge with, see commit id '1706bef6' (I saw
that while working on something else, but noted this patch is affected).
Still for this new entry, it'd be better to use the format :
{ "query-cpus-fast", QEMU_CAPS_QUERY_CPUS_FAST },
John
};
struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index c2ec2be..e3c31ab 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -444,6 +444,7 @@ typedef enum {
QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */
QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-compat= */
QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */
+ QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;