qemu: capabilities: Retire QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS

All qemu versions have that command and cpu hotplug code now directly
probes the machine type.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6581a09a6c29a5f8b15614b0217142918a0d9e29..fd921304663a76b8ada9a0786c76759d42b70d75 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -390,7 +390,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               /* 230 */
               "smm", /* X_QEMU_CAPS_MACHINE_SMM_OPT */
               "virtio-pci-disable-legacy", /* X_QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY */
-              "query-hotpluggable-cpus", /* QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS */
+              "query-hotpluggable-cpus", /* X_QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS */
               "virtio-net.rx_queue_size", /* X_QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE */
               "machine-iommu", /* X_QEMU_CAPS_MACHINE_IOMMU */
 
@@ -1208,7 +1208,6 @@ struct virQEMUCapsStringFlags {
 struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-vnc", QEMU_CAPS_VNC },
     { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION },
-    { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS },
     { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION },
     { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS },
     { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE },
@@ -5836,7 +5835,7 @@ static const struct virQEMUCapsMachineTypeFilter virQEMUCapsMachineFilter[] = {
 
 void
 virQEMUCapsFilterByMachineType(virQEMUCaps *qemuCaps,
-                               virDomainVirtType virtType,
+                               virDomainVirtType virtType G_GNUC_UNUSED,
                                const char *machineType)
 {
     size_t i;
@@ -5854,9 +5853,6 @@ virQEMUCapsFilterByMachineType(virQEMUCaps *qemuCaps,
         for (j = 0; j < filter->nflags; j++)
             virQEMUCapsClear(qemuCaps, filter->flags[j]);
     }
-
-    if (!virQEMUCapsGetMachineHotplugCpus(qemuCaps, virtType, machineType))
-        virQEMUCapsClear(qemuCaps, QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);
 }
 
 

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 620ebf779f1d90e55fb55d6d66b26e53929d4456..d68a819442c1206acf7712b50315f49b88cc683c 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -369,7 +369,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     /* 230 */
     X_QEMU_CAPS_MACHINE_SMM_OPT, /* -machine xxx,smm=on/off/auto */
     X_QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, /* virtio-*pci.disable-legacy */
-    QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS, /* qmp command query-hotpluggable-cpus */
+    X_QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS, /* qmp command query-hotpluggable-cpus */
     X_QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, /* virtio-net-*.rx_queue_size */
     X_QEMU_CAPS_MACHINE_IOMMU, /* -machine iommu=on */
 

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
index 0763809bd16729cd8ca00035628bdfbcb52f51ee..f4f52fc1af5f780faeafd63ff7d39f22fab0fc28 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
@@ -59,7 +59,6 @@
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
   <flag name='vhost-scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
index d596bae8d11a211a0dea157194341b3171bc439c..baa05be2fb26fc88d70c80e7c45314fc981778e0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
@@ -58,7 +58,6 @@
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
index 8ee177f860d285bd29c766019156fed12bb92e57..4f7c98377d8a14559de36e20ed9aa67f18385dcd 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
@@ -30,7 +30,6 @@
   <flag name='virtio-tablet'/>
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='query-cpu-definitions'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
index 6a78466b0f0f79790f46ef14f5211b820d49bc2d..bf920a74c44ad9af46680b6cecf94195e367598c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
@@ -81,7 +81,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
index a981036763fa80c666fa8712a3bc0b550b903340..0b9eabd3da9a3be143b90b6d34cafc9aae665c54 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
@@ -61,7 +61,6 @@
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
   <flag name='vhost-scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
index c61ab63bdc2737769fb2010721c8154096553ec9..481519c7629b2c3edb57214c3c096e18c4394fab 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
@@ -59,7 +59,6 @@
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
index 4a30e8e815796d7b9db73c9a3a02ea399499f3cc..60384517a1f6e7389bd6d7004093f09ab9937aed 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
@@ -64,7 +64,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
   <flag name='vhost-scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
index 44e40d5431ff5fcff4c13011aa61d2aa26d2eb01..8fa4148232062f9601c730452106c192647009a2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
@@ -81,7 +81,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
index 1d51c2856a0c5bbc02c36855806f1e51c8965df5..dce3a97aa556e55a6ad4929245a4983af3210756 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
@@ -16,7 +16,6 @@
   <flag name='enable-fips'/>
   <flag name='migrate-rdma'/>
   <flag name='spice-gl'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='spice-rendernode'/>
   <flag name='chardev-reconnect'/>
   <flag name='isa-serial'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
index a96df3c7580cfa09a289f863598ca55c202210ad..c0f3444d8529e16c67d593bbaaca7c877fe4ed7f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
@@ -81,7 +81,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
index dd1b20a15416169038ca02ba370d028d297bda1f..d0c75c2bb9addac0bb7fea772a2c6a023e7eee08 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@@ -60,7 +60,6 @@
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
   <flag name='vhost-scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
index d8e2243069dabd4c6233af612476878f93b6f3d2..d86dab448284c39353873f26b651d4377bb3e42b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
@@ -58,7 +58,6 @@
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
index 864307485e5501895193f2e54ec8f2f37badb634..f57dc02b1367ce68ae5149bbc9f308a5eba2738a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
@@ -63,7 +63,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
   <flag name='vhost-scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
index 1ae0e4cefeddd196fd8bdf52202f176908be429b..d44ca2a121b79ecaf86b93c2afa1ebef39e67aef 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
@@ -29,7 +29,6 @@
   <flag name='virtio-tablet'/>
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='query-cpu-definitions'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index eb825fbd401ec1af26a73dd882019fcc75d474f8..6bd531a82528ea5544fd3fd4c61fb7a2f59d1ccc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -81,7 +81,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
index 9928d6a07b1e18330c01bbf057126e7808cd2c39..5f2e6c2e5ba6c017955e590d237d80bc2bd9d70c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@@ -61,7 +61,6 @@
   <flag name='mptsas1068'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
   <flag name='vhost-scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
index a97519f2ffbd5f2c2205a9db4c92c4c2a9a8ba02..19f23f22f15d0496d3513ca2c0f5b018bbbd13c2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
@@ -29,7 +29,6 @@
   <flag name='virtio-tablet'/>
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='query-cpu-definitions'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index f72665067480b80a0790c6670fc2cb2bacb9fb52..4223eb1a2ecb43d9a509bb67c5e27a52c461b822 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -80,7 +80,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index f65034ae9c1e4a1372d3ad6ce07c765a86e1beff..cacfd6969f094165a3dcaf1f845aab09e40db9a0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -79,7 +79,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
index 182d2b9f4e7a6f280bfce803b608f84ddb32a50e..5cfce5eaa9d3ad08797e3e21d6099bb1aaf0da14 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@@ -67,7 +67,6 @@
   <flag name='spice-gl'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
   <flag name='vhost-scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
index 0c2ee9e513d2061318da835984326c43223fa39e..914cda204803c048d29b16e1b19f09059e623051 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -58,7 +58,6 @@
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index c25bb0e469b4cbf063ee291165bbea84bc50aeef..47926912850bd6e342dad9a7d8a62a97f8e23fdd 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -79,7 +79,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
index fbd08eac810073d091934c47ff4524e7122b3243..9a340e2566ab50da5499a7ba9157b01361e4c40f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@@ -66,7 +66,6 @@
   <flag name='spice-gl'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
   <flag name='vhost-scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
index 6d487247cc57ce8425b03dc5b9db44041b5bb705..f662cefb424e29da5b04c20acaac17dcbef61e6e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@@ -67,7 +67,6 @@
   <flag name='spice-gl'/>
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
   <flag name='vhost-scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
index 7d7df4ed134b74887dca970a500b44801595813f..748b897f70f04a00b1b31fe5c27223f0ccd42ab7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -64,7 +64,6 @@
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index 6616e43b003a48e1d67eda57162f329794eba120..8d026d540d9e46ab2656fffb955ceb0a660b2aa8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -79,7 +79,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
index 3ff7a88cd2de2d24d1e9d8ac4f11f14289fb0226..310b8f9d754660866657a2b59f93f91e78b3f93e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -63,7 +63,6 @@
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 4e2addd76beb239bceed8dca7ad25bbfce9d97d6..07e8c57f27c7171dd6a3cdae717a5fb4f83e8d26 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -79,7 +79,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index 06f8c5801f0714675045b7a46a62b33892eab861..b8d4d4888ce909a54501ce69e13b3c05044b3b9d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -62,7 +62,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
   <flag name='vhost-scsi'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index 0007a33dca6a6f902eba80a0fd4a7f4687c66f5e..928270d287309cfc47b92e317a62e10d2f6a3dc8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -78,7 +78,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index e298cbd9b18ae9f13fe812fb5699e3be29ae04c0..a889c1b034d3f52291129d3498aed19c3b176029 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -79,7 +79,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
index 987962ca41ce591d40f554b6016fef47cb45e84d..4aeb210ca758c44756c8104b6294bb1bc267e6b4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
@@ -55,7 +55,6 @@
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='mptsas1068'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index c43c2093281426a78833ea88b7c8ef01bbe54008..6d105e78a97d546d183105adf7f616942231c955 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -79,7 +79,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>

diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
index 35751ed44197c0539911bae5775d76052a55f1c1..a7519021e2e17a7948a122bdaa7a75164243d544 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@@ -26,7 +26,6 @@
   <flag name='virtio-tablet'/>
   <flag name='virtio-input-host'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='query-cpu-definitions'/>

diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index 0a9b5d3b469c60e9869767a2710062d9d98e0436..adcf5941385e863f31d60eaedd32660c2741584c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -79,7 +79,6 @@
   <flag name='pxb'/>
   <flag name='pxb-pcie'/>
   <flag name='intel-iommu'/>
-  <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>