[4/4] migration/ram.c: multifd_send_state->count is not really used

Commit Message

Wei Yang May 28, 2019, 1:47 a.m. UTC

Signed-off-by: Wei Yang <[e-mail]>
---
 migration/ram.c | 5 -----
 1 file changed, 5 deletions(-)

Comments

Juan Quintela May 28, 2019, 8:19 a.m. UTC | #1

Wei Yang <[e-mail]> wrote:
> Signed-off-by: Wei Yang <[e-mail]>


Reviewed-by: Juan Quintela <[e-mail]>

Once upon a time, we checked how many threads were created to recover
for errors, but this was wrong because one of the "missing" threads
could be one different from the last one.

Thanks, Juan.

Patch

diff --git a/migration/ram.c b/migration/ram.c
index 5d31f7bd4c..c9a9f7489b 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -892,8 +892,6 @@  static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
 
 struct {
     MultiFDSendParams *params;
-    /* number of created threads */
-    int count;
     /* array of pages to sent */
     MultiFDPages_t *pages;
     /* syncs main thread and channels */
@@ -1171,8 +1169,6 @@  static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
         p->running = true;
         qemu_thread_create(&p->thread, p->name, multifd_send_thread, p,
                            QEMU_THREAD_JOINABLE);
-
-        atomic_inc(&multifd_send_state->count);
     }
 }
 
@@ -1188,7 +1184,6 @@  int multifd_save_setup(void)
     thread_count = migrate_multifd_channels();
     multifd_send_state = g_malloc0(sizeof(*multifd_send_state));
     multifd_send_state->params = g_new0(MultiFDSendParams, thread_count);
-    atomic_set(&multifd_send_state->count, 0);
     multifd_send_state->pages = multifd_pages_init(page_count);
     qemu_sem_init(&multifd_send_state->sem_sync, 0);
     qemu_sem_init(&multifd_send_state->channels_ready, 0);