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

qemu: agent: remove impossible errors

For both 'ip_addr_arr' and 'ret_array', we:
1) already checked that they are arrays
2) only iterate up to the array size

Remove the duplicate checks.

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 fc7b65de2a..51c597f57e 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -2160,13 +2160,6 @@ qemuAgentGetInterfaces(qemuAgentPtr agent,
         const char *hwaddr, *ifname_s, *name = NULL;
         virDomainInterfacePtr iface = NULL;
 
-        /* Shouldn't happen but doesn't hurt to check neither */
-        if (!tmp_iface) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("qemu agent reply missing interface entry in array"));
-            goto error;
-        }
-
         /* interface name is required to be presented */
         name = virJSONValueObjectGetString(tmp_iface, "name");
         if (!name) {
@@ -2229,13 +2222,6 @@ qemuAgentGetInterfaces(qemuAgentPtr agent,
 
             ip_addr = &iface->addrs[addrs_count - 1];
 
-            /* Shouldn't happen but doesn't hurt to check neither */
-            if (!ip_addr_obj) {
-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                               _("qemu agent reply missing IP addr in array"));
-                goto error;
-            }
-
             if (qemuAgentGetInterfaceOneAddress(ip_addr, ip_addr_obj, name) < 0)
                 goto error;
         }