From patchwork Wed Jan 5 13:49:54 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: 530160 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp321244imp; Wed, 5 Jan 2022 06:21:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJx8OF9iPMSVvCDLxaGS2nCNZfu/+RDcP+ndu1FyzU44FqilJBVjL9NWXBF8sknDjYpzACwV X-Received: by 2002:a25:ba05:: with SMTP id t5mr70049993ybg.675.1641392497314; Wed, 05 Jan 2022 06:21:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641392497; cv=none; d=google.com; s=arc-20160816; b=kcAOSbPaMXBwY0CW2r7igcT39YbwTCXZeIJlg1zmVxFaCXY6UUfiz7IekvUjLAjunB M+JBaCstGKbFKeS1rv0Vc0cBfsDa0Aim9/FTwfYFh4KPhmAPAPsDyuCiNfSibFh79KK7 M0z4h2+XryzKwcBC9xL3louwkB2UMvsS3bn19a4C+hTTba5rTigZAwOvjTQCkIY8VHcy BafALkI72gvWiWgXMPBsnnzl7PObCxvjZp3MB+36tUZQOX1SroiMTI6TRcw2N8I387+H 0KtLaBe78mdDcg58F87GepsIfM3PqHtS26/r3j19NxzHKCuE2lWip7/9Vv4wTbeW4Yv7 K8og== 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=Iiin0F2gdfBP+3WieOeIIXXC77W4Mh2yUAoi+dYEGGw=; b=VVy0f0t5TXGbaIAohZCRNRE9aTQuIocGNkf3oCrT6VKlWsMAuBfsSK0cMe63UJyrh6 44vlLDM4ri2UNz3r59YPS1mp7nysTouLI4Y5WXatuibP6EhHMocY+Stp5FArs30C6fOC Lkk2wH03/a8w+54LjaeQkAJ7yHIVNuaMVQUnTIVYq7Yk4qvON57vHxByEVCIIEGtnrp9 QV9l3HTxqEHJ50PWzy5s3RgRuMHaAE2XqpZE3IfkfvX4NIZePvmNtGpdxgvzPpJ7hr7a OZo7VkVBR7/jOOfSFth1ZnssMdDzcSL1hyLHIFpVBZFctWjPGnWULP4pPNi270or92iE KqUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qjht3w1s; 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 o5si20971894yba.455.2022.01.05.06.21.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 05 Jan 2022 06:21:37 -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=qjht3w1s; 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]:44430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n57AW-0007tB-19 for patch@linaro.org; Wed, 05 Jan 2022 09:21:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n56gS-0008Cu-OI for qemu-devel@nongnu.org; Wed, 05 Jan 2022 08:50:32 -0500 Received: from [2a00:1450:4864:20::531] (port=35481 helo=mail-ed1-x531.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n56gP-0004FI-Sv for qemu-devel@nongnu.org; Wed, 05 Jan 2022 08:50:31 -0500 Received: by mail-ed1-x531.google.com with SMTP id y22so162352652edq.2 for ; Wed, 05 Jan 2022 05:50:29 -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=Iiin0F2gdfBP+3WieOeIIXXC77W4Mh2yUAoi+dYEGGw=; b=qjht3w1s2kv79ei66y44BxuVvN3NTRh29BHV4IJAscJv7BCqeQOkr2Vsw5vag266MH VBSh6W59qtELXZ4pDFaXfBOqfh5Bhwu7msfsTm/eAuWi8zlQkGaygsVPhvEek6FYJdNq KryIqsgc7h/vYHjAdOYtMYME3jLrbyGQqk0nrDyTbQ7tSCbR8AVYN6iaBwNy4Byi5cvW H35VrT4H2VZnm0WevXmjLrn0H2WGLNvRh9wnpMrUjxKBZKLXTeP+rRKri11MhmwRzdZo YmBArQOUxi8WNUyo095EzKTR3MFVLq2G32eVkkwg7z8CkefSgDWpgOgqKdQy+Av/LdxK AKDQ== 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=Iiin0F2gdfBP+3WieOeIIXXC77W4Mh2yUAoi+dYEGGw=; b=zsg6gbW+rTlVBUZvUdT0EoXvNAqP8dnJ3IqlVM/zK9eiT4JVVjRFcme/rAvu/sqmjP t/svfwMEyPzTkmn9rZgYBQgrkILVtMv88+vmTS59AxrxtecBIoFkSwKuHEvcmYejCpZT 6azvoAPPV2mQrAq+vBSV8NDUQEm+/4b/Z9M/a1oZ71YHDS4CeQqUNUkwLV04lR24ENg5 YOXgXD7w5XSKECvNo0qsSO4JkBCcDvcUBoSetcHiacs0yTSgJe1yN2/mZR4UA0qUHBK2 9y8v8GXR/7h93gVA7xINKZPEn+dHLfUIXCVzLrB5RQ9D3a3347roRNm1uOMJz/Ep9iZn oSag== X-Gm-Message-State: AOAM532KIDBiDOxUzbzsLh+Z9BBiWFJCqsS6g07oTO4mOpUiLuiodsuL wR8KAqJoaspWbj5N2LeEDffYJ5qErFYv7A== X-Received: by 2002:a05:6402:5214:: with SMTP id s20mr38156886edd.13.1641390628618; Wed, 05 Jan 2022 05:50:28 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 16sm12228174ejz.34.2022.01.05.05.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jan 2022 05:50:26 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CBC081FFCB; Wed, 5 Jan 2022 13:50:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 19/34] tests/tcg: use CONFIG_LINUX_USER, not CONFIG_LINUX Date: Wed, 5 Jan 2022 13:49:54 +0000 Message-Id: <20220105135009.1584676-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220105135009.1584676-1-alex.bennee@linaro.org> References: <20220105135009.1584676-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::531 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x531.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: fam@euphon.net, Eduardo Habkost , berrange@redhat.com, Richard Henderson , f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net 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é Reviewed-by: Warner Losh --- 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=$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