[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/10] migration: drop colo_incoming_thread from MigrationIncoming
From: |
Juan Quintela |
Subject: |
[PULL 07/10] migration: drop colo_incoming_thread from MigrationIncomingState |
Date: |
Tue, 9 May 2023 21:17:21 +0200 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
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 | 7 ++++---
migration/migration.h | 2 --
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 01ee92e699..3ab3b1c3e6 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -544,6 +544,8 @@ process_incoming_migration_co(void *opaque)
/* 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 @@ process_incoming_migration_co(void *opaque)
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();
diff --git a/migration/migration.h b/migration/migration.h
index 3a918514e7..7721c7658b 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -162,8 +162,6 @@ struct MigrationIncomingState {
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;
--
2.40.0
- [PULL 00/10] Migration 20230509 patches, Juan Quintela, 2023/05/09
- [PULL 01/10] ram: Add public helper to set colo bitmap, Juan Quintela, 2023/05/09
- [PULL 02/10] ram: Let colo_flush_ram_cache take the bitmap_mutex, Juan Quintela, 2023/05/09
- [PULL 03/10] multifd: Add the ramblock to MultiFDRecvParams, Juan Quintela, 2023/05/09
- [PULL 04/10] block/meson.build: prefer positive condition for replication, Juan Quintela, 2023/05/09
- [PULL 05/10] colo: make colo_checkpoint_notify static and provide simpler API, Juan Quintela, 2023/05/09
- [PULL 06/10] build: move COLO under CONFIG_REPLICATION, Juan Quintela, 2023/05/09
- [PULL 07/10] migration: drop colo_incoming_thread from MigrationIncomingState,
Juan Quintela <=
- [PULL 09/10] migration: disallow change capabilities in COLO state, Juan Quintela, 2023/05/09
- [PULL 08/10] migration: process_incoming_migration_co: simplify code flow around ret, Juan Quintela, 2023/05/09
- [PULL 10/10] migration: block incoming colo when capability is disabled, Juan Quintela, 2023/05/09
- Re: [PULL 00/10] Migration 20230509 patches, Richard Henderson, 2023/05/10