External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 05:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Retire QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE

Browse Source 
The flag was based on a version check which no longer made sense. Remove
the flag by replacing it's only use by an arch-check which is equivalent
at this point.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-02-09 17:21:33 +01:00
parent b72318f36d
commit 22acc863c7
13 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_capabilities.c
View File

@ -591,7 +591,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 370 */
"cpu.migratable", /* QEMU_CAPS_CPU_MIGRATABLE */
"query-cpu-model-expansion.migratable", /* QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE */
"query-cpu-model-expansion.migratable", /* X_QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE */
"fw_cfg", /* X_QEMU_CAPS_FW_CFG */
"migration-param.bandwidth", /* QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH */
"migration-param.downtime", /* QEMU_CAPS_MIGRATION_PARAM_DOWNTIME */
@ -3088,7 +3088,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps,
/* Try to check migratability of each feature. */
if (modelInfo &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE) &&
ARCH_IS_X86(qemuCaps->arch) &&
qemuMonitorGetCPUModelExpansion(mon, type, cpu, false, fail_no_props,
&nonMigratable) < 0)
return -1;
@ -5298,12 +5298,6 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps)
if (ARCH_IS_X86(qemuCaps->arch) &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) {
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE);
/* Old x86 QEMU supported migratable:false property in
* query-cpu-model-expansion arguments even though it was not properly
* advertised as a CPU property.
*/
virQEMUCapsSet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE);
}
if (ARCH_IS_S390(qemuCaps->arch)) {

2
src/qemu/qemu_capabilities.h
View File

@ -566,7 +566,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 370 */
QEMU_CAPS_CPU_MIGRATABLE, /* -cpu ...,migratable=on|off */
QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE, /* query-cpu-model-expansion supports migratable:false */
X_QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE, /* query-cpu-model-expansion supports migratable:false */
X_QEMU_CAPS_FW_CFG, /* -fw_cfg command line option */
QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate-set-parameters */
QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */

1
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
View File

@ -174,7 +174,6 @@
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>

1
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
View File

@ -179,7 +179,6 @@
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>

1
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
View File

@ -185,7 +185,6 @@
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>

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

@ -193,7 +193,6 @@
<flag name='tcg'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>

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

@ -199,7 +199,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>

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

@ -198,7 +198,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>

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

@ -198,7 +198,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>

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

@ -198,7 +198,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>

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

@ -198,7 +198,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>

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

@ -198,7 +198,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>

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

@ -198,7 +198,6 @@
<flag name='virtio-blk-pci.scsi.default.disabled'/>
<flag name='pvscsi'/>
<flag name='cpu.migratable'/>
<flag name='query-cpu-model-expansion.migratable'/>
<flag name='migration-param.bandwidth'/>
<flag name='migration-param.downtime'/>
<flag name='migration-param.xbzrle-cache-size'/>