Re: [Qemu-devel] [PATCH] net: fix vhost-user mingw compilation

[Michael S. Tsirkin]

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 <address@hidden>

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: