From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34102)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Wxdj0-0006TO-S2
	for qemu-devel@nongnu.org; Thu, 19 Jun 2014 10:54:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Wxdiv-0007Hw-Li
	for qemu-devel@nongnu.org; Thu, 19 Jun 2014 10:54:02 -0400
Received: from mx1.redhat.com ([209.132.183.28]:9184)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Wxdiv-0007Hk-Dv
	for qemu-devel@nongnu.org; Thu, 19 Jun 2014 10:53:57 -0400
Date: Thu, 19 Jun 2014 17:54:21 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20140619145421.GA10724@redhat.com>
References: <20140618204530.16806.54996.stgit@3820>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20140618204530.16806.54996.stgit@3820>
Subject: Re: [Qemu-devel] [PATCH] net: fix vhost-user mingw compilation
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Cc: a.motakis@virtualopensystems.com, luke@snabb.co, snabb-devel@googlegroups.com, qemu-devel@nongnu.org, tech@virtualopensystems.com

On Wed, Jun 18, 2014 at 11:45:45PM +0300, Nikolay Nikolaev wrote:
> Make net.o linkage expect net_init_vhost_user only when
> CONFIG_VHOST_NET is defined.
> 
> Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>

Pls fix this one asap as it blocks pull request.
I'll have to push vhost user out to next request otherwise ...

> ---
>  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: