| Revisión | 91ad2244b73ce2b98129bc4ac7ea45fa280ccf62 (tree) |
|---|---|
| Tiempo | 2022-01-19 01:42:42 |
| Autor | Paolo Bonzini <pbonzini@redh...> |
| Commiter | Alex Bennée |
tests/tcg: use CONFIG_LINUX_USER, not CONFIG_LINUX
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>
tests/tcg/configure.sh (diff)
tests/tcg/multiarch/Makefile.target (diff) tests/tcg/x86_64/Makefile.target (diff)| @@ -225,8 +225,14 @@ for target in $target_list; do | ||
| 225 | 225 | echo "TARGET_NAME=$arch" >> $config_target_mak |
| 226 | 226 | echo "target=$target" >> $config_target_mak |
| 227 | 227 | case $target in |
| 228 | - *-linux-user | *-bsd-user) | |
| 228 | + *-linux-user) | |
| 229 | 229 | echo "CONFIG_USER_ONLY=y" >> $config_target_mak |
| 230 | + echo "CONFIG_LINUX_USER=y" >> $config_target_mak | |
| 231 | + echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak | |
| 232 | + ;; | |
| 233 | + *-bsd-user) | |
| 234 | + echo "CONFIG_USER_ONLY=y" >> $config_target_mak | |
| 235 | + echo "CONFIG_BSD_USER=y" >> $config_target_mak | |
| 230 | 236 | echo "QEMU=$PWD/qemu-$arch" >> $config_target_mak |
| 231 | 237 | ;; |
| 232 | 238 | *-softmmu) |
| @@ -10,7 +10,7 @@ MULTIARCH_SRC=$(SRC_PATH)/tests/tcg/multiarch | ||
| 10 | 10 | # Set search path for all sources |
| 11 | 11 | VPATH += $(MULTIARCH_SRC) |
| 12 | 12 | MULTIARCH_SRCS = $(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) |
| 13 | -ifneq ($(CONFIG_LINUX),) | |
| 13 | +ifneq ($(CONFIG_LINUX_USER),) | |
| 14 | 14 | VPATH += $(MULTIARCH_SRC)/linux |
| 15 | 15 | MULTIARCH_SRCS += $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*.c)) |
| 16 | 16 | endif |
| @@ -8,7 +8,7 @@ | ||
| 8 | 8 | |
| 9 | 9 | include $(SRC_PATH)/tests/tcg/i386/Makefile.target |
| 10 | 10 | |
| 11 | -ifneq ($(CONFIG_LINUX),) | |
| 11 | +ifneq ($(CONFIG_LINUX_USER),) | |
| 12 | 12 | X86_64_TESTS += vsyscall |
| 13 | 13 | TESTS=$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64 |
| 14 | 14 | else |
Fork