Re: [PATCH 7/7] qemu: deprecate query-cpus-fast capability

[Peter Krempa]

On Mon, Aug 08, 2022 at 15:06:08 +0200, Paolo Bonzini wrote:
> All supported versions of QEMU have the command.
> 
> Signed-off-by: Paolo Bonzini 
> ---
>  src/qemu/qemu_capabilities.c | 4 ++--
>  src/qemu/qemu_capabilities.h | 2 +-
>  tests/qemuhotplugtest.c  | 2 --
>  3 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index c2c55f4800..1eb006e3ef 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -468,7 +468,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
>"qcow2-luks", /* QEMU_CAPS_QCOW2_LUKS */
>"pcie-pci-bridge", /* QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE */
>"seccomp-blacklist", /* X_QEMU_CAPS_SECCOMP_BLACKLIST */
> -  "query-cpus-fast", /* QEMU_CAPS_QUERY_CPUS_FAST */
> +  "query-cpus-fast", /* X_QEMU_CAPS_QUERY_CPUS_FAST */
>"disk-write-cache", /* QEMU_CAPS_DISK_WRITE_CACHE */
>  
>/* 290 */
> @@ -1212,7 +1212,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 },
> +{ "query-cpus-fast", X_QEMU_CAPS_QUERY_CPUS_FAST },

We no longer need to actually probe this capability, so this line should
be dropped.

This will require that the output files are re-generated, but we can do
that before pushing.

[PATCH 7/7] qemu: deprecate query-cpus-fast capability

[Paolo Bonzini]

All supported versions of QEMU have the command.

Signed-off-by: Paolo Bonzini 
---
 src/qemu/qemu_capabilities.c | 4 ++--
 src/qemu/qemu_capabilities.h | 2 +-
 tests/qemuhotplugtest.c  | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c2c55f4800..1eb006e3ef 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -468,7 +468,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
   "qcow2-luks", /* QEMU_CAPS_QCOW2_LUKS */
   "pcie-pci-bridge", /* QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE */
   "seccomp-blacklist", /* X_QEMU_CAPS_SECCOMP_BLACKLIST */
-  "query-cpus-fast", /* QEMU_CAPS_QUERY_CPUS_FAST */
+  "query-cpus-fast", /* X_QEMU_CAPS_QUERY_CPUS_FAST */
   "disk-write-cache", /* QEMU_CAPS_DISK_WRITE_CACHE */
 
   /* 290 */
@@ -1212,7 +1212,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 },
+{ "query-cpus-fast", X_QEMU_CAPS_QUERY_CPUS_FAST },
 { "qom-list-properties", QEMU_CAPS_QOM_LIST_PROPERTIES },
 { "blockdev-del", QEMU_CAPS_BLOCKDEV_DEL },
 { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 8f3090e2ce..20b1034ca5 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -447,7 +447,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for 
syntax-check */
 QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */
 QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */
 X_QEMU_CAPS_SECCOMP_BLACKLIST, /* -sandbox.elevateprivileges */
-QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */
+X_QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */
 QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-cache 
param */
 
 /* 290 */
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 3c9dac241a..133145a23a 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -443,8 +443,6 @@ testQemuHotplugCpuPrepare(const char *test,
 
 priv = data->vm->privateData;
 
-virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_QUERY_CPUS_FAST);
-
 if (data->modern)
 virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);
 
-- 
2.37.1