External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemuSnapshotCreateInactiveExternal: Automatically free temporary variables

Browse Source 
Automatically free 'cmd' and 'created' by moving them to the appropriate
scopes.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-12-07 17:24:48 +01:00
parent e4b4ccb94f
commit 4aa3d8fffa
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_snapshot.c
View File

@ -181,23 +181,21 @@ qemuSnapshotCreateInactiveExternal(virQEMUDriver *driver,
size_t i; size_t i;
virDomainSnapshotDiskDef *snapdisk; virDomainSnapshotDiskDef *snapdisk;
virDomainDiskDef *defdisk; virDomainDiskDef *defdisk;
virCommand *cmd = NULL;
const char *qemuImgPath; const char *qemuImgPath;
virBitmap *created = NULL;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
int ret = -1; int ret = -1;
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virDomainSnapshotDef *snapdef = virDomainSnapshotObjGetDef(snap); virDomainSnapshotDef *snapdef = virDomainSnapshotObjGetDef(snap);
g_autoptr(virBitmap) created = virBitmapNew(snapdef->ndisks);
if (!(qemuImgPath = qemuFindQemuImgBinary(driver))) if (!(qemuImgPath = qemuFindQemuImgBinary(driver)))
goto cleanup; goto cleanup;
created = virBitmapNew(snapdef->ndisks);
/* If reuse is true, then qemuSnapshotPrepare already /* If reuse is true, then qemuSnapshotPrepare already
* ensured that the new files exist, and it was up to the user to * ensured that the new files exist, and it was up to the user to
* create them correctly. */ * create them correctly. */
for (i = 0; i < snapdef->ndisks && !reuse; i++) { for (i = 0; i < snapdef->ndisks && !reuse; i++) {
g_autoptr(virCommand) cmd = NULL;
snapdisk = &(snapdef->disks[i]); snapdisk = &(snapdef->disks[i]);
defdisk = vm->def->disks[i]; defdisk = vm->def->disks[i];
if (snapdisk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) if (snapdisk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL)
@ -234,9 +232,6 @@ qemuSnapshotCreateInactiveExternal(virQEMUDriver *driver,
if (virCommandRun(cmd, NULL) < 0) if (virCommandRun(cmd, NULL) < 0)
goto cleanup; goto cleanup;
virCommandFree(cmd);
cmd = NULL;
} }
/* update disk definitions */ /* update disk definitions */
@ -272,8 +267,6 @@ qemuSnapshotCreateInactiveExternal(virQEMUDriver *driver,
ret = 0; ret = 0;
cleanup: cleanup:
virCommandFree(cmd);
/* unlink images if creation has failed */ /* unlink images if creation has failed */
if (ret < 0 && created) { if (ret < 0 && created) {
ssize_t bit = -1; ssize_t bit = -1;
@ -284,7 +277,6 @@ qemuSnapshotCreateInactiveExternal(virQEMUDriver *driver,
snapdisk->src->path); snapdisk->src->path);
} }
} }
virBitmapFree(created);
return ret; return ret;
} }