From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 11 Jan 2017 13:29:58 +0000 (+0100)
Subject: qemu: Don't check CPU model property key
X-Git-Tag: v3.0.0-rc2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec23791517861e3260ce5992c8fa7dcb0bedf06b;p=thirdparty%2Flibvirt.git

qemu: Don't check CPU model property key

The qemuMonitorJSONParseCPUModelProperty function is a callback for
virJSONValueObjectForeachKeyValue and is called for each key/value pair,
thus it doesn't really make sense to check whether key is NULL.

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 e767437c0f..9b9c098dc4 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4982,12 +4982,6 @@ qemuMonitorJSONParseCPUModelProperty(const char *key,
     size_t n = machine_model->nprops;
     bool supported;
 
-    if (!key) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("query-cpu-model-expansion reply data is missing a"
-                         " property name"));
-        return -1;
-    }
     if (VIR_STRDUP(machine_model->props[n].name, key) < 0)
         return -1;