From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDhg7-0005B4-MA for qemu-devel@nongnu.org; Thu, 16 Jun 2016 20:30:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDhg5-0006IG-Kd for qemu-devel@nongnu.org; Thu, 16 Jun 2016 20:30:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43630) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDhg5-0006IC-FT for qemu-devel@nongnu.org; Thu, 16 Jun 2016 20:30:29 -0400 Date: Fri, 17 Jun 2016 03:30:25 +0300 From: "Michael S. Tsirkin" Message-ID: <20160617033025-mutt-send-email-mst@redhat.com> References: <1466123354-22896-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: <1466123354-22896-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v3 06/15] vhost-user: disconnect on start failure 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 , Yuanhan Liu , Victor Kaplansky , Jason Wang From: Marc-Andr=E9 Lureau If the backend failed to start (for example feature negociation failed), do not exit, but disconnect the char device instead. Slightly more robust for reconnect case. Signed-off-by: Marc-Andr=E9 Lureau Tested-by: Yuanhan Liu Reviewed-by: Yuanhan Liu Reviewed-by: Victor Kaplansky Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- net/vhost-user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/vhost-user.c b/net/vhost-user.c index 4a7fd5f..41ddb4b 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -202,7 +202,8 @@ static void net_vhost_user_event(void *opaque, int ev= ent) s->watch =3D qemu_chr_fe_add_watch(s->chr, G_IO_HUP, net_vhost_user_watch, s); if (vhost_user_start(queues, ncs) < 0) { - exit(1); + qemu_chr_disconnect(s->chr); + return; } qmp_set_link(name, true, &err); break; --=20 MST