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

qemuMigrationCookieNew: Refactor allocation and cleanup

Browse Source 
Move around some code so that we can get rid of the 'cleanup:' label.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-09-28 17:03:33 +02:00
parent 6c8b68b312
commit 4aef0fe324
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/qemu/qemu_migration_cookie.c
View File

@ -280,31 +280,30 @@ qemuMigrationCookieNew(const virDomainDef *def,
const char *origname)
{
qemuMigrationCookiePtr mig = NULL;
const char *name;
unsigned char localHostUUID[VIR_UUID_BUFLEN];
g_autofree char *localHostname = NULL;
if (VIR_ALLOC(mig) < 0)
goto error;
if (!(localHostname = virGetHostname()))
return NULL;
if (origname)
name = origname;
else
name = def->name;
mig->name = g_strdup(name);
memcpy(mig->uuid, def->uuid, VIR_UUID_BUFLEN);
if (!(mig->localHostname = virGetHostname()))
goto error;
if (virGetHostUUID(mig->localHostuuid) < 0) {
if (virGetHostUUID(localHostUUID) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to obtain host UUID"));
goto error;
return NULL;
}
return mig;
mig = g_new0(qemuMigrationCookie, 1);
error:
qemuMigrationCookieFree(mig);
return NULL;
if (origname)
mig->name = g_strdup(origname);
else
mig->name = g_strdup(def->name);
memcpy(mig->uuid, def->uuid, VIR_UUID_BUFLEN);
memcpy(mig->localHostuuid, localHostUUID, VIR_UUID_BUFLEN);
mig->localHostname = g_steal_pointer(&localHostname);
return mig;
}