summary refs log tree commit diff stats
path: root/migration/colo.c
diff options
context:
space:
mode:
authorLi Zhijian <lizhijian@fujitsu.com>2024-05-16 11:45:16 +0800
committerFabiano Rosas <farosas@suse.de>2024-05-22 17:34:31 -0300
commit787ea49e80df0e7af922586f6076da94410cdd08 (patch)
tree3d9562175d3a2b4f1964a1d74425bfb1ce43080f /migration/colo.c
parent55a331655dbc8feee198f379eaafa3e75e744b7b (diff)
downloadfocaccia-qemu-787ea49e80df0e7af922586f6076da94410cdd08.tar.gz
focaccia-qemu-787ea49e80df0e7af922586f6076da94410cdd08.zip
migration/colo: make colo_incoming_co() return void
Currently, it always returns 0, no need to check the return value at all.
In addition, enter colo coroutine only if migration_incoming_colo_enabled()
is true.
Once the destination side enters the COLO* state, the COLO process will
take over the remaining processes until COLO exits.

Cc: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
[fixed mangled author email address]
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Diffstat (limited to 'migration/colo.c')
-rw-r--r--migration/colo.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/migration/colo.c b/migration/colo.c
index e2b450c132..ca37b932ac 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -928,16 +928,13 @@ out:
     return NULL;
 }
 
-int coroutine_fn colo_incoming_co(void)
+void coroutine_fn colo_incoming_co(void)
 {
     MigrationIncomingState *mis = migration_incoming_get_current();
     QemuThread th;
 
     assert(bql_locked());
-
-    if (!migration_incoming_colo_enabled()) {
-        return 0;
-    }
+    assert(migration_incoming_colo_enabled());
 
     qemu_thread_create(&th, "COLO incoming", colo_process_incoming_thread,
                        mis, QEMU_THREAD_JOINABLE);
@@ -953,6 +950,4 @@ int coroutine_fn colo_incoming_co(void)
 
     /* We hold the global BQL, so it is safe here */
     colo_release_ram_cache();
-
-    return 0;
 }