On 9/4/19 10:39 AM, Peter Krempa wrote: > Use VIR_AUTOFREE and remove the cleanup label. > > Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx> > --- > src/qemu/qemu_migration.c | 17 ++++++----------- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c > index 1a557851bb..82625b2261 100644 > --- a/src/qemu/qemu_migration.c > +++ b/src/qemu/qemu_migration.c > @@ -868,36 +868,31 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriverPtr driver, > unsigned long long mirror_speed, > bool mirror_shallow) > { > - char *nbd_dest = NULL; > + VIR_AUTOFREE(char *) nbd_dest = NULL; > int mon_ret; > - int ret = -1; > > if (strchr(host, ':')) { > if (virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=%s", > host, port, diskAlias) < 0) Should we prefer "nbd://[%s]:%d/%s" here, now that the NBD URI spec is available (and since qemu supports that for quite some time now)? https://github.com/NetworkBlockDevice/nbd/blob/master/doc/uri.md > - goto cleanup; > + return -1; > } else { > if (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s", and similar here? -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list