From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxeN5-0002JW-Iu for qemu-devel@nongnu.org; Thu, 19 Jun 2014 11:35:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxeMz-0007Wf-Hy for qemu-devel@nongnu.org; Thu, 19 Jun 2014 11:35:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxeMz-0007WX-8l for qemu-devel@nongnu.org; Thu, 19 Jun 2014 11:35:21 -0400 Date: Thu, 19 Jun 2014 18:35:44 +0300 From: "Michael S. Tsirkin" Message-ID: <20140619153543.GB10724@redhat.com> References: <20140619150355.10499.53297.stgit@3820> <20140619150708.10499.23280.stgit@3820> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140619150708.10499.23280.stgit@3820> Subject: Re: [Qemu-devel] [PATCH 1/6] configure: add new config define CONFIG_VHOST_NET_USED List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Nikolay Nikolaev Cc: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, tech@virtualopensystems.com On Thu, Jun 19, 2014 at 06:07:15PM +0300, Nikolay Nikolaev wrote: > This will be used in net.c (for now) to enable vhos-user netdev backend. > > Signed-off-by: Nikolay Nikolaev Did you test this with mingw? > --- > configure | 3 +++ > net/net.c | 4 ++-- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 9f4ba45..fb3c856 100755 > --- a/configure > +++ b/configure > @@ -4543,6 +4543,9 @@ fi > if test "$vhost_scsi" = "yes" ; then > echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak > fi > +if test "$vhost_net" = "yes" ; then > + echo "CONFIG_VHOST_NET_USED=y" >> $config_host_mak > +fi > if test "$blobs" = "yes" ; then > echo "INSTALL_BLOBS=yes" >> $config_host_mak > fi > diff --git a/net/net.c b/net/net.c > index 0c30414..3dac29b 100644 > --- a/net/net.c > +++ b/net/net.c > @@ -803,7 +803,7 @@ 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 > +#ifdef CONFIG_VHOST_NET_USED > [NET_CLIENT_OPTIONS_KIND_VHOST_USER] = net_init_vhost_user, > #endif > }; > @@ -839,7 +839,7 @@ 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 > +#ifdef CONFIG_VHOST_NET_USED > case NET_CLIENT_OPTIONS_KIND_VHOST_USER: > #endif > break;