External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-20 13:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_driver.c: modernize qemuDomainMigrateBegin3Params()

Browse Source 
Use g_autofree and remove the unneeded 'cleanup' label.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-07-13 06:49:36 -03:00 committed by Michal Privoznik
parent 7916104971
commit 6c4a3e43e7
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_driver.c
View File

@ -12346,14 +12346,13 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain,
{ {
const char *xmlin = NULL; const char *xmlin = NULL;
const char *dname = NULL; const char *dname = NULL;
const char **migrate_disks = NULL; g_autofree const char **migrate_disks = NULL;
int nmigrate_disks; int nmigrate_disks;
char *ret = NULL;
virDomainObjPtr vm; virDomainObjPtr vm;
virCheckFlags(QEMU_MIGRATION_FLAGS, NULL); virCheckFlags(QEMU_MIGRATION_FLAGS, NULL);
if (virTypedParamsValidate(params, nparams, QEMU_MIGRATION_PARAMETERS) < 0) if (virTypedParamsValidate(params, nparams, QEMU_MIGRATION_PARAMETERS) < 0)
goto cleanup; return NULL;
if (virTypedParamsGetString(params, nparams, if (virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_DEST_XML, VIR_MIGRATE_PARAM_DEST_XML,
@ -12361,30 +12360,26 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain,
virTypedParamsGetString(params, nparams, virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_DEST_NAME, VIR_MIGRATE_PARAM_DEST_NAME,
&dname) < 0) &dname) < 0)
goto cleanup; return NULL;
nmigrate_disks = virTypedParamsGetStringList(params, nparams, nmigrate_disks = virTypedParamsGetStringList(params, nparams,
VIR_MIGRATE_PARAM_MIGRATE_DISKS, VIR_MIGRATE_PARAM_MIGRATE_DISKS,
&migrate_disks); &migrate_disks);
if (nmigrate_disks < 0) if (nmigrate_disks < 0)
goto cleanup; return NULL;
if (!(vm = qemuDomainObjFromDomain(domain))) if (!(vm = qemuDomainObjFromDomain(domain)))
goto cleanup; return NULL;
if (virDomainMigrateBegin3ParamsEnsureACL(domain->conn, vm->def) < 0) { if (virDomainMigrateBegin3ParamsEnsureACL(domain->conn, vm->def) < 0) {
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
goto cleanup; return NULL;
} }
ret = qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname, return qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname,
cookieout, cookieoutlen, cookieout, cookieoutlen,
nmigrate_disks, migrate_disks, flags); nmigrate_disks, migrate_disks, flags);
cleanup:
VIR_FREE(migrate_disks);
return ret;
} }