qemu: deprecate query-cpus-fast capability

All supported versions of QEMU have the command.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

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,6 @@ 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 },
     { "qom-list-properties", QEMU_CAPS_QOM_LIST_PROPERTIES },
     { "blockdev-del", QEMU_CAPS_BLOCKDEV_DEL },
     { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE },

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 */

tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml

@@ -97,7 +97,6 @@
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml

@@ -137,7 +137,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml

@@ -104,7 +104,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml

@@ -104,7 +104,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml

@@ -105,7 +105,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml

@@ -105,7 +105,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml

@@ -72,7 +72,6 @@
   <flag name='virtio-mouse-ccw'/>
   <flag name='virtio-tablet-ccw'/>
   <flag name='qcow2-luks'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml

@@ -136,7 +136,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml

@@ -136,7 +136,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml

@@ -106,7 +106,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml

@@ -104,7 +104,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml

@@ -72,7 +72,6 @@
   <flag name='virtio-mouse-ccw'/>
   <flag name='virtio-tablet-ccw'/>
   <flag name='qcow2-luks'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml

@@ -137,7 +137,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml

@@ -108,7 +108,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml

@@ -106,7 +106,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml

@@ -105,7 +105,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml

@@ -137,7 +137,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml

@@ -40,7 +40,6 @@
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml

@@ -136,7 +136,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml

@@ -107,7 +107,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml

@@ -104,7 +104,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml

@@ -103,7 +103,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml

@@ -70,7 +70,6 @@
   <flag name='virtio-mouse-ccw'/>
   <flag name='virtio-tablet-ccw'/>
   <flag name='qcow2-luks'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml

@@ -136,7 +136,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml

@@ -108,7 +108,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml

@@ -70,7 +70,6 @@
   <flag name='virtio-mouse-ccw'/>
   <flag name='virtio-tablet-ccw'/>
   <flag name='qcow2-luks'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml

@@ -135,7 +135,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml

@@ -134,7 +134,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml

@@ -115,7 +115,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml

@@ -104,7 +104,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml

@@ -134,7 +134,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml

@@ -115,7 +115,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml

@@ -110,7 +110,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='pr-manager-helper'/>

tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml

@@ -134,7 +134,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml

@@ -134,7 +134,6 @@
   <flag name='dump-completed'/>
   <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
-  <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
   <flag name='tpm-crb'/>

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);