From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C065DC433F5 for ; Sun, 16 Jan 2022 23:23:32 +0000 (UTC) Received: from localhost ([::1]:56920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9Erz-0005qj-J8 for qemu-devel@archiver.kernel.org; Sun, 16 Jan 2022 18:23:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9Eqv-0004dK-Gq for qemu-devel@nongnu.org; Sun, 16 Jan 2022 18:22:25 -0500 Received: from [2607:f8b0:4864:20::a2b] (port=37762 helo=mail-vk1-xa2b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n9Eqt-0001yb-2c for qemu-devel@nongnu.org; Sun, 16 Jan 2022 18:22:25 -0500 Received: by mail-vk1-xa2b.google.com with SMTP id v192so6336016vkv.4 for ; Sun, 16 Jan 2022 15:22:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=0WTnLBAuRe5d1gEYVEZbpxu8iG3wvzlmiNcZ2ywr7XA=; b=mefF1aV7B6+xIJuiplRYDLGHVgzDMbWZff8Ir+Q/wk3zn/ehk1xfRNGzKVKHjJXMu6 GLV4Z2lC8KtU4AdQCgmG75BNG1r6mzHXB6Tv68rT6X9TbLhok5hVc/qtI4vx8mkcQ45x U2kg/5m2yEv14lkB7q6rDGZwlpa1eijKZv2Q1p5k5rhplJDvY4yTBNYOAoz0ZMvYeAaS RvlLpauX1hPp0rg38XFsjZVvYE81ePd4ug63VivpXcPO16sNtRwNZQ5dljlOZcc6XNNV QawOYXdjZNo4sO8r8ZNkJQbxre3neP0KAlDOagJJQQqhV4aP7bgV5Hyna94PheE1nUzH 9TJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=0WTnLBAuRe5d1gEYVEZbpxu8iG3wvzlmiNcZ2ywr7XA=; b=eJqI1UXKbRXgBA97WM/iNdMcqd5TwlMZeJ5WZBWW6jE/baYCcO32duEeG2WBXeXWds GM+i3tGa+mIhjMWDiQzQplX0CQYBTvSOYFkAf9F7W9UYdTHtbhB4e/k9cxB3dbYHt7tY vWjasUsqrcU6UH8ylsDDuDk5zmp17xlhDI39oiy/5XsGGGkTdRG2eCHSo0qHXpwqVya3 sC6N1UtEKNUmOh+vjMFoH5mI5gMYuzOHhNlzvD17rulWfcksR7tLwD57+87az5CXigmD 1dNtCnAucs2r3Ek3Putd54kRO6UdUdqFWu7AIad92QrOtkPXJJS5vfRu33hQuVrhLrv0 J1sA== X-Gm-Message-State: AOAM531Njsrd8Uod+31kEai07c5JsHoK5HVZBG+C9Uo1eGfZAUhhrHG2 R+Eb/EOTHEgjqYN65H3FMwOzcbb3VXjbGSLeXRZAFQ== X-Google-Smtp-Source: ABdhPJxQWCMV5HXgGeSbBOo50orThx1UKnlyFiTrE1kCLgLhZHb3ACSUu2HDscnHUSK02cY8TZLh34ZVaJD798VP96I= X-Received: by 2002:a1f:f287:: with SMTP id q129mr7454634vkh.40.1642375341602; Sun, 16 Jan 2022 15:22:21 -0800 (PST) MIME-Version: 1.0 References: <20220105135009.1584676-1-alex.bennee@linaro.org> <20220105135009.1584676-20-alex.bennee@linaro.org> <33137c92-576f-3ee1-d4b5-2673c09f4ef3@amsat.org> In-Reply-To: <33137c92-576f-3ee1-d4b5-2673c09f4ef3@amsat.org> From: Warner Losh Date: Sun, 16 Jan 2022 16:22:10 -0700 Message-ID: Subject: Re: [PATCH v1 19/34] tests/tcg: use CONFIG_LINUX_USER, not CONFIG_LINUX To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: multipart/alternative; boundary="000000000000d3102f05d5bb4e55" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::a2b (failed) Received-SPF: none client-ip=2607:f8b0:4864:20::a2b; envelope-from=wlosh@bsdimp.com; helo=mail-vk1-xa2b.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , "Daniel P. Berrange" , Richard Henderson , QEMU Developers , Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini , =?UTF-8?B?QWxleCBCZW5uw6ll?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000d3102f05d5bb4e55 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Jan 10, 2022 at 2:58 AM Philippe Mathieu-Daud=C3=A9 wrote: > +Warner > > On 1/5/22 14:49, Alex Benn=C3=A9e wrote: > > From: Paolo Bonzini > > > > The two more or less overlap, because CONFIG_LINUX is a requirement for > Linux > > user-mode emulation. However, CONFIG_LINUX is technically a host symbo= l > > 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 > > Signed-off-by: Alex Benn=C3=A9e > > 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=3D$arch" >> $config_target_mak > > echo "target=3D$target" >> $config_target_mak > > case $target in > > - *-linux-user | *-bsd-user) > > + *-linux-user) > > echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak > > + echo "CONFIG_LINUX_USER=3Dy" >> $config_target_mak > > + echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak > > + ;; > > + *-bsd-user) > > + echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak > > + echo "CONFIG_BSD_USER=3Dy" >> $config_target_mak > > echo "QEMU=3D$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=3D$(SRC_PATH)/tests/tcg/multiarch > > # Set search path for all sources > > VPATH +=3D $(MULTIARCH_SRC) > > MULTIARCH_SRCS =3D $(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) > > -ifneq ($(CONFIG_LINUX),) > > +ifneq ($(CONFIG_LINUX_USER),) > > VPATH +=3D $(MULTIARCH_SRC)/linux > > MULTIARCH_SRCS +=3D $(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 +=3D vsyscall > > TESTS=3D$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64 > > else > > Reviewed-by: Philippe Mathieu-Daud=C3=A9 > Reviewed-by: Warner Losh --000000000000d3102f05d5bb4e55 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Jan 10, 2022 at 2:58 AM Phili= ppe Mathieu-Daud=C3=A9 <f4bug@amsat.o= rg> wrote:
pbonzini@redhat.com>
>
> The two more or less overlap, because CONFIG_LINUX is a requirement fo= r Linux
> user-mode emulation.=C2=A0 However, CONFIG_LINUX is technically a host= symbol
> that applies even to system emulation.=C2=A0 Defining CONFIG_LINUX_USE= R, and
> CONFIG_BSD_USER for eventual future use, is cleaner.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Alex Benn=C3=A9e <alex.bennee@linaro.org>
> Message-Id: <20211210084836.25202-1-pbonzini@redhat.com>= ;
> ---
>=C2=A0 tests/tcg/configure.sh=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 | 8 +++++++-
>=C2=A0 tests/tcg/multiarch/Makefile.target | 2 +-
>=C2=A0 tests/tcg/x86_64/Makefile.target=C2=A0 =C2=A0 | 2 +-
>=C2=A0 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
>=C2=A0 =C2=A0 echo "TARGET_NAME=3D$arch" >> $config_tar= get_mak
>=C2=A0 =C2=A0 echo "target=3D$target" >> $config_target= _mak
>=C2=A0 =C2=A0 case $target in
> -=C2=A0 =C2=A0 *-linux-user | *-bsd-user)
> +=C2=A0 =C2=A0 *-linux-user)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 echo "CONFIG_USER_ONLY=3Dy" >&= gt; $config_target_mak
> +=C2=A0 =C2=A0 =C2=A0 echo "CONFIG_LINUX_USER=3Dy" >> = $config_target_mak
> +=C2=A0 =C2=A0 =C2=A0 echo "QEMU=3D$PWD/qemu-$arch" >>= $config_target_mak
> +=C2=A0 =C2=A0 =C2=A0 ;;
> +=C2=A0 =C2=A0 *-bsd-user)
> +=C2=A0 =C2=A0 =C2=A0 echo "CONFIG_USER_ONLY=3Dy" >> $= config_target_mak
> +=C2=A0 =C2=A0 =C2=A0 echo "CONFIG_BSD_USER=3Dy" >> $c= onfig_target_mak
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 echo "QEMU=3D$PWD/qemu-$arch" >= ;> $config_target_mak
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ;;
>=C2=A0 =C2=A0 =C2=A0 *-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=3D$(SRC_PATH)/tests/tcg/multiarch
>=C2=A0 # Set search path for all sources
>=C2=A0 VPATH=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0+=3D= $(MULTIARCH_SRC)
>=C2=A0 MULTIARCH_SRCS =3D=C2=A0 $(notdir $(wildcard $(MULTIARCH_SRC)/*.= c))
> -ifneq ($(CONFIG_LINUX),)
> +ifneq ($(CONFIG_LINUX_USER),)
>=C2=A0 VPATH=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0+=3D= $(MULTIARCH_SRC)/linux
>=C2=A0 MULTIARCH_SRCS +=3D $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*= .c))
>=C2=A0 endif
> diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makef= ile.target
> index d7a7385583..4a8a464c57 100644
> --- a/tests/tcg/x86_64/Makefile.target
> +++ b/tests/tcg/x86_64/Makefile.target
> @@ -8,7 +8,7 @@
>=C2=A0
>=C2=A0 include $(SRC_PATH)/tests/tcg/i386/Makefile.target
>=C2=A0
> -ifneq ($(CONFIG_LINUX),)
> +ifneq ($(CONFIG_LINUX_USER),)
>=C2=A0 X86_64_TESTS +=3D vsyscall
>=C2=A0 TESTS=3D$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64
>=C2=A0 else

Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>

Reviewed-by: Warner Losh <imp@= bsdimp.com>=C2=A0
--000000000000d3102f05d5bb4e55--