On Fri, 10 Dec 2021 at 09:41, Paolo Bonzini <pbonz...@redhat.com> wrote: > > 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 <pbonz...@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 9ef913df5b..f859b61d90 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
I note that this is very subtly different from the logic used in meson.build for setting CONFIG_LINUX_USER, which uses "target.endswith('linux-user')" without the leading hyphen... Vaguely relatedly, gdbstub.c has some ifdefs: #if defined(CONFIG_USER_ONLY) && defined(CONFIG_LINUX_USER) Is it possible for CONFIG_LINUX_USER to be defined when CONFIG_USER_ONLY is not, or is the first clause in the #if redundant? thanks -- PMM