From patchwork Wed Jan 12 11:27:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 531586 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp4320982imp; Wed, 12 Jan 2022 04:06:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBRXasNzZ130Q0hN6sW5g1q/jP64FzCjdKXHE1mn2AjeqmYyl5BSa/7pRvo6uBa6VBMuAQ X-Received: by 2002:a05:6602:25d4:: with SMTP id d20mr4451483iop.72.1641989180429; Wed, 12 Jan 2022 04:06:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641989180; cv=none; d=google.com; s=arc-20160816; b=PhcXUQVqRsNkDOEi0BobvDKWVXqbVaU4AXzbVIZH1d466fIblYPQS3r1qqVlP+FHyO gwYV8MpcG/t0Pinfwa1e9y+ZiVotgHvcV3dOD1vtpeZAAvWTBUn/7UwSzaLbRB8Abi2R 0Jky6i1fihsICfbR8hloJyvL22IQ0KSdiXc3AjhzG8HR0QxlGajeB+8pJjy2VXFIAseR NzpnourrcvsNUAytikKV7o7XEHdNEAgY/C7rOdfCQ2Yw2cZHSoqwRpP3rkCbYggQm7Iw +lOzx5dN0xfTlgor99aAiWX06/d2o8GV9QAfC1/yQ4AeXIz1VL9Sna5SqoB31inY7hIz CP3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=8Dofen9yGQk4H2fZxtbFrTLfDJ0qI4JPBaMuVHuukOA=; b=ozRrGVwJX+AmM/pzyYdLR014RBGASv/FQ1GeN+TI8FLiNINxZWmb5PMw8GNznUa+uN WPTPUfKQ25IbyX4BKAlWDvu2Nx+zyA20FmL3wCe8z2p+qTXpHiowQcBiBXwaz+MH4QSB x+LwpvM20HESyvY05cde7oHR5DqgA689Rzf5bJ6ZIUAQbNSt0Nk2+qvB2K9BjgtRQlRu O/+T3JKE2xsml5jPMvGWUCn8GHcnXksK/6L/Rz4rrwZSzPwCFWPekxdeImYJAeS2SIeE S+CwtHghmARw58zJWW1Wgh9huOCw2X8sg/E+yq42e6simGnhx9PMPY2LFSPZuiCsjPT7 pz4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GMJFcD0p; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w1si4814468iou.40.2022.01.12.04.06.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Jan 2022 04:06:20 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GMJFcD0p; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7cOR-0005IX-SV for patch@linaro.org; Wed, 12 Jan 2022 07:06:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7bvU-0007e6-Ht for qemu-devel@nongnu.org; Wed, 12 Jan 2022 06:36:25 -0500 Received: from [2a00:1450:4864:20::52d] (port=33754 helo=mail-ed1-x52d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7bvS-0004kV-UE for qemu-devel@nongnu.org; Wed, 12 Jan 2022 06:36:24 -0500 Received: by mail-ed1-x52d.google.com with SMTP id b13so8954549edn.0 for ; Wed, 12 Jan 2022 03:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8Dofen9yGQk4H2fZxtbFrTLfDJ0qI4JPBaMuVHuukOA=; b=GMJFcD0pOA8Soihk5pTff67Rr/Ibm4wVUCc1+oIOEvDeYKYl5GHolHturjhBVDHdeU YOZAtZwM1bIgtOIX9afgZr8jSqeaHefk0BgdeulgjQNGjJKkM+is1JnWWDo53bbO0Idp THZmYQuLMKmqDzrw7lFgrXAcHJO0quhbrwXCoinksZiDN/vxJc5ywEhdf7Q/mNJOUcUm n3SzATertEHHH8IVqn/lTWg+Ern7j/KM+p3/eXtI+wZymMOudjq5XYlRw+rb3UTDP61U IFxIrYEIzFapXb6SaJV9/h6bR5pVOgaX5FT14cYaeRtB3f25MGlvbSyzTuafZBRYwcy5 2t9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Dofen9yGQk4H2fZxtbFrTLfDJ0qI4JPBaMuVHuukOA=; b=4J0PFsrf2Mh8LCio/P/8+Qaiq2RqSdxYSrI6ACOVVc2ocDKkKUzrJwL3bbar5Y7I+T 6QBenC4PukxQB3xnkzjmOAxlQBmYryzxCkCu/btJN23bDgny6GAf0P/6+VAmCZfFFUmZ 6XkSYY+TQBVSr/XXc7RF01qULfWZUjxVfVdxUM50nwhf4E/0X2yPtSrDZue8jbgpcQcE bpeeOzZyLdvakoQjahPIGbzOb1FmcynhmywwxPZy8leG1SFlMZb2yBrpXYVjqEKyrBxD Lv6TSAHR8KEB4T6dNY3XaAfdYnJmAUTRL2Y0jfpBPszoj/RApVVbRjIrWndd6Eu24lCe UMLA== X-Gm-Message-State: AOAM5314CI44PvEl37KgELhUBVk1EugKV6P6io5QMWvL6HUWEXS+fpEW g91B20GBtkqIvNB+XTFpawaaHg== X-Received: by 2002:aa7:dc53:: with SMTP id g19mr8526761edu.294.1641987381614; Wed, 12 Jan 2022 03:36:21 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 4sm4382351ejc.168.2022.01.12.03.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 03:36:16 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F35A41FFCB; Wed, 12 Jan 2022 11:27:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 19/31] tests/tcg: use CONFIG_LINUX_USER, not CONFIG_LINUX Date: Wed, 12 Jan 2022 11:27:10 +0000 Message-Id: <20220112112722.3641051-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220112112722.3641051-1-alex.bennee@linaro.org> References: <20220112112722.3641051-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52d.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-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: Eduardo Habkost , Richard Henderson , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 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 Signed-off-by: Alex Bennée Message-Id: <20211210084836.25202-1-pbonzini@redhat.com> Reviewed-by: Philippe Mathieu-Daudé 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