From patchwork Tue Jun 21 10:02:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 9190283 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4FD6C6075A for ; Tue, 21 Jun 2016 10:29:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35070280CF for ; Tue, 21 Jun 2016 10:29:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 263BA28111; Tue, 21 Jun 2016 10:29:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D2442280CF for ; Tue, 21 Jun 2016 10:29:09 +0000 (UTC) Received: from localhost ([::1]:50510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFIvd-0001WC-1j for patchwork-qemu-devel@patchwork.kernel.org; Tue, 21 Jun 2016 06:29:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFIWk-0005P4-8r for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFIWi-0000Pa-3y for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34492) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFIWh-0000PM-V4 for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:24 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 80D9C7F0A0; Tue, 21 Jun 2016 10:03:23 +0000 (UTC) Received: from localhost ([10.41.1.246]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5LA3MJg010750; Tue, 21 Jun 2016 06:03:23 -0400 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Tue, 21 Jun 2016 12:02:51 +0200 Message-Id: <1466503372-28334-24-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1466503372-28334-1-git-send-email-marcandre.lureau@redhat.com> References: <1466503372-28334-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 21 Jun 2016 10:03:23 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 23/24] vhost-user: wait until link is up X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yuanhan.liu@linux.intel.com, victork@redhat.com, mst@redhat.com, jonshin@cisco.com, mukawa@igel.co.jp, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau The chardev waits for an initial connection before starting qemu, vhost-user wants the backend negotiation to be completed. vhost-user is started in the net_vhost_user_event callback, which is synchronously called after the socket is connected. Signed-off-by: Marc-André Lureau --- net/vhost-user.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/vhost-user.c b/net/vhost-user.c index 95ed2d2..bb4a253 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -248,7 +248,15 @@ static int net_vhost_user_init(NetClientState *peer, const char *device, s->chr = chr; } - qemu_chr_add_handlers(chr, NULL, NULL, net_vhost_user_event, nc[0].name); + do { + Error *err = 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, nc[0].name); + } while (nc->link_down); assert(s->vhost_net != NULL);