NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Modernize memory cleaning in qemuDomainBlockCommit

Browse Source 
Use VIR_AUTOFREE and VIR_AUTOUNREF.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-05-15 13:41:09 +02:00
parent 82b3f470c6
commit e05d211f5b
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_driver.c
View File

@ -17961,10 +17961,10 @@ qemuDomainBlockCommit(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
virQEMUDriverConfigPtr cfg = NULL; VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = NULL;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
char *device = NULL; VIR_AUTOFREE(char *) device = NULL;
int ret = -1; int ret = -1;
virDomainDiskDefPtr disk = NULL; virDomainDiskDefPtr disk = NULL;
virStorageSourcePtr topSource; virStorageSourcePtr topSource;
@ -17973,9 +17973,9 @@ qemuDomainBlockCommit(virDomainPtr dom,
unsigned int baseIndex = 0; unsigned int baseIndex = 0;
virStorageSourcePtr top_parent = NULL; virStorageSourcePtr top_parent = NULL;
bool clean_access = false; bool clean_access = false;
char *topPath = NULL; VIR_AUTOFREE(char *) topPath = NULL;
char *basePath = NULL; VIR_AUTOFREE(char *) basePath = NULL;
char *backingPath = NULL; VIR_AUTOFREE(char *) backingPath = NULL;
unsigned long long speed = bandwidth; unsigned long long speed = bandwidth;
qemuBlockJobDataPtr job = NULL; qemuBlockJobDataPtr job = NULL;
qemuBlockJobType jobtype = QEMU_BLOCKJOB_TYPE_COMMIT; qemuBlockJobType jobtype = QEMU_BLOCKJOB_TYPE_COMMIT;
@ -18174,11 +18174,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
qemuDomainObjEndJob(driver, vm); qemuDomainObjEndJob(driver, vm);
cleanup: cleanup:
VIR_FREE(topPath);
VIR_FREE(basePath);
VIR_FREE(backingPath);
VIR_FREE(device);
virObjectUnref(cfg);
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
return ret; return ret;
} }