From 3734dba02e0fa85a22b1044a4f20258c344d45c8 Mon Sep 17 00:00:00 2001 From: Daniel Henrique Barboza Date: Mon, 13 Jul 2020 06:49:56 -0300 Subject: [PATCH] qemu_migration.c: modernize qemuMigrationSrcConfirmPhase() Use g_autoptr() and remove both 'error' and 'cleanup' labels. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik --- src/qemu/qemu_migration.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 5d64e9df98..78e64344f6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2975,10 +2975,9 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, unsigned int flags, int retcode) { - qemuMigrationCookiePtr mig; + g_autoptr(qemuMigrationCookie) mig = NULL; virObjectEventPtr event; - int rv = -1; - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainJobInfoPtr jobInfo = NULL; @@ -2997,7 +2996,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, if (!(mig = qemuMigrationEatCookie(driver, vm->def, priv->origname, priv, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_STATS))) - goto cleanup; + return -1; if (retcode == 0) jobInfo = priv->job.completed; @@ -3026,7 +3025,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, } if (flags & VIR_MIGRATE_OFFLINE) - goto done; + return 0; /* Did the migration go as planned? If yes, kill off the domain object. * If something failed, resume CPUs, but only if we didn't use post-copy. @@ -3071,13 +3070,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, VIR_WARN("Failed to save status on vm %s", vm->def->name); } - done: - qemuMigrationCookieFree(mig); - rv = 0; - - cleanup: - virObjectUnref(cfg); - return rv; + return 0; } int