External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-05 01:22:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS

Browse Source 
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>
This commit is contained in:
Peter Krempa 2023-08-28 14:40:54 +02:00
parent 4d82bce836
commit d0601b4267
37 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_capabilities.c
View File

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

2
src/qemu/qemu_capabilities.h
View File

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

1
tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
View File

@ -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'/>