qemu: remove unnecessary else branches after return / goto

I think the code looks cleaner without else branches.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index cf1e093e22a54bee5ef0c3c33073794e121d9aa9..38e4612e757b9ad974d1fae61414a5c3f611e3ee 100644 (file)
--- 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 f109598fb44e246cf30ee8535aa18c252ca48a93..4bc4fbb47ed23fd45ebe8c06196cbdd8593b5026 100644 (file)
--- 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 1ed60917ead8b3d8bc63384d5d208a8355634681..7a36f85d7e3325579d69fd3b299432a99f397f12 100644 (file)
--- 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 5333730df128822570c6ff84eb2ffec47659ca95..fd460deb527c3c3c6a5d97ad409c2f40783d23fb 100644 (file)
--- 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 */