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 <jdenemar@redhat.com>

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 9b9c098dc4b6c4105b45c27623276ae7fab859e9..3afd56f3860341a14550a1a29720300940be94c3 100644 (file)
--- 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++;