From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJbED-0005Xe-JC for qemu-devel@nongnu.org; Fri, 18 May 2018 04:59:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJbE9-0000ID-NM for qemu-devel@nongnu.org; Fri, 18 May 2018 04:59:09 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39806 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 1fJbE9-0000Hx-Hs for qemu-devel@nongnu.org; Fri, 18 May 2018 04:59:05 -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 0EE9981FE148 for ; Fri, 18 May 2018 08:59:05 +0000 (UTC) Date: Fri, 18 May 2018 10:59:02 +0200 From: Kevin Wolf Message-ID: <20180518085902.GB4833@localhost.localdomain> References: <20180515234017.2277-1-quintela@redhat.com> <20180515234017.2277-11-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20180515234017.2277-11-quintela@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PULL 10/40] migration: Delay start of migration main routines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com, berrange@redhat.com Am 16.05.2018 um 01:39 hat Juan Quintela geschrieben: > We need to make sure that we have started all the multifd threads. >=20 > Signed-off-by: Juan Quintela > Reviewed-by: Daniel P. Berrang=E9 This commit makes qemu-iotests 091 hang for me. Either it breaks backward compatibility intentionally and we need to update the test case, or there is a bug somewhere. Can you have a look, please? Kevin > --- > migration/migration.c | 4 ++-- > migration/migration.h | 1 + > migration/ram.c | 3 +++ > migration/socket.c | 4 ++++ > 4 files changed, 10 insertions(+), 2 deletions(-) >=20 > diff --git a/migration/migration.c b/migration/migration.c > index 8e5b421b97..61c4ee7850 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -430,7 +430,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= _co, NULL); > qemu_coroutine_enter(co); > @@ -448,7 +448,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 7c69598c54..26e5951d56 100644 > --- a/migration/migration.h > +++ b/migration/migration.h > @@ -200,6 +200,7 @@ void migrate_set_state(int *state, int old_state, i= nt 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 87434d3fce..f7e8615e15 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -717,6 +717,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 e09fd1aae5..7a5eb562b8 100644 > --- a/migration/socket.c > +++ b/migration/socket.c > @@ -170,6 +170,10 @@ static void socket_accept_incoming_migration(QIONe= tListener *listener, > qio_net_listener_disconnect(listener); > =20 > object_unref(OBJECT(listener)); > + > + if (!migrate_use_multifd()) { > + migration_incoming_process(); > + } > } > } > =20 > --=20 > 2.17.0 >=20 >=20