From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewnwK-0006g1-3T for qemu-devel@nongnu.org; Fri, 16 Mar 2018 07:54:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewnwJ-0002eI-5M for qemu-devel@nongnu.org; Fri, 16 Mar 2018 07:54:28 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:33552 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ewnwJ-0002eC-15 for qemu-devel@nongnu.org; Fri, 16 Mar 2018 07:54:27 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 85349401CC41 for ; Fri, 16 Mar 2018 11:54:26 +0000 (UTC) From: Juan Quintela Date: Fri, 16 Mar 2018 12:53:59 +0100 Message-Id: <20180316115403.4148-12-quintela@redhat.com> In-Reply-To: <20180316115403.4148-1-quintela@redhat.com> References: <20180316115403.4148-1-quintela@redhat.com> Subject: [Qemu-devel] [PATCH v11 11/15] migration: Delay start of migration main routines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com, lvivier@redhat.com, peterx@redhat.com We need to make sure that we have started all the multifd threads. Signed-off-by: Juan Quintela --- migration/migration.c | 4 ++-- migration/migration.h | 1 + migration/ram.c | 3 +++ migration/socket.c | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index b3c6198e12..8856860c44 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -429,7 +429,7 @@ static void migration_incoming_setup(QEMUFile *f) qemu_file_set_blocking(f, false); } -static void migration_incoming_process(void) +void migration_incoming_process(void) { Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, NULL); qemu_coroutine_enter(co); @@ -447,7 +447,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc) if (!mis->from_src_file) { QEMUFile *f = qemu_fopen_channel_input(ioc); - migration_fd_process_incoming(f); + migration_incoming_setup(f); return; } multifd_recv_new_channel(ioc); diff --git a/migration/migration.h b/migration/migration.h index 36b9c70fd6..cef4c189c5 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -184,6 +184,7 @@ void migrate_set_state(int *state, int old_state, int new_state); void migration_fd_process_incoming(QEMUFile *f); void migration_ioc_process_incoming(QIOChannel *ioc); +void migration_incoming_process(void); bool migration_has_all_channels(void); diff --git a/migration/ram.c b/migration/ram.c index 5dade41243..55af077abc 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -767,6 +767,9 @@ void multifd_recv_new_channel(QIOChannel *ioc) qemu_thread_create(&p->thread, p->name, multifd_recv_thread, p, QEMU_THREAD_JOINABLE); atomic_inc(&multifd_recv_state->count); + if (multifd_recv_state->count == migrate_multifd_channels()) { + migration_incoming_process(); + } } /** diff --git a/migration/socket.c b/migration/socket.c index 7889753fab..55af3b8180 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -178,6 +178,9 @@ static gboolean socket_accept_incoming_migration(QIOChannel *ioc, if (migration_has_all_channels()) { /* Close listening socket as its no longer needed */ qio_channel_close(ioc, NULL); + if (!migrate_use_multifd()) { + migration_incoming_process(); + } return G_SOURCE_REMOVE; } else { return G_SOURCE_CONTINUE; -- 2.14.3