| Message ID | 20200924210023.160679-1-lvivier@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | configure: Fix build dependencies with vhost-vdpa. | expand |
On 9/24/20 11:00 PM, Laurent Vivier wrote: > Following the same logic as for vhost-net-user and vhost-kernel, > enable vhost-net if vhost-net-vdpa is enabled and vhost-net is not > explicitly disabled. > See 299e6f19b3e2 ("vhost-net: revamp configure logic") > > Autoselect VHOST if VHOST_VDPA is set > See 21c6b0c87e85 ("configure: simplify vhost condition with Kconfig") > See 2becc36a3e53 ("meson: infrastructure for building emulators" > > Problems can be triggered using; > ... --enable-vhost-vdpa --disable-vhost-user --disable-vhost-kernel ... > > Fixes: 108a64818e69 ("vhost-vdpa: introduce vhost-vdpa backend") > Cc: lulu@redhat.com > Cc: pbonzini@redhat.com > Cc: marcandre.lureau@redhat.com > Signed-off-by: Laurent Vivier <lvivier@redhat.com> Superfluous trailing '.' in subject. Otherwise: Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > Kconfig.host | 4 ++++ > configure | 3 ++- > meson.build | 1 + > 3 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/Kconfig.host b/Kconfig.host > index 4af19bf70ef9..a9a55a9c315c 100644 > --- a/Kconfig.host > +++ b/Kconfig.host > @@ -24,6 +24,10 @@ config VHOST_USER > bool > select VHOST > > +config VHOST_VDPA > + bool > + select VHOST > + > config VHOST_KERNEL > bool > select VHOST > diff --git a/configure b/configure > index e8e8e984f245..8ee15810c882 100755 > --- a/configure > +++ b/configure > @@ -2494,9 +2494,10 @@ if test "$vhost_net_vdpa" = "yes" && test "$vhost_vdpa" = "no"; then > error_exit "--enable-vhost-net-vdpa requires --enable-vhost-vdpa" > fi > > -# OR the vhost-kernel and vhost-user values for simplicity > +# OR the vhost-kernel, vhost-vdpa and vhost-user values for simplicity > if test "$vhost_net" = ""; then > test "$vhost_net_user" = "yes" && vhost_net=yes > + test "$vhost_net_vdpa" = "yes" && vhost_net=yes > test "$vhost_kernel" = "yes" && vhost_net=yes > fi > > diff --git a/meson.build b/meson.build > index f4d1ab109680..488ca205fad2 100644 > --- a/meson.build > +++ b/meson.build > @@ -521,6 +521,7 @@ kconfig_external_symbols = [ > 'CONFIG_OPENGL', > 'CONFIG_X11', > 'CONFIG_VHOST_USER', > + 'CONFIG_VHOST_VDPA', > 'CONFIG_VHOST_KERNEL', > 'CONFIG_VIRTFS', > 'CONFIG_LINUX', >
On 24/09/20 23:00, Laurent Vivier wrote: > Following the same logic as for vhost-net-user and vhost-kernel, > enable vhost-net if vhost-net-vdpa is enabled and vhost-net is not > explicitly disabled. > See 299e6f19b3e2 ("vhost-net: revamp configure logic") > > Autoselect VHOST if VHOST_VDPA is set > See 21c6b0c87e85 ("configure: simplify vhost condition with Kconfig") > See 2becc36a3e53 ("meson: infrastructure for building emulators" > > Problems can be triggered using; > ... --enable-vhost-vdpa --disable-vhost-user --disable-vhost-kernel ... > > Fixes: 108a64818e69 ("vhost-vdpa: introduce vhost-vdpa backend") > Cc: lulu@redhat.com > Cc: pbonzini@redhat.com > Cc: marcandre.lureau@redhat.com > Signed-off-by: Laurent Vivier <lvivier@redhat.com> > --- > Kconfig.host | 4 ++++ > configure | 3 ++- > meson.build | 1 + > 3 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/Kconfig.host b/Kconfig.host > index 4af19bf70ef9..a9a55a9c315c 100644 > --- a/Kconfig.host > +++ b/Kconfig.host > @@ -24,6 +24,10 @@ config VHOST_USER > bool > select VHOST > > +config VHOST_VDPA > + bool > + select VHOST > + > config VHOST_KERNEL > bool > select VHOST > diff --git a/configure b/configure > index e8e8e984f245..8ee15810c882 100755 > --- a/configure > +++ b/configure > @@ -2494,9 +2494,10 @@ if test "$vhost_net_vdpa" = "yes" && test "$vhost_vdpa" = "no"; then > error_exit "--enable-vhost-net-vdpa requires --enable-vhost-vdpa" > fi > > -# OR the vhost-kernel and vhost-user values for simplicity > +# OR the vhost-kernel, vhost-vdpa and vhost-user values for simplicity > if test "$vhost_net" = ""; then > test "$vhost_net_user" = "yes" && vhost_net=yes > + test "$vhost_net_vdpa" = "yes" && vhost_net=yes > test "$vhost_kernel" = "yes" && vhost_net=yes > fi > > diff --git a/meson.build b/meson.build > index f4d1ab109680..488ca205fad2 100644 > --- a/meson.build > +++ b/meson.build > @@ -521,6 +521,7 @@ kconfig_external_symbols = [ > 'CONFIG_OPENGL', > 'CONFIG_X11', > 'CONFIG_VHOST_USER', > + 'CONFIG_VHOST_VDPA', > 'CONFIG_VHOST_KERNEL', > 'CONFIG_VIRTFS', > 'CONFIG_LINUX', > Acked-by: Paolo Bonzini <pbonzini@redhat.com> I expect this to be merged by Michael or Jason? Paolo
diff --git a/Kconfig.host b/Kconfig.host index 4af19bf70ef9..a9a55a9c315c 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -24,6 +24,10 @@ config VHOST_USER bool select VHOST +config VHOST_VDPA + bool + select VHOST + config VHOST_KERNEL bool select VHOST diff --git a/configure b/configure index e8e8e984f245..8ee15810c882 100755 --- a/configure +++ b/configure @@ -2494,9 +2494,10 @@ if test "$vhost_net_vdpa" = "yes" && test "$vhost_vdpa" = "no"; then error_exit "--enable-vhost-net-vdpa requires --enable-vhost-vdpa" fi -# OR the vhost-kernel and vhost-user values for simplicity +# OR the vhost-kernel, vhost-vdpa and vhost-user values for simplicity if test "$vhost_net" = ""; then test "$vhost_net_user" = "yes" && vhost_net=yes + test "$vhost_net_vdpa" = "yes" && vhost_net=yes test "$vhost_kernel" = "yes" && vhost_net=yes fi diff --git a/meson.build b/meson.build index f4d1ab109680..488ca205fad2 100644 --- a/meson.build +++ b/meson.build @@ -521,6 +521,7 @@ kconfig_external_symbols = [ 'CONFIG_OPENGL', 'CONFIG_X11', 'CONFIG_VHOST_USER', + 'CONFIG_VHOST_VDPA', 'CONFIG_VHOST_KERNEL', 'CONFIG_VIRTFS', 'CONFIG_LINUX',
Following the same logic as for vhost-net-user and vhost-kernel, enable vhost-net if vhost-net-vdpa is enabled and vhost-net is not explicitly disabled. See 299e6f19b3e2 ("vhost-net: revamp configure logic") Autoselect VHOST if VHOST_VDPA is set See 21c6b0c87e85 ("configure: simplify vhost condition with Kconfig") See 2becc36a3e53 ("meson: infrastructure for building emulators" Problems can be triggered using; ... --enable-vhost-vdpa --disable-vhost-user --disable-vhost-kernel ... Fixes: 108a64818e69 ("vhost-vdpa: introduce vhost-vdpa backend") Cc: lulu@redhat.com Cc: pbonzini@redhat.com Cc: marcandre.lureau@redhat.com Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- Kconfig.host | 4 ++++ configure | 3 ++- meson.build | 1 + 3 files changed, 7 insertions(+), 1 deletion(-)