shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 13:17:58 +03:00
Code Releases Activity

qemu_migration_cookie.c: modernize qemuMigrationEatCookie()

Browse Source 
Use g_autoptr() and remove the obsolete 'error' label.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-07-13 06:49:48 -03:00 committed by Michal Privoznik
parent ce15bd09d1
commit c54dba525d
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_migration_cookie.c
View File

@ -1464,14 +1464,14 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver,
int cookieinlen,
unsigned int flags)
{
qemuMigrationCookiePtr mig = NULL;
g_autoptr(qemuMigrationCookie) mig = NULL;
/* Parse & validate incoming cookie (if any) */
if (cookiein && cookieinlen &&
cookiein[cookieinlen-1] != '\0') {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Migration cookie was not NULL terminated"));
goto error;
return NULL;
}
VIR_DEBUG("cookielen=%d cookie='%s'", cookieinlen, NULLSTR(cookiein));
@ -1485,7 +1485,7 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver,
priv ? priv->qemuCaps : NULL,
cookiein,
flags) < 0)
goto error;
return NULL;
if (flags & QEMU_MIGRATION_COOKIE_PERSISTENT &&
mig->persistent &&
@ -1500,7 +1500,7 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Missing %s lock state for migration cookie"),
virLockManagerPluginGetName(driver->lockManager));
goto error;
return NULL;
}
} else if (STRNEQ(mig->lockDriver,
virLockManagerPluginGetName(driver->lockManager))) {
@ -1508,16 +1508,12 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver,
_("Source host lock driver %s different from target %s"),
mig->lockDriver,
virLockManagerPluginGetName(driver->lockManager));
goto error;
return NULL;
}
}
if (flags & QEMU_MIGRATION_COOKIE_STATS && mig->jobInfo)
mig->jobInfo->operation = priv->job.current->operation;
return mig;
error:
qemuMigrationCookieFree(mig);
return NULL;
return g_steal_pointer(&mig);
}