From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPVm4-0004JW-3i for qemu-devel@nongnu.org; Tue, 09 Apr 2013 06:27:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPVm1-0007pN-PZ for qemu-devel@nongnu.org; Tue, 09 Apr 2013 06:27:36 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:62883) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPVm1-0007oz-IR for qemu-devel@nongnu.org; Tue, 09 Apr 2013 06:27:33 -0400 Received: by mail-wg0-f43.google.com with SMTP id f12so6584654wgh.34 for ; Tue, 09 Apr 2013 03:27:32 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 9 Apr 2013 12:27:28 +0200 Message-Id: <1365503248-21275-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] configure: move vhost-net to config-host.mak List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com There is no reason why vhost-net should not work with TCG. Hence, put the limitation in hw/vhost-net.c, not straight in the config-*.mak files. Signed-off-by: Paolo Bonzini --- configure | 6 +++--- hw/net/vhost_net.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index d5f2918..4b4b19e 100755 --- a/configure +++ b/configure @@ -3686,6 +3686,9 @@ fi if test "$virtfs" = "yes" ; then echo "CONFIG_VIRTFS=y" >> $config_host_mak fi +if test "$vhost_net" = "yes" ; then + echo "CONFIG_VHOST_NET=y" >> $config_host_mak +fi if test "$blobs" = "yes" ; then echo "INSTALL_BLOBS=yes" >> $config_host_mak fi @@ -4152,9 +4155,6 @@ case "$target_arch2" in \( "$target_arch2" = "x86_64" -a "$cpu" = "i386" \) -o \ \( "$target_arch2" = "i386" -a "$cpu" = "x86_64" \) \) ; then echo "CONFIG_KVM=y" >> $config_target_mak - if test "$vhost_net" = "yes" ; then - echo "CONFIG_VHOST_NET=y" >> $config_target_mak - fi fi esac case "$target_arch2" in diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 8c5384c..0956843 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -22,7 +22,7 @@ #include "config.h" -#ifdef CONFIG_VHOST_NET +#if defined CONFIG_LINUX && defined CONFIG_VHOST_NET && defined CONFIG_KVM #include #include #include -- 1.8.1.4