| Message ID | 1365503248-21275-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Apr 09, 2013 at 12:27:28PM +0200, Paolo Bonzini wrote: > 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 <pbonzini@redhat.com> If you want to enable vhost for tcg why not enable it, and fix any fallout? > --- > 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 <linux/vhost.h> > #include <sys/socket.h> > #include <linux/kvm.h> > -- > 1.8.1.4
Il 09/04/2013 13:16, Michael S. Tsirkin ha scritto: >> > 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 <pbonzini@redhat.com> > If you want to enable vhost for tcg why not enable it, Actually, vhost is already enabled for TCG, and doesn't work because nothing triggers the host notifiers. I thought there was an "if (kvm_enabled())" somewhere, but there isn't. It is not enabled for TCG-only targets, which makes even less sense... > and fix any fallout? I don't want to enable vhost for TCG. What I want to do is limit config-target.mak to things that are really target-dependent. Anyway, I found an old patch from Stefan to fix vhost with TCG. When I'll have time I'll submit both. Scrap this patch for now. Paolo
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 <linux/vhost.h> #include <sys/socket.h> #include <linux/kvm.h>
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 <pbonzini@redhat.com> --- configure | 6 +++--- hw/net/vhost_net.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)