External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Avoid probing unsupported migratable CPU expansion

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Jiri Denemark 2020-06-03 01:07:06 +02:00
parent 8662b34f18
commit f48bdbdfe4
11 changed files with 9 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View File

@ -3061,6 +3061,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
/* Try to check migratability of each feature. */
if (modelInfo &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE) &&
qemuMonitorGetCPUModelExpansion(mon, type, cpu, false, fail_no_props,
&nonMigratable) < 0)
goto cleanup;

22
tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
View File

@ -14969,28 +14969,6 @@
"id": "libvirt-35"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "static",
"model": {
"name": "host",
"props": {
"migratable": false
}
}
},
"id": "libvirt-36"
}
{
"id": "libvirt-36",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
}
}
{
"execute": "qmp_capabilities",
"id": "libvirt-1"

22
tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
View File

@ -15270,28 +15270,6 @@
"id": "libvirt-36"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "static",
"model": {
"name": "host",
"props": {
"migratable": false
}
}
},
"id": "libvirt-37"
}
{
"id": "libvirt-37",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
}
}
{
"execute": "qmp_capabilities",
"id": "libvirt-1"

22
tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
View File

@ -16990,28 +16990,6 @@
"id": "libvirt-38"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "static",
"model": {
"name": "host",
"props": {
"migratable": false
}
}
},
"id": "libvirt-39"
}
{
"id": "libvirt-39",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
}
}
{
"execute": "qmp_capabilities",
"id": "libvirt-1"

22
tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
View File

@ -13046,28 +13046,6 @@
"id": "libvirt-35"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "static",
"model": {
"name": "host",
"props": {
"migratable": false
}
}
},
"id": "libvirt-36"
}
{
"id": "libvirt-36",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
}
}
{
"execute": "qmp_capabilities",
"id": "libvirt-1"

22
tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
View File

@ -14031,28 +14031,6 @@
"id": "libvirt-35"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "static",
"model": {
"name": "host",
"props": {
"migratable": false
}
}
},
"id": "libvirt-36"
}
{
"id": "libvirt-36",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
}
}
{
"execute": "qmp_capabilities",
"id": "libvirt-1"

22
tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
View File

@ -17519,28 +17519,6 @@
"id": "libvirt-39"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "static",
"model": {
"name": "host",
"props": {
"migratable": false
}
}
},
"id": "libvirt-40"
}
{
"id": "libvirt-40",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
}
}
{
"execute": "qmp_capabilities",
"id": "libvirt-1"

48
tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
View File

@ -18338,28 +18338,6 @@
"id": "libvirt-39"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "static",
"model": {
"name": "host",
"props": {
"migratable": false
}
}
},
"id": "libvirt-40"
}
{
"id": "libvirt-40",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
}
}
{
"execute": "qmp_capabilities",
"id": "libvirt-1"
@ -21475,31 +21453,9 @@
"id": "libvirt-3"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "static",
"model": {
"name": "max",
"props": {
"migratable": false
}
}
},
"id": "libvirt-4"
}
{
"id": "libvirt-4",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
}
}
{
"execute": "query-machines",
"id": "libvirt-5"
"id": "libvirt-4"
}
{
@ -21572,5 +21528,5 @@
"cpu-max": 248
}
],
"id": "libvirt-5"
"id": "libvirt-4"
}

48
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
View File

@ -21376,28 +21376,6 @@
"id": "libvirt-43"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "full",
"model": {
"name": "host",
"props": {
"migratable": false
}
}
},
"id": "libvirt-44"
}
{
"id": "libvirt-44",
"error": {
"class": "GenericError",
"desc": "Parameter 'migratable' is unexpected"
}
}
{
"execute": "qmp_capabilities",
"id": "libvirt-1"
@ -21646,31 +21624,9 @@
"id": "libvirt-3"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "full",
"model": {
"name": "max",
"props": {
"migratable": false
}
}
},
"id": "libvirt-4"
}
{
"id": "libvirt-4",
"error": {
"class": "GenericError",
"desc": "Parameter 'migratable' is unexpected"
}
}
{
"execute": "query-machines",
"id": "libvirt-5"
"id": "libvirt-4"
}
{
@ -22221,5 +22177,5 @@
"deprecated": false
}
],
"id": "libvirt-5"
"id": "libvirt-4"
}

48
tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
View File

@ -19157,28 +19157,6 @@
"id": "libvirt-39"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "static",
"model": {
"name": "host",
"props": {
"migratable": false
}
}
},
"id": "libvirt-40"
}
{
"id": "libvirt-40",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
}
}
{
"execute": "qmp_capabilities",
"id": "libvirt-1"
@ -22639,31 +22617,9 @@
"id": "libvirt-3"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "static",
"model": {
"name": "max",
"props": {
"migratable": false
}
}
},
"id": "libvirt-4"
}
{
"id": "libvirt-4",
"error": {
"class": "GenericError",
"desc": "Property '.migratable' not found"
}
}
{
"execute": "query-machines",
"id": "libvirt-5"
"id": "libvirt-4"
}
{
@ -22790,5 +22746,5 @@
"deprecated": false
}
],
"id": "libvirt-5"
"id": "libvirt-4"
}

48
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
View File

@ -22725,28 +22725,6 @@
"id": "libvirt-43"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "full",
"model": {
"name": "host",
"props": {
"migratable": false
}
}
},
"id": "libvirt-44"
}
{
"id": "libvirt-44",
"error": {
"class": "GenericError",
"desc": "Parameter 'migratable' is unexpected"
}
}
{
"execute": "qmp_capabilities",
"id": "libvirt-1"
@ -23000,31 +22978,9 @@
"id": "libvirt-3"
}
{
"execute": "query-cpu-model-expansion",
"arguments": {
"type": "full",
"model": {
"name": "max",
"props": {
"migratable": false
}
}
},
"id": "libvirt-4"
}
{
"id": "libvirt-4",
"error": {
"class": "GenericError",
"desc": "Parameter 'migratable' is unexpected"
}
}
{
"execute": "query-machines",
"id": "libvirt-5"
"id": "libvirt-4"
}
{
@ -23612,5 +23568,5 @@
"deprecated": false
}
],
"id": "libvirt-5"
"id": "libvirt-4"
}