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

qemu: Make qemuMigrationParamsFree follow common pattern 

Our *Free functions usually do not take a double pointer and the caller
has to make sure it doesn't use the stale pointer after the *Free
function returns.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2018-02-21 15:56:18 +01:00
parent 1b100b74a9
commit 3bc416018b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_driver.c
View File

@ -12759,7 +12759,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom,
flags, dname, bandwidth, true); flags, dname, bandwidth, true);
cleanup: cleanup:
VIR_FREE(compression); VIR_FREE(compression);
qemuMigrationParamsFree(&migParams); qemuMigrationParamsFree(migParams);
VIR_FREE(migrate_disks); VIR_FREE(migrate_disks);
return ret; return ret;
} }

10
src/qemu/qemu_migration_params.c
View File

@ -50,13 +50,13 @@ qemuMigrationParamsClear(qemuMonitorMigrationParamsPtr migParams)
void void
qemuMigrationParamsFree(qemuMonitorMigrationParamsPtr *migParams) qemuMigrationParamsFree(qemuMonitorMigrationParamsPtr migParams)
{ {
if (!*migParams) if (!migParams)
return; return;
qemuMigrationParamsClear(*migParams); qemuMigrationParamsClear(migParams);
VIR_FREE(*migParams); VIR_FREE(migParams);
} }
@ -101,7 +101,7 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr params,
return migParams; return migParams;
error: error:
qemuMigrationParamsFree(&migParams); qemuMigrationParamsFree(migParams);
return NULL; return NULL;
} }

2
src/qemu/qemu_migration_params.h
View File

@ -37,7 +37,7 @@ void
qemuMigrationParamsClear(qemuMonitorMigrationParamsPtr migParams); qemuMigrationParamsClear(qemuMonitorMigrationParamsPtr migParams);
void void
qemuMigrationParamsFree(qemuMonitorMigrationParamsPtr *migParams); qemuMigrationParamsFree(qemuMonitorMigrationParamsPtr migParams);
int int
qemuMigrationParamsSet(virQEMUDriverPtr driver, qemuMigrationParamsSet(virQEMUDriverPtr driver,