On Mon, Jan 10, 2022 at 2:58 AM Philippe Mathieu-Daudé <f4bug@amsat.org>
wrote:

> +Warner
>
> On 1/5/22 14:49, Alex Bennée wrote:
> > From: Paolo Bonzini <pbonzini@redhat.com>
> >
> > The two more or less overlap, because CONFIG_LINUX is a requirement for
> Linux
> > user-mode emulation.  However, CONFIG_LINUX is technically a host symbol
> > that applies even to system emulation.  Defining CONFIG_LINUX_USER, and
> > CONFIG_BSD_USER for eventual future use, is cleaner.
> >
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> > Message-Id: <20211210084836.25202-1-pbonzini@redhat.com>
> > ---
> >  tests/tcg/configure.sh              | 8 +++++++-
> >  tests/tcg/multiarch/Makefile.target | 2 +-
> >  tests/tcg/x86_64/Makefile.target    | 2 +-
> >  3 files changed, 9 insertions(+), 3 deletions(-)
> >
> > diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
> > index 8eb4287c84..309335a2bd 100755
> > --- a/tests/tcg/configure.sh
> > +++ b/tests/tcg/configure.sh
> > @@ -225,8 +225,14 @@ for target in $target_list; do
> >    echo "TARGET_NAME=$arch" >> $config_target_mak
> >    echo "target=$target" >> $config_target_mak
> >    case $target in
> > -    *-linux-user | *-bsd-user)
> > +    *-linux-user)
> >        echo "CONFIG_USER_ONLY=y" >> $config_target_mak
> > +      echo "CONFIG_LINUX_USER=y" >> $config_target_mak
> > +      echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak
> > +      ;;
> > +    *-bsd-user)
> > +      echo "CONFIG_USER_ONLY=y" >> $config_target_mak
> > +      echo "CONFIG_BSD_USER=y" >> $config_target_mak
> >        echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak
> >        ;;
> >      *-softmmu)
> > diff --git a/tests/tcg/multiarch/Makefile.target
> b/tests/tcg/multiarch/Makefile.target
> > index a83efb4a9d..dec401e67f 100644
> > --- a/tests/tcg/multiarch/Makefile.target
> > +++ b/tests/tcg/multiarch/Makefile.target
> > @@ -10,7 +10,7 @@ MULTIARCH_SRC=$(SRC_PATH)/tests/tcg/multiarch
> >  # Set search path for all sources
> >  VPATH               += $(MULTIARCH_SRC)
> >  MULTIARCH_SRCS =  $(notdir $(wildcard $(MULTIARCH_SRC)/*.c))
> > -ifneq ($(CONFIG_LINUX),)
> > +ifneq ($(CONFIG_LINUX_USER),)
> >  VPATH               += $(MULTIARCH_SRC)/linux
> >  MULTIARCH_SRCS += $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*.c))
> >  endif
> > diff --git a/tests/tcg/x86_64/Makefile.target
> b/tests/tcg/x86_64/Makefile.target
> > index d7a7385583..4a8a464c57 100644
> > --- a/tests/tcg/x86_64/Makefile.target
> > +++ b/tests/tcg/x86_64/Makefile.target
> > @@ -8,7 +8,7 @@
> >
> >  include $(SRC_PATH)/tests/tcg/i386/Makefile.target
> >
> > -ifneq ($(CONFIG_LINUX),)
> > +ifneq ($(CONFIG_LINUX_USER),)
> >  X86_64_TESTS += vsyscall
> >  TESTS=$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64
> >  else
>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>

Reviewed-by: Warner Losh <imp@bsdimp.com>