From patchwork Thu Jul 7 01:00:41 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: 9217597 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 941E6607D9 for ; Thu, 7 Jul 2016 01:23:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85004285C5 for ; Thu, 7 Jul 2016 01:23:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7982C285C7; Thu, 7 Jul 2016 01:23:28 +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 20856285C5 for ; Thu, 7 Jul 2016 01:23:28 +0000 (UTC) Received: from localhost ([::1]:36710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKy2J-000874-A7 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Jul 2016 21:23:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKxh1-0005Ix-Fe for qemu-devel@nongnu.org; Wed, 06 Jul 2016 21:01:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKxh0-0006eS-MA for qemu-devel@nongnu.org; Wed, 06 Jul 2016 21:01:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57644) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKxh0-0006eE-G6 for qemu-devel@nongnu.org; Wed, 06 Jul 2016 21:01:26 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (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 F346B7267C; Thu, 7 Jul 2016 01:01:25 +0000 (UTC) Received: from localhost (ovpn-116-37.phx2.redhat.com [10.3.116.37]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6711OKi008436; Wed, 6 Jul 2016 21:01:25 -0400 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Thu, 7 Jul 2016 03:00:41 +0200 Message-Id: <20160707010053.28008-18-marcandre.lureau@redhat.com> In-Reply-To: <20160707010053.28008-1-marcandre.lureau@redhat.com> References: <20160707010053.28008-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 07 Jul 2016 01:01:26 +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 v4 17/29] vhost-user: add get_vhost_net() assertions 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 Add a few assertions to be more explicit about the runtime behaviour after the previous patch: get_vhost_net() is non-null after net_vhost_user_init(). Signed-off-by: Marc-André Lureau --- hw/net/vhost_net.c | 1 + net/vhost-user.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 08c7d1e..473e6e5 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -417,6 +417,7 @@ VHostNetState *get_vhost_net(NetClientState *nc) break; case NET_CLIENT_OPTIONS_KIND_VHOST_USER: vhost_net = vhost_user_get_vhost_net(nc); + assert(vhost_net != NULL); break; default: break; diff --git a/net/vhost-user.c b/net/vhost-user.c index a80f008..2442925 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -257,6 +257,8 @@ static int net_vhost_user_init(NetClientState *peer, const char *device, qemu_chr_add_handlers(chr, NULL, NULL, net_vhost_user_event, nc[0].name); + assert(s->vhost_net != NULL); + return 0; }