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

qemu: migration: Refactor cleanup in qemuMigrationSrcNBDStorageCopyDriveMirror 

Use VIR_AUTOFREE and remove the cleanup label.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2019-09-04 12:23:16 +02:00
parent e9f7842736
commit b25956fbfd
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qemu/qemu_migration.c
View File

@ -868,36 +868,31 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriverPtr driver,
unsigned long long mirror_speed, unsigned long long mirror_speed,
bool mirror_shallow) bool mirror_shallow)
{ {
char *nbd_dest = NULL; VIR_AUTOFREE(char *) nbd_dest = NULL;
int mon_ret; int mon_ret;
int ret = -1;
if (strchr(host, ':')) { if (strchr(host, ':')) {
if (virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=%s", if (virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=%s",
host, port, diskAlias) < 0) host, port, diskAlias) < 0)
goto cleanup; return -1;
} else { } else {
if (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s", if (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s",
host, port, diskAlias) < 0) host, port, diskAlias) < 0)
goto cleanup; return -1;
} }
if (qemuDomainObjEnterMonitorAsync(driver, vm, if (qemuDomainObjEnterMonitorAsync(driver, vm,
QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) QEMU_ASYNC_JOB_MIGRATION_OUT) < 0)
goto cleanup; return -1;
mon_ret = qemuMonitorDriveMirror(qemuDomainGetMonitor(vm), mon_ret = qemuMonitorDriveMirror(qemuDomainGetMonitor(vm),
diskAlias, nbd_dest, "raw", diskAlias, nbd_dest, "raw",
mirror_speed, 0, 0, mirror_shallow, true); mirror_speed, 0, 0, mirror_shallow, true);
if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0)
goto cleanup; return -1;
ret = 0; return 0;
cleanup:
VIR_FREE(nbd_dest);
return ret;
} }