From: Fabiano Rosas <farosas@suse.de>
Date: Fri, 23 Jan 2026 14:16:35 +0000 (-0300)
Subject: migration: Move postcopy_try_recover into migration_incoming_process
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a57209371b69ff53bdc6e9ebe48f2ed9ce39cd6d;p=thirdparty%2Fqemu.git

migration: Move postcopy_try_recover into migration_incoming_process

The postcopy_try_recover() call doesn't need to be duplicated, move it
into migration_incoming_process().

This removes code from migration_fd_process_incoming() so it can be
removed in the near future.

Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Prasad Pandit <pjp@fedoraproject.org>
Link: https://lore.kernel.org/qemu-devel/20260123141656.6765-6-farosas@suse.de
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---

diff --git a/migration/migration.c b/migration/migration.c
index b46e01b8c0..ec45996654 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -942,12 +942,6 @@ static void migration_incoming_setup(QEMUFile *f)
     qemu_file_set_blocking(f, false, &error_abort);
 }
 
-void migration_incoming_process(void)
-{
-    Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, NULL);
-    qemu_coroutine_enter(co);
-}
-
 /* Returns true if recovered from a paused migration, otherwise false */
 static bool postcopy_try_recover(void)
 {
@@ -981,12 +975,19 @@ static bool postcopy_try_recover(void)
     return false;
 }
 
-void migration_fd_process_incoming(QEMUFile *f)
+void migration_incoming_process(void)
 {
-    migration_incoming_setup(f);
     if (postcopy_try_recover()) {
         return;
     }
+
+    Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, NULL);
+    qemu_coroutine_enter(co);
+}
+
+void migration_fd_process_incoming(QEMUFile *f)
+{
+    migration_incoming_setup(f);
     migration_incoming_process();
 }
 
@@ -1086,10 +1087,6 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)
     }
 
     if (migration_has_main_and_multifd_channels()) {
-        /* If it's a recovery, we're done */
-        if (postcopy_try_recover()) {
-            return;
-        }
         migration_incoming_process();
     }
 }