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

qemu_checkpoint.c: Use g_autofree in qemuCheckpointPrepare()

Browse Source 
This is the only instance of g_autofree change applicable for
qemu_checkpoint.c

Signed-off-by: Seeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Seeteena Thoufeek 2020-04-03 17:22:58 +05:30 committed by Ján Tomko
parent 68d08cf2f2
commit a1a6763663
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qemu/qemu_checkpoint.c
View File

@ -405,9 +405,8 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainCheckpointDefPtr def) virDomainCheckpointDefPtr def)
{ {
int ret = -1;
size_t i; size_t i;
char *xml = NULL; g_autofree char *xml = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
/* Easiest way to clone inactive portion of vm->def is via /* Easiest way to clone inactive portion of vm->def is via
@ -419,10 +418,10 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
priv->qemuCaps, priv->qemuCaps,
VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
goto cleanup; return -1;
if (virDomainCheckpointAlignDisks(def) < 0) if (virDomainCheckpointAlignDisks(def) < 0)
goto cleanup; return -1;
for (i = 0; i < def->ndisks; i++) { for (i = 0; i < def->ndisks; i++) {
virDomainCheckpointDiskDefPtr disk = &def->disks[i]; virDomainCheckpointDiskDefPtr disk = &def->disks[i];
@ -434,7 +433,7 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("bitmap for disk '%s' must match checkpoint name '%s'"), _("bitmap for disk '%s' must match checkpoint name '%s'"),
disk->name, def->parent.name); disk->name, def->parent.name);
goto cleanup; return -1;
} }
if (vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) { if (vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) {
@ -444,15 +443,11 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
disk->name, disk->name,
virStorageFileFormatTypeToString( virStorageFileFormatTypeToString(
vm->def->disks[i]->src->format)); vm->def->disks[i]->src->format));
goto cleanup; return -1;
} }
} }
ret = 0; return 0;
cleanup:
VIR_FREE(xml);
return ret;
} }
static int static int