From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9xee-0004J9-8l for qemu-devel@nongnu.org; Mon, 06 Jun 2016 12:45:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9xec-0005Zv-2v for qemu-devel@nongnu.org; Mon, 06 Jun 2016 12:45:31 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:35823) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9xeb-0005Zq-Uv for qemu-devel@nongnu.org; Mon, 06 Jun 2016 12:45:30 -0400 Received: by mail-qk0-x244.google.com with SMTP id l185so8976206qkc.2 for ; Mon, 06 Jun 2016 09:45:29 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Mon, 6 Jun 2016 18:45:03 +0200 Message-Id: <1465231508-30183-6-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1465231508-30183-1-git-send-email-marcandre.lureau@redhat.com> References: <1465231508-30183-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 05/10] vhost-user: disconnect on start failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S . Tsirkin" , Tetsuya Mukawa , jonshin@cisco.com, Ilya Maximets , Yuanhan Liu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-André 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é Lureau Tested-by: Yuanhan Liu Reviewed-by: Yuanhan Liu --- 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 event) s->watch = 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; -- 2.7.4