From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 3 Jan 2020 15:50:02 +0000 (+0100)
Subject: cmdDomIfAddr: Move domain lookup down a few lines
X-Git-Tag: v6.0.0-rc1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44791eaf8b4859b35d62eaa54fe6480f0c4e8513;p=thirdparty%2Flibvirt.git

cmdDomIfAddr: Move domain lookup down a few lines

The 'domifaddr' command accepts several arguments. Let's validate
them first and look up domain to work with only after to save
some RPC cycles should validation fail.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 97301f71f9..e357635757 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -2377,20 +2377,20 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd)
     const char *sourcestr = NULL;
     int source = VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE;
 
-    if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
-        return false;
-
     if (vshCommandOptStringReq(ctl, cmd, "interface", &ifacestr) < 0)
-        goto cleanup;
+        return false;
     if (vshCommandOptStringReq(ctl, cmd, "source", &sourcestr) < 0)
-        goto cleanup;
+        return false;
 
     if (sourcestr &&
         (source = virshDomainInterfaceAddressesSourceTypeFromString(sourcestr)) < 0) {
         vshError(ctl, _("Unknown data source '%s'"), sourcestr);
-        goto cleanup;
+        return false;
     }
 
+    if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
+        return false;
+
     if ((ifaces_count = virDomainInterfaceAddresses(dom, &ifaces, source, 0)) < 0) {
         vshError(ctl, _("Failed to query for interfaces addresses"));
         goto cleanup;