[PATCH 2/2] qemu: remove else branches after return in qemuMigrationSrcPerform()

[Ján Tomko]

On a Thursday in 2022, Kristina Hanicova wrote:
>Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
>---
> src/qemu/qemu_migration.c | 46 +++++++++++++++++++--------------------
> 1 file changed, 22 insertions(+), 24 deletions(-)
>
>diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
>index e16d579928..d8b00aca87 100644
>--- a/src/qemu/qemu_migration.c
>+++ b/src/qemu/qemu_migration.c
>@@ -5482,31 +5482,29 @@ qemuMigrationSrcPerform(virQEMUDriver *driver,
>                                           cookiein, cookieinlen,
>                                           cookieout, cookieoutlen,
>                                           flags, dname, resource, v3proto);
>-    } else {
>-        if (dconnuri) {
>-            virReportError(VIR_ERR_INTERNAL_ERROR,
>-                           "%s", _("Unexpected dconnuri parameter with non-peer2peer migration"));
>-            return -1;
>-        }
>-
>-        if (v3proto) {
>-            return qemuMigrationSrcPerformPhase(driver, conn, vm, persist_xml, uri,
>-                                                graphicsuri,
>-                                                nmigrate_disks, migrate_disks,
>-                                                migParams,
>-                                                cookiein, cookieinlen,
>-                                                cookieout, cookieoutlen,
>-                                                flags, resource, nbdURI);
>-        } else {
>-            return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml, NULL,
>-                                              uri, graphicsuri, listenAddress,
>-                                              nmigrate_disks, migrate_disks, nbdPort,
>-                                              nbdURI, migParams,
>-                                              cookiein, cookieinlen,
>-                                              cookieout, cookieoutlen, flags,
>-                                              dname, resource, v3proto);
>-        }
>     }

I'm missing a blank line here.

>+    if (dconnuri) {
>+        virReportError(VIR_ERR_INTERNAL_ERROR,
>+                       "%s", _("Unexpected dconnuri parameter with non-peer2peer migration"));
>+        return -1;
>+    }
>+
>+    if (v3proto) {
>+        return qemuMigrationSrcPerformPhase(driver, conn, vm, persist_xml, uri,
>+                                            graphicsuri,
>+                                            nmigrate_disks, migrate_disks,
>+                                            migParams,
>+                                            cookiein, cookieinlen,
>+                                            cookieout, cookieoutlen,
>+                                            flags, resource, nbdURI);
>+    }

And here.

>+    return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml, NULL,
>+                                      uri, graphicsuri, listenAddress,
>+                                      nmigrate_disks, migrate_disks, nbdPort,
>+                                      nbdURI, migParams,
>+                                      cookiein, cookieinlen,
>+                                      cookieout, cookieoutlen, flags,
>+                                      dname, resource, v3proto);
> }

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220325/ba3490f8/attachment.sig>