commit 1d4cfcd4091bc6567ba759881f98726c808f7490
author Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Fri Apr 28 22:49:23 2023 +0300
committer Juan Quintela <quintela@redhat.com> Wed May 10 18:48:11 2023 +0200
tree d257d9c685a360d55bbe448851b041f0a6dee7da
parent 51e47cf8600dab5beedd7fa369ffd645868672ec

migration: drop colo_incoming_thread from MigrationIncomingState

have_colo_incoming_thread variable is unused. colo_incoming_thread can
be local.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Message-Id: <20230428194928.1426370-6-vsementsov@yandex-team.ru>
Signed-off-by: Juan Quintela <quintela@redhat.com>

migration/migration.c

diff --git a/migration/migration.c b/migration/migration.c
index 61b3162..c7f628c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -544,6 +544,8 @@
 
     /* we get COLO info, and know if we are in COLO mode */
     if (!ret && migration_incoming_colo_enabled()) {
+        QemuThread colo_incoming_thread;
+
         /* Make sure all file formats throw away their mutable metadata */
         bdrv_activate_all(&local_err);
         if (local_err) {
@@ -551,14 +553,13 @@
             goto fail;
         }
 
-        qemu_thread_create(&mis->colo_incoming_thread, "COLO incoming",
+        qemu_thread_create(&colo_incoming_thread, "COLO incoming",
              colo_process_incoming_thread, mis, QEMU_THREAD_JOINABLE);
-        mis->have_colo_incoming_thread = true;
         qemu_coroutine_yield();
 
         qemu_mutex_unlock_iothread();
         /* Wait checkpoint incoming thread exit before free resource */
-        qemu_thread_join(&mis->colo_incoming_thread);
+        qemu_thread_join(&colo_incoming_thread);
         qemu_mutex_lock_iothread();
         /* We hold the global iothread lock, so it is safe here */
         colo_release_ram_cache();

migration/migration.h

diff --git a/migration/migration.h b/migration/migration.h
index 3a91851..7721c76 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -162,8 +162,6 @@
 
     int state;
 
-    bool have_colo_incoming_thread;
-    QemuThread colo_incoming_thread;
     /* The coroutine we should enter (back) after failover */
     Coroutine *migration_incoming_co;
     QemuSemaphore colo_incoming_sem;