From d3dcc9ce2b1a3a4bed1566e1feaa55870015ee04 Mon Sep 17 00:00:00 2001 From: Kristina Hanicova Date: Thu, 24 Mar 2022 15:34:07 +0100 Subject: [PATCH] qemu: remove unnecessary else branches after return / goto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I think the code looks cleaner without else branches. Signed-off-by: Kristina Hanicova Signed-off-by: Ján Tomko Reviewed-by: Ján Tomko --- src/qemu/qemu_domainjob.c | 4 ++-- src/qemu/qemu_migration.c | 14 ++++++++------ src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_snapshot.c | 14 +++++++------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index cf1e093e22..38e4612e75 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -153,8 +153,8 @@ qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob job, if (STREQ(phase, "none")) return 0; - else - return -1; + + return -1; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f109598fb4..4bc4fbb47e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4286,9 +4286,10 @@ qemuMigrationSrcRun(virQEMUDriver *driver, rc = qemuMigrationSrcWaitForCompletion(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, dconn, waitFlags); - if (rc == -2) { + if (rc == -2) goto error; - } else if (rc == -1) { + + if (rc == -1) { /* QEMU reported failed migration, nothing to cancel anymore */ cancel = false; goto error; @@ -4326,9 +4327,10 @@ qemuMigrationSrcRun(virQEMUDriver *driver, rc = qemuMigrationSrcWaitForCompletion(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, dconn, waitFlags); - if (rc == -2) { + if (rc == -2) goto error; - } else if (rc == -1) { + + if (rc == -1) { /* QEMU reported failed migration, nothing to cancel anymore */ cancel = false; goto error; @@ -6189,8 +6191,8 @@ qemuMigrationDstErrorInit(virQEMUDriver *driver) driver->migrationErrors = virHashAtomicNew(qemuMigrationDstErrorFree); if (driver->migrationErrors) return 0; - else - return -1; + + return -1; } /** diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1ed60917ea..7a36f85d7e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8700,8 +8700,8 @@ qemuProcessRefreshBlockjobs(virQEMUDriver *driver, if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) return qemuBlockJobRefreshJobs(driver, vm); - else - return qemuProcessRefreshLegacyBlockjobs(driver, vm); + + return qemuProcessRefreshLegacyBlockjobs(driver, vm); } diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 5333730df1..fd460deb52 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -583,13 +583,13 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm, _("missing existing file for disk %s: %s"), snapdisk->name, snapdisk->src->path); return -1; - } else { - if (snapdisk->src->type == VIR_STORAGE_TYPE_BLOCK) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("block device snapshot target '%s' doesn't exist"), - snapdisk->src->path); - return -1; - } + } + + if (snapdisk->src->type == VIR_STORAGE_TYPE_BLOCK) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("block device snapshot target '%s' doesn't exist"), + snapdisk->src->path); + return -1; } } else { /* at this point VIR_STORAGE_TYPE_DIR was already rejected */