All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Eduardo Habkost" <eduardo@habkost.net>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	qemu-devel@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 19/31] tests/tcg: use CONFIG_LINUX_USER, not CONFIG_LINUX
Date: Wed, 12 Jan 2022 11:27:10 +0000	[thread overview]
Message-ID: <20220112112722.3641051-20-alex.bennee@linaro.org> (raw)
In-Reply-To: <20220112112722.3641051-1-alex.bennee@linaro.org>

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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220105135009.1584676-20-alex.bennee@linaro.org>

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
-- 
2.30.2



  parent reply	other threads:[~2022-01-12 12:06 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-12 11:26 [PULL 00/31] testing/next and other misc fixes Alex Bennée
2022-01-12 11:26 ` [PULL 01/31] ui: avoid compiler warnings from unused clipboard info variable Alex Bennée
2022-01-12 11:26 ` [PULL 02/31] spice: Update QXLInterface for spice >= 0.15.0 Alex Bennée
2022-01-12 11:26 ` [PULL 03/31] meson: require liburing >= 0.3 Alex Bennée
2022-01-12 11:26 ` [PULL 04/31] ui: avoid warnings about directdb on Alpine / musl libc Alex Bennée
2022-01-12 11:26 ` [PULL 05/31] ci: explicitly skip I/O tests on alpine Alex Bennée
2022-01-12 11:26 ` [PULL 06/31] tests/docker: switch fedora image to release 35 Alex Bennée
2022-01-12 11:26 ` [PULL 07/31] tests: integrate lcitool for generating build env manifests Alex Bennée
2022-01-12 11:26 ` [PULL 08/31] tests/docker: auto-generate centos8.docker with lcitool Alex Bennée
2022-01-12 11:27 ` [PULL 09/31] tests/docker: auto-generate fedora.docker " Alex Bennée
2022-01-12 11:27 ` [PULL 10/31] tests/docker: auto-generate ubuntu1804.docker " Alex Bennée
2022-01-12 11:27 ` [PULL 11/31] tests/docker: auto-generate ubuntu2004.docker " Alex Bennée
2022-01-12 11:27 ` [PULL 12/31] tests/docker: auto-generate opensuse-leap.docker " Alex Bennée
2022-01-12 11:27 ` [PULL 13/31] tests/docker: remove ubuntu.docker container Alex Bennée
2022-01-12 11:27 ` [PULL 14/31] .gitlab-ci.d/cirrus: auto-generate variables with lcitool Alex Bennée
2022-01-12 11:27 ` [PULL 15/31] tests/docker: updates to alpine package list Alex Bennée
2022-01-12 11:27 ` [PULL 16/31] tests/docker: fix sorting of alpine image package lists Alex Bennée
2022-01-12 11:27 ` [PULL 17/31] tests/docker: fully expand the alpine package list Alex Bennée
2022-01-12 11:27 ` [PULL 18/31] tests/docker: auto-generate alpine.docker with lcitool Alex Bennée
2022-01-12 11:27 ` Alex Bennée [this message]
2022-01-12 11:27 ` [PULL 20/31] tests/docker: add libfuse3 development headers Alex Bennée
2022-01-12 11:27 ` [PULL 21/31] hw/arm: add control knob to disable kaslr_seed via DTB Alex Bennée
2022-01-12 11:27 ` [PULL 22/31] monitor: move x-query-profile into accel/tcg to fix build Alex Bennée
2022-01-12 11:27 ` [PULL 23/31] docs/devel: update C standard to C11 Alex Bennée
2022-01-12 11:27 ` [PULL 24/31] docs/devel: more documentation on the use of suffixes Alex Bennée
2022-01-12 11:27 ` [PULL 25/31] linux-user/elfload: add extra logging for hole finding Alex Bennée
2022-01-12 11:27 ` [PULL 26/31] linux-user: don't adjust base of found hole Alex Bennée
2022-01-12 11:27 ` [PULL 27/31] tests/tcg/multiarch: Read fp flags before printf Alex Bennée
2022-01-12 11:27 ` [PULL 28/31] test/tcg/ppc64le: Add float reference files Alex Bennée
2022-01-12 11:27 ` [PULL 29/31] FreeBSD: Upgrade to 12.3 release Alex Bennée
2022-01-12 11:27 ` [PULL 30/31] docker: include bison in debian-tricore-cross Alex Bennée
2022-01-12 11:27 ` [PULL 31/31] linux-user: Remove the deprecated ppc64abi32 target Alex Bennée
2022-02-07  8:51   ` Thomas Huth
2022-02-07 10:20     ` Alex Bennée
2022-01-12 21:20 ` [PULL 00/31] testing/next and other misc fixes Peter Maydell
2022-01-13 10:13   ` Alex Bennée
2022-01-13 12:49     ` Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220112112722.3641051-20-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=eduardo@habkost.net \
    --cc=f4bug@amsat.org \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.