From: Collin L. Walling Date: Thu, 12 Jan 2017 16:18:11 +0000 (-0500) Subject: qemu-capabilities: Fix query-cpu-model-expansion on s390 with older kernel X-Git-Tag: v3.0.0-rc2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8a43f1995acc805e8710f61fb81337bf79ef686;p=thirdparty%2Flibvirt.git qemu-capabilities: Fix query-cpu-model-expansion on s390 with older kernel When running on s390 with a kernel that does not support cpu model checking and with a Qemu new enough to support query-cpu-model-expansion, the gathering of qemu capabilities will fail. Qemu responds to the query-cpu-model-expansion qmp command with an error because the needed kernel ioct does not exist. When this happens a guest cannot even be defined due to missing qemu capabilities data. This patch fixes the problem by silently ignoring generic errors stemming from calls to query-cpu-model-expansion. Reported-by: Farhan Ali Signed-off-by: Collin L. Walling Signed-off-by: Jason J. Herne --- diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3afd56f386..5e057997c3 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5032,6 +5032,15 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; + /* Even though query-cpu-model-expansion is advertised by query-commands it + * may just return GenericError if it is not implemented for the requested + * guest architecture or it is not supported in the host environment. + */ + if (qemuMonitorJSONHasError(reply, "GenericError")) { + ret = 0; + goto cleanup; + } + if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup;