From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 5 Oct 2020 20:09:49 +0000 (+0200)
Subject: qemu: agent: remove redundant checks
X-Git-Tag: v6.9.0-rc1~261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f08349247c32266afe1af86da2ce4ecddf446668;p=thirdparty%2Flibvirt.git

qemu: agent: remove redundant checks

virJSONValueObjectGetArray returns NULL if the object with
the supplied key is not an array.

Calling virJSONValueIsArray right after is redundant.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
---

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 09116e749c..456f0b69e6 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1444,12 +1444,6 @@ qemuAgentGetVCPUs(qemuAgentPtr agent,
         goto cleanup;
     }
 
-    if (!virJSONValueIsArray(data)) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("Malformed guest-get-vcpus data array"));
-        goto cleanup;
-    }
-
     ndata = virJSONValueArraySize(data);
 
     *info = g_new0(qemuAgentCPUInfo, ndata);
@@ -2314,12 +2308,6 @@ qemuAgentGetUsers(qemuAgentPtr agent,
         return -1;
     }
 
-    if (!virJSONValueIsArray(data)) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("Malformed guest-get-users data array"));
-        return -1;
-    }
-
     ndata = virJSONValueArraySize(data);
 
     if (virTypedParamsAddUInt(params, nparams, maxparams,