OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/tcg: use CONFIG_LINUX_USER, not CONFIG_LINUX

Browse Source 
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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220105135009.1584676-20-alex.bennee@linaro.org>
This commit is contained in:
Paolo Bonzini 2022-01-05 13:49:54 +00:00 committed by Alex Bennée
parent e1cb5c7550
commit 91ad2244b7
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/tcg/configure.sh
View File

@ -225,8 +225,14 @@ for target in $target_list; do
echo "TARGET_NAME=$arch" >> $config_target_mak echo "TARGET_NAME=$arch" >> $config_target_mak
echo "target=$target" >> $config_target_mak echo "target=$target" >> $config_target_mak
case $target in case $target in
*-linux-user | *-bsd-user) *-linux-user)
echo "CONFIG_USER_ONLY=y" >> $config_target_mak 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 echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak
;; ;;
*-softmmu) *-softmmu)

2
tests/tcg/multiarch/Makefile.target
View File

@ -10,7 +10,7 @@ MULTIARCH_SRC=$(SRC_PATH)/tests/tcg/multiarch
# Set search path for all sources # Set search path for all sources
VPATH += $(MULTIARCH_SRC) VPATH += $(MULTIARCH_SRC)
MULTIARCH_SRCS = $(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) MULTIARCH_SRCS = $(notdir $(wildcard $(MULTIARCH_SRC)/*.c))
ifneq ($(CONFIG_LINUX),) ifneq ($(CONFIG_LINUX_USER),)
VPATH += $(MULTIARCH_SRC)/linux VPATH += $(MULTIARCH_SRC)/linux
MULTIARCH_SRCS += $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*.c)) MULTIARCH_SRCS += $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*.c))
endif endif

2
tests/tcg/x86_64/Makefile.target
View File

@ -8,7 +8,7 @@
include $(SRC_PATH)/tests/tcg/i386/Makefile.target include $(SRC_PATH)/tests/tcg/i386/Makefile.target
ifneq ($(CONFIG_LINUX),) ifneq ($(CONFIG_LINUX_USER),)
X86_64_TESTS += vsyscall X86_64_TESTS += vsyscall
TESTS=$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64 TESTS=$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64
else else