From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBIaH-0002l9-2h for qemu-devel@nongnu.org; Wed, 25 Apr 2018 07:27:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBIaG-0004vH-3z for qemu-devel@nongnu.org; Wed, 25 Apr 2018 07:27:37 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:33576 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 1fBIaG-0004uW-0I for qemu-devel@nongnu.org; Wed, 25 Apr 2018 07:27:36 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9F74D738E0 for ; Wed, 25 Apr 2018 11:27:35 +0000 (UTC) From: Juan Quintela Date: Wed, 25 Apr 2018 13:27:09 +0200 Message-Id: <20180425112723.1111-8-quintela@redhat.com> In-Reply-To: <20180425112723.1111-1-quintela@redhat.com> References: <20180425112723.1111-1-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v12 07/21] 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 Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/migration.c | 4 ++-- migration/migration.h | 1 + migration/ram.c | 3 +++ migration/socket.c | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 98f85e982c..9b510a809a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -447,7 +447,7 @@ static void migration_incoming_setup(QEMUFile *f) qemu_file_set_blocking(f, false); } =20 -static void migration_incoming_process(void) +void migration_incoming_process(void) { Coroutine *co =3D qemu_coroutine_create(process_incoming_migration_c= o, NULL); qemu_coroutine_enter(co); @@ -465,7 +465,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc) =20 if (!mis->from_src_file) { QEMUFile *f =3D 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 4774ee305f..e20f680bac 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -188,6 +188,7 @@ void migrate_set_state(int *state, int old_state, int= new_state); =20 void migration_fd_process_incoming(QEMUFile *f); void migration_ioc_process_incoming(QIOChannel *ioc); +void migration_incoming_process(void); =20 bool migration_has_all_channels(void); =20 diff --git a/migration/ram.c b/migration/ram.c index 54b1f8e836..5a87d74862 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -682,6 +682,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 =3D=3D migrate_multifd_channels()) { + migration_incoming_process(); + } } =20 /** diff --git a/migration/socket.c b/migration/socket.c index 893a04f4cc..d4a2c1e916 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -171,6 +171,10 @@ static void socket_accept_incoming_migration(QIONetL= istener *listener, qio_net_listener_disconnect(listener); =20 object_unref(OBJECT(listener)); + + if (!migrate_use_multifd()) { + migration_incoming_process(); + } } } =20 --=20 2.17.0