openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Martin Kletzander 2020-08-24 15:43:50 +02:00
parent d17ece4dd4
commit e31f24e299
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/virsh-domain.c
View File

@ -10708,7 +10708,6 @@ doMigrate(void *opaque)
virDomainPtr dom = NULL; virDomainPtr dom = NULL;
const char *desturi = NULL; const char *desturi = NULL;
const char *opt = NULL; const char *opt = NULL;
int disksPort = 0;
unsigned int flags = 0; unsigned int flags = 0;
virshCtrlData *data = opaque; virshCtrlData *data = opaque;
vshControl *ctl = data->ctl; vshControl *ctl = data->ctl;
@ -10756,11 +10755,11 @@ doMigrate(void *opaque)
VIR_MIGRATE_PARAM_LISTEN_ADDRESS, opt) < 0) VIR_MIGRATE_PARAM_LISTEN_ADDRESS, opt) < 0)
goto save_error; goto save_error;
if (vshCommandOptInt(ctl, cmd, "disks-port", &disksPort) < 0) if (vshCommandOptInt(ctl, cmd, "disks-port", &intOpt) < 0)
goto out; goto out;
if (disksPort && if (intOpt &&
virTypedParamsAddInt(&params, &nparams, &maxparams, virTypedParamsAddInt(&params, &nparams, &maxparams,
VIR_MIGRATE_PARAM_DISKS_PORT, disksPort) < 0) VIR_MIGRATE_PARAM_DISKS_PORT, intOpt) < 0)
goto save_error; goto save_error;
if (vshCommandOptStringReq(ctl, cmd, "dname", &opt) < 0) if (vshCommandOptStringReq(ctl, cmd, "dname", &opt) < 0)