From 19e06cfa256e357fbc1b711de09784de351338d1 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Wed, 11 Jan 2017 14:35:52 +0100 Subject: [PATCH] qemu: Ignore non-boolean CPU model properties The query-cpu-model-expansion is currently implemented for s390(x) only and all CPU properties it returns are booleans. However, x86 implementation will report more types of properties. Without making the code more tolerant older libvirt would fail to probe newer QEMU versions. Signed-off-by: Jiri Denemark --- src/qemu/qemu_monitor_json.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9b9c098dc4..3afd56f386 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4982,15 +4982,12 @@ qemuMonitorJSONParseCPUModelProperty(const char *key, size_t n = machine_model->nprops; bool supported; + if (virJSONValueGetBoolean(value, &supported) < 0) + return 0; + if (VIR_STRDUP(machine_model->props[n].name, key) < 0) return -1; - if (virJSONValueGetBoolean(value, &supported) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-cpu-model-expansion reply data is missing a" - " feature support value")); - return -1; - } machine_model->props[n].supported = supported; machine_model->nprops++; -- GitLab