On Wed, Apr 20, 2022 at 8:16 PM Paolo Bonzini <pbonz...@redhat.com> wrote:
> Cleanup to ease review of the conversion to meson. vhost_net_user and > vhost_net_vdpa are never assigned anything in the command line parsing > loop, so they are always equal to $vhost_user and $vhost_vdpa. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> > --- > configure | 17 ++++------------- > 1 file changed, 4 insertions(+), 13 deletions(-) > > diff --git a/configure b/configure > index 61b5acae10..2aa4dc3ce1 100755 > --- a/configure > +++ b/configure > @@ -1554,10 +1554,6 @@ if test "$vhost_vsock" = "yes" && test > "$vhost_kernel" != "yes"; then > fi > > # vhost-user backends > -test "$vhost_net_user" = "" && vhost_net_user=$vhost_user > -if test "$vhost_net_user" = "yes" && test "$vhost_user" = "no"; then > - error_exit "--enable-vhost-net-user requires --enable-vhost-user" > -fi > test "$vhost_crypto" = "" && vhost_crypto=$vhost_user > if test "$vhost_crypto" = "yes" && test "$vhost_user" = "no"; then > error_exit "--enable-vhost-crypto requires --enable-vhost-user" > @@ -1566,16 +1562,11 @@ test "$vhost_user_fs" = "" && > vhost_user_fs=$vhost_user > if test "$vhost_user_fs" = "yes" && test "$vhost_user" = "no"; then > error_exit "--enable-vhost-user-fs requires --enable-vhost-user" > fi > -#vhost-vdpa backends > -test "$vhost_net_vdpa" = "" && vhost_net_vdpa=$vhost_vdpa > -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, 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_user" = "yes" && vhost_net=yes > + test "$vhost_vdpa" = "yes" && vhost_net=yes > test "$vhost_kernel" = "yes" && vhost_net=yes > fi > > @@ -2104,10 +2095,10 @@ fi > if test "$vhost_net" = "yes" ; then > echo "CONFIG_VHOST_NET=y" >> $config_host_mak > fi > -if test "$vhost_net_user" = "yes" ; then > +if test "$vhost_user" = "yes" ; then > echo "CONFIG_VHOST_NET_USER=y" >> $config_host_mak > fi > -if test "$vhost_net_vdpa" = "yes" ; then > +if test "$vhost_vdpa" = "yes" ; then > echo "CONFIG_VHOST_NET_VDPA=y" >> $config_host_mak > fi > if test "$vhost_crypto" = "yes" ; then > -- > 2.35.1 > > > > -- Marc-André Lureau
