提交 a1a67636 编写于 作者: S Seeteena Thoufeek 提交者: Ján Tomko

qemu_checkpoint.c: Use g_autofree in qemuCheckpointPrepare()

This is the only instance of g_autofree change applicable for
qemu_checkpoint.c
Signed-off-by: NSeeteena Thoufeek <s1seetee@linux.vnet.ibm.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
Signed-off-by: NJán Tomko <jtomko@redhat.com>
上级 68d08cf2
......@@ -405,9 +405,8 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
virDomainObjPtr vm,
virDomainCheckpointDefPtr def)
{
int ret = -1;
size_t i;
char *xml = NULL;
g_autofree char *xml = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData;
/* Easiest way to clone inactive portion of vm->def is via
......@@ -419,10 +418,10 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
priv->qemuCaps,
VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
goto cleanup;
return -1;
if (virDomainCheckpointAlignDisks(def) < 0)
goto cleanup;
return -1;
for (i = 0; i < def->ndisks; i++) {
virDomainCheckpointDiskDefPtr disk = &def->disks[i];
......@@ -434,7 +433,7 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("bitmap for disk '%s' must match checkpoint name '%s'"),
disk->name, def->parent.name);
goto cleanup;
return -1;
}
if (vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) {
......@@ -444,15 +443,11 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
disk->name,
virStorageFileFormatTypeToString(
vm->def->disks[i]->src->format));
goto cleanup;
return -1;
}
}
ret = 0;
cleanup:
VIR_FREE(xml);
return ret;
return 0;
}
static int
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册