From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxMk3-0000G9-Vx for qemu-devel@nongnu.org; Wed, 18 Jun 2014 16:46:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxMjx-0002dY-Ux for qemu-devel@nongnu.org; Wed, 18 Jun 2014 16:45:59 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:64917) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxMjx-0002dR-Od for qemu-devel@nongnu.org; Wed, 18 Jun 2014 16:45:53 -0400 Received: by mail-wi0-f175.google.com with SMTP id r20so8317119wiv.14 for ; Wed, 18 Jun 2014 13:45:52 -0700 (PDT) From: Nikolay Nikolaev Date: Wed, 18 Jun 2014 23:45:45 +0300 Message-ID: <20140618204530.16806.54996.stgit@3820> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] net: fix vhost-user mingw compilation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com Cc: a.motakis@virtualopensystems.com, luke@snabb.co, tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com Make net.o linkage expect net_init_vhost_user only when CONFIG_VHOST_NET is defined. Signed-off-by: Nikolay Nikolaev --- net/net.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/net.c b/net/net.c index de76e30..0c30414 100644 --- a/net/net.c +++ b/net/net.c @@ -803,7 +803,9 @@ static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])( [NET_CLIENT_OPTIONS_KIND_BRIDGE] = net_init_bridge, #endif [NET_CLIENT_OPTIONS_KIND_HUBPORT] = net_init_hubport, +#ifdef CONFIG_VHOST_NET [NET_CLIENT_OPTIONS_KIND_VHOST_USER] = net_init_vhost_user, +#endif }; @@ -837,7 +839,9 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) case NET_CLIENT_OPTIONS_KIND_BRIDGE: #endif case NET_CLIENT_OPTIONS_KIND_HUBPORT: +#ifdef CONFIG_VHOST_NET case NET_CLIENT_OPTIONS_KIND_VHOST_USER: +#endif break; default: