From: Martin Kletzander <mkletzan@redhat.com>
Date: Mon, 24 Aug 2020 13:43:50 +0000 (+0200)
Subject: virsh: Reuse existing variable when parsing migrate --disks-port
X-Git-Tag: v6.8.0-rc1~299
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e31f24e299abce3d2868d3d365df9495c16c9069;p=thirdparty%2Flibvirt.git

virsh: Reuse existing variable when parsing migrate --disks-port

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 36581d2c31..8a4a0d172d 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -10708,7 +10708,6 @@ doMigrate(void *opaque)
     virDomainPtr dom = NULL;
     const char *desturi = NULL;
     const char *opt = NULL;
-    int disksPort = 0;
     unsigned int flags = 0;
     virshCtrlData *data = opaque;
     vshControl *ctl = data->ctl;
@@ -10756,11 +10755,11 @@ doMigrate(void *opaque)
                                 VIR_MIGRATE_PARAM_LISTEN_ADDRESS, opt) < 0)
         goto save_error;
 
-    if (vshCommandOptInt(ctl, cmd, "disks-port", &disksPort) < 0)
+    if (vshCommandOptInt(ctl, cmd, "disks-port", &intOpt) < 0)
         goto out;
-    if (disksPort &&
+    if (intOpt &&
         virTypedParamsAddInt(&params, &nparams, &maxparams,
-                             VIR_MIGRATE_PARAM_DISKS_PORT, disksPort) < 0)
+                             VIR_MIGRATE_PARAM_DISKS_PORT, intOpt) < 0)
         goto save_error;
 
     if (vshCommandOptStringReq(ctl, cmd, "dname", &opt) < 0)