From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFIWj-0005Nw-6l for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFIWc-0000N7-1j for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48266) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFIWb-0000N3-SP for qemu-devel@nongnu.org; Tue, 21 Jun 2016 06:03:17 -0400 From: marcandre.lureau@redhat.com Date: Tue, 21 Jun 2016 12:02:46 +0200 Message-Id: <1466503372-28334-19-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 18/24] get_vhost_net() should be != null after vhost_user_init List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mukawa@igel.co.jp, yuanhan.liu@linux.intel.com, victork@redhat.com, jonshin@cisco.com, mst@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 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 f1dd367..22ea653 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 =3D vhost_user_get_vhost_net(nc); + assert(vhost_net !=3D NULL); break; default: break; diff --git a/net/vhost-user.c b/net/vhost-user.c index 4c7702f..95ed2d2 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -250,6 +250,8 @@ static int net_vhost_user_init(NetClientState *peer, = const char *device, =20 qemu_chr_add_handlers(chr, NULL, NULL, net_vhost_user_event, nc[0].n= ame); =20 + assert(s->vhost_net !=3D NULL); + return 0; } =20 --=20 2.7.4