From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyIT-0006U5-AX for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:17:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyIQ-0003AG-Ti for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:17:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyIQ-0003AC-LW for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:17:10 -0400 Date: Fri, 29 Jul 2016 06:17:06 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-36-git-send-email-mst@redhat.com> References: <1469762011-7902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 35/41] vhost-user: wait until backend init is completed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , Jason Wang From: Marc-Andr=E9 Lureau The chardev waits for an initial connection before starting qemu, and vhost-user should wait for the backend negotiation to be completed before starting qemu too. vhost-user is started in the net_vhost_user_event callback, which is synchronously called after the socket is connected. Use a VhostUserState.started flag to indicate vhost-user init completed successfully and qemu can be started. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- net/vhost-user.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/net/vhost-user.c b/net/vhost-user.c index 39987a3..b0595f8 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -24,6 +24,7 @@ typedef struct VhostUserState { VHostNetState *vhost_net; guint watch; uint64_t acked_features; + bool started; } VhostUserState; =20 typedef struct VhostUserChardevProps { @@ -220,6 +221,7 @@ static void net_vhost_user_event(void *opaque, int ev= ent) return; } qmp_set_link(name, true, &err); + s->started =3D true; break; case CHR_EVENT_CLOSED: qmp_set_link(name, false, &err); @@ -238,7 +240,7 @@ static int net_vhost_user_init(NetClientState *peer, = const char *device, const char *name, CharDriverState *chr, int queues) { - NetClientState *nc; + NetClientState *nc, *nc0 =3D NULL; VhostUserState *s; int i; =20 @@ -247,6 +249,9 @@ static int net_vhost_user_init(NetClientState *peer, = const char *device, =20 for (i =3D 0; i < queues; i++) { nc =3D qemu_new_net_client(&net_vhost_user_info, peer, device, n= ame); + if (!nc0) { + nc0 =3D nc; + } =20 snprintf(nc->info_str, sizeof(nc->info_str), "vhost-user%d to %s= ", i, chr->label); @@ -257,7 +262,16 @@ static int net_vhost_user_init(NetClientState *peer,= const char *device, s->chr =3D chr; } =20 - qemu_chr_add_handlers(chr, NULL, NULL, net_vhost_user_event, nc[0].n= ame); + s =3D DO_UPCAST(VhostUserState, nc, nc0); + do { + Error *err =3D NULL; + if (qemu_chr_wait_connected(chr, &err) < 0) { + error_report_err(err); + return -1; + } + qemu_chr_add_handlers(chr, NULL, NULL, + net_vhost_user_event, nc0->name); + } while (!s->started); =20 assert(s->vhost_net); =20 --=20 MST