| Message ID | 20230428194928.1426370-6-vsementsov@yandex-team.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | COLO: improve build options | expand |
On Fri, Apr 28, 2023 at 10:49:23PM +0300, Vladimir Sementsov-Ogievskiy wrote: > 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: Peter Xu <peterx@redhat.com>
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> wrote: > 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>
> -----Original Message----- > From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> > Sent: Saturday, April 29, 2023 3:49 AM > To: qemu-devel@nongnu.org > Cc: lukasstraub2@web.de; quintela@redhat.com; Zhang, Chen > <chen.zhang@intel.com>; vsementsov@yandex-team.ru; Peter Xu > <peterx@redhat.com>; Leonardo Bras <leobras@redhat.com> > Subject: [PATCH v4 05/10] 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: Zhang Chen <chen.zhang@intel.com> Thanks Chen > --- > 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 > 0c14837cd3..d4fa1a853c 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -535,6 +535,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) { > @@ -542,14 +544,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.34.1
diff --git a/migration/migration.c b/migration/migration.c index 0c14837cd3..d4fa1a853c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -535,6 +535,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) { @@ -542,14 +544,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;
have_colo_incoming_thread variable is unused. colo_incoming_thread can be local. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> --- migration/migration.c | 7 ++++--- migration/migration.h | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-)