From patchwork Mon Jun 8 16:38:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 187592 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp5014670ilo; Mon, 8 Jun 2020 09:42:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCiuMXhf0UaTVu/v10c504lyHLKUAwP1cZbYwRY+/aCxt4ihuG79fzPXdhdSW0TQ8Ll0YR X-Received: by 2002:a25:694d:: with SMTP id e74mr16381837ybc.195.1591634578414; Mon, 08 Jun 2020 09:42:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591634578; cv=none; d=google.com; s=arc-20160816; b=oFTmMi0KIem27ICil70GytuQXISQyLmqB9FizB7Mf7PHWiuEUbEC/Cmi+t+NkxEs18 SSMboC1c0iokQhTqgVhFWbp8rDIdJlW6JXqFM3E83MFFtrfrwb0FMGW+mbn9fYAwcirs ZtmhviRNCVCaMkOZXUD1GxKbMbbaj/Gif5ba1wccQJVXTfCoqHM2VJzmbJDT/snQo23g aVZPMC/9QpnLzVS2c1HYkTkw63SlJtwYPMa4z+NE09ib2LnuwE9Z8YCMEaQ7ONxG+1lW zbuNvCxhJ4BrjLl4aohzCbmBZ0YB0glndKmCRkjyaJns65gykzCHiAzV3u6BVVOEU2TS YoWg== 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=SvhtS3OSMs98c1SpJ0qbWUOWyVxnfYR2isIDLvoIiso=; b=IEVv207uHxDOnixAn3MCsxF1/vFfGYvkMjel8DE4OpgXCekQJxZ+8ikn8P9fe+WS5s BwHsfGieMjdOVDGafHQtGb0gyJRnzo52W7v+3rktBtOKlxAPTswDmzFt6YHZMKmmcXSI +rUyRlMItzRHev0lvLAu4vhE0OryyEEOFl0AycPClBT73rkyrwZ6uX6PX7WtWpUNHMLF 7Tr72UgXp/04H/JGCQKZXkZ892NphB14BtE/wD+atQzb97Thjzc6ES7iWZAMBr8jB+bq j2ZR4felo9Oj6kh2IitlIQ3WjNiXyZsGfYNAgzLH5oL29MugxPQTbmld4MhOE5m15Mc1 QASA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Hst0ip2J; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i133si97752ybg.408.2020.06.08.09.42.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 09:42:58 -0700 (PDT) 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=@redhat.com header.s=mimecast20190719 header.b=Hst0ip2J; 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=redhat.com Received: from localhost ([::1]:44930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiKrR-0007LP-Ry for patch@linaro.org; Mon, 08 Jun 2020 12:42:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiKnT-0002j8-PC for qemu-devel@nongnu.org; Mon, 08 Jun 2020 12:38:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34106 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jiKnS-0005vC-Qt for qemu-devel@nongnu.org; Mon, 08 Jun 2020 12:38:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591634330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SvhtS3OSMs98c1SpJ0qbWUOWyVxnfYR2isIDLvoIiso=; b=Hst0ip2JHR8pDJcOg0h30Tfc4T15serMuyWvdnR2YGXLAS3RMkX2XBl9Yyn1tD+kOzIhMu G5/MoE/QUy66FEODJHF0xCNS305WM1FfeTDRkYDc/8Imf7HF2PDATjOH225/HnmaLLD7QI Gf9QzUvLQFiBkx9hCoSPfD30AIhWa4E= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-136-9qoWQVf5PFe3dqOwUJSkgg-1; Mon, 08 Jun 2020 12:38:46 -0400 X-MC-Unique: 9qoWQVf5PFe3dqOwUJSkgg-1 Received: by mail-wr1-f70.google.com with SMTP id o1so7339496wrm.17 for ; Mon, 08 Jun 2020 09:38:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SvhtS3OSMs98c1SpJ0qbWUOWyVxnfYR2isIDLvoIiso=; b=SKv9T8xVV0hmMTXSwWOR/GYgI8XJzSy1s64R1tb0uF93bXj6Q2hF7/KCMQ+ttIbUu1 ToZnqGlUJySDAOpfURlb5tTE1fM8ptjsXojRIuXFWPzHm3iItZe/bYCbjFxfIaMFTSx7 NjVerCuPxZxQ1vwd2pGkJhGo4+N9AiEtNCFD6RO4RbNpk+Z2iXq1/1OInB0cDa3IK8Ww ucf4APHUQrFhOGa9yREOowDj1YkJy/5aP/G9kBUSn94GVWVRqTcGIFypa76OVVHI0Fvk tjaBadwqwCRHBvIPa8XdkJ0EccnXIIlwE4vyPXCtLZNdVvhiX+hddlYapwkVCsWEFd7V dFrw== X-Gm-Message-State: AOAM532TgoNEYVGS+4sy/aTKSLfSc/lJjGGtQXdUbHjE+k1KzYGQEtAu quqjvmlAF3To+UNkQZAN1lLDOYE36bGArqTyjuzIF5ywQIxqAAmCjUmpN+UMtRHixJkzns+Tk0+ uuD0f4GxMjtgFMVw= X-Received: by 2002:a5d:4d0d:: with SMTP id z13mr26120371wrt.220.1591634325075; Mon, 08 Jun 2020 09:38:45 -0700 (PDT) X-Received: by 2002:a5d:4d0d:: with SMTP id z13mr26120354wrt.220.1591634324858; Mon, 08 Jun 2020 09:38:44 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id m129sm138261wmf.2.2020.06.08.09.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 09:38:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v8 04/10] configure: Generate rule to calculate the base architecture of a target Date: Mon, 8 Jun 2020 18:38:17 +0200 Message-Id: <20200608163823.8890-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200608163823.8890-1-philmd@redhat.com> References: <20200608163823.8890-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/08 01:05:50 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée As we encode the base architecture in configure.sh, we can emit the base-arch() function into config-host.mak. Signed-off-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé --- configure | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) -- 2.21.3 diff --git a/configure b/configure index 597e909b53..b48eb893f8 100755 --- a/configure +++ b/configure @@ -7756,6 +7756,8 @@ if test "$linux" = "yes" ; then fi fi +target_to_base_map="" + for target in $target_list; do target_dir="$target" config_target_mak=$target_dir/config-target.mak @@ -7984,6 +7986,7 @@ target_arch_name="$(upper $TARGET_ARCH)" echo "TARGET_$target_arch_name=y" >> $config_target_mak echo "TARGET_NAME=$target_name" >> $config_target_mak echo "TARGET_BASE_ARCH=$TARGET_BASE_ARCH" >> $config_target_mak +target_to_base_map="$target_dir,$TARGET_BASE_ARCH $target_to_base_map" if [ "$TARGET_ABI_DIR" = "" ]; then TARGET_ABI_DIR=$TARGET_ARCH fi @@ -8199,6 +8202,22 @@ if test "$ccache_cpp2" = "yes"; then echo "export CCACHE_CPP2=y" >> $config_host_mak fi +# Export a rule for calculating base arch from target_dir for use by +# the Kconfig generator +echo "# Usage: \$(call base-arch, target-dir)" >> $config_host_mak +echo "# Return the base architecture for a target." >> $config_host_mak +echo "# e.g \$(call base-arch, aarch64-linux-user) returns 'arm'" >> $config_host_mak +echo "base-arch = \$(strip \\" >> $config_host_mak +close_braces="" +for pairs in $target_to_base_map +do + dir="${pairs%%,*}" + base="${pairs#*,}" + echo "\$(if \$(findstring $dir,\$1),$base, \\" >> $config_host_mak + close_braces="$close_braces )" +done +echo "$close_braces )" >> $config_host_mak + # If we're using a separate build tree, set it up now. # DIRS are directories which we simply mkdir in the build tree; # LINKS are things to symlink back into the source tree From patchwork Mon Jun 8 16:38:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 281143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A123BC433E0 for ; Mon, 8 Jun 2020 16:47:57 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6BC41206A4 for ; Mon, 8 Jun 2020 16:47:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Y4RpTzCa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6BC41206A4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiKwG-0007Jv-JT for qemu-devel@archiver.kernel.org; Mon, 08 Jun 2020 12:47:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiKnp-0003NB-U1 for qemu-devel@nongnu.org; Mon, 08 Jun 2020 12:39:13 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:23105 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jiKnb-0005vy-SZ for qemu-devel@nongnu.org; Mon, 08 Jun 2020 12:39:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591634338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jgu4QABfITiikWyPyGwiSTC6XzxqUjphWSXX0h5vBwk=; b=Y4RpTzCaLiAliY8c7lM3PT+VVgc85Thy5ffL+Xcx1JznymVKRidv0hBNSAKuZEHyk6/buB OAFiSsYXEXrDHsnCbKqYuwH649ysVnCp1fCe09P49EFWNzt0C7sbyhLLgbJYH+60yw25ua UQOT3uAum8Pf9EJS5KunZzgE0kiLyz4= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-170-vSHgzQ7oOEKBnvDzShFIzg-1; Mon, 08 Jun 2020 12:38:51 -0400 X-MC-Unique: vSHgzQ7oOEKBnvDzShFIzg-1 Received: by mail-wr1-f69.google.com with SMTP id o1so7339595wrm.17 for ; Mon, 08 Jun 2020 09:38:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jgu4QABfITiikWyPyGwiSTC6XzxqUjphWSXX0h5vBwk=; b=J1+BIT3LetwPkGoWtdAwD3XMGyp1VWLbpaJI7zSO43QoAxzYHmnDesYuegrW4prmyt QA8xmzXbVV+QREQgQw8UcG0H7CvK8j9+LoOTQBa3c73nvooh9vz3yamBzteQo8WbQ4xZ t8vQhX9ov99fpftpBG83CRSzZqtJOBPxtzn9/IGHHnvzJmGLI0TxJUbOgHRUF1kM0PzU a6cXx/voP/s1sjEsaysazNSFun1Q5BJze6rp+Yp8qNCkl1HdKoL32uniaBwLhQ6kaEM2 RBjEBvT8+SrqOvU/oLp955gEo7UbWRxBRRkCBNQHtGtasGh8OMRI6s++qFtl+F7SZmaP Q81A== X-Gm-Message-State: AOAM533TBGr4gthSt4FM14ANrc1Or0RAFvSZmN32unBBFjlr+F3nB84q nno3vHnADUP6XD3JiArQ6ROb3XaIO1HpO6OJe2l+8KSpbjFFbRfhXOpvBH6p92CmAAL9yJyh6Nr Oq8JQFHaiT0jmWh8= X-Received: by 2002:a05:6000:1289:: with SMTP id f9mr24902617wrx.5.1591634329792; Mon, 08 Jun 2020 09:38:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwAzod7d1mzuyx5ToUWeqie2VPdM6tsEMhrMcZihH6HiD9B+z0SaW9Ph3g8LSoEfx1ZMi4JpA== X-Received: by 2002:a05:6000:1289:: with SMTP id f9mr24902594wrx.5.1591634329594; Mon, 08 Jun 2020 09:38:49 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id f9sm276472wrf.74.2020.06.08.09.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 09:38:49 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v8 05/10] Makefile: Remove dangerous EOL trailing backslash Date: Mon, 8 Jun 2020 18:38:18 +0200 Message-Id: <20200608163823.8890-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200608163823.8890-1-philmd@redhat.com> References: <20200608163823.8890-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/08 11:58:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alistair Francis , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" One might get caught trying to understand unexpected Makefile behavior. Trailing backslash can help to split very long lines, but are rather dangerous when nothing follow. Preserve other developers debugging time by removing this one. Reviewed-by: Thomas Huth Reviewed-by: Alistair Francis Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d1af126ea1..52956b16fd 100644 --- a/Makefile +++ b/Makefile @@ -420,7 +420,7 @@ MINIKCONF_ARGS = \ MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig MINIKCONF_DEPS = $(MINIKCONF_INPUTS) $(wildcard $(SRC_PATH)/hw/*/Kconfig) -MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \ +MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py $(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_DEPS) $(BUILD_DIR)/config-host.mak $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN", "$@.tmp") From patchwork Mon Jun 8 16:38:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 281145 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 281C3C433DF for ; Mon, 8 Jun 2020 16:44:59 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id E5F16207ED for ; Mon, 8 Jun 2020 16:44:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cqX7oiLf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E5F16207ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiKtN-0003kz-VD for qemu-devel@archiver.kernel.org; Mon, 08 Jun 2020 12:44:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiKnk-0003Bk-7D for qemu-devel@nongnu.org; Mon, 08 Jun 2020 12:39:08 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:60000 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jiKni-0005wH-NN for qemu-devel@nongnu.org; Mon, 08 Jun 2020 12:39:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591634346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5dEfl0cwLuEiH62YNh1V8hVTBkXM5xTWihadVnr7vN0=; b=cqX7oiLf3GInEmnA9S/uCnrR6UlwzgfwIpVIz0KnlMS4ur5Vp+LEusv9nFCitmQCjKuEOz tKTyJ4QdgPMsO3Vb/zkl+x+xdzLUoDll93CDrS0NiMhsbbt2EOOdcBy2Wnla0VxZ6atxjA //R/9VhbS1JEoLG5sDXmtxo0POIirtw= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-496-G4KlJOCwN4CSBMRUW2CjLw-1; Mon, 08 Jun 2020 12:39:00 -0400 X-MC-Unique: G4KlJOCwN4CSBMRUW2CjLw-1 Received: by mail-wr1-f72.google.com with SMTP id l1so7375074wrc.8 for ; Mon, 08 Jun 2020 09:39:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5dEfl0cwLuEiH62YNh1V8hVTBkXM5xTWihadVnr7vN0=; b=YOGazUnezXqIoOiHzAD2Bp/VPOKQTjFYlMTCCJYlFPrf0Urix1EoSRfqFndySQx9sf /TjWH1+geJAMUCvGn7ExREQJ75lgEJxTvilJRAFisIEXB6SJaCbHXn6B0Wqu9f4Fr753 BeccRjClccXjgR0v3GiI3GyVxy10WgDrP1flEFB+OXeGPd+JzPN/GNi47awRBxcszyij IdE9xIbE3jditEGimY/jC436DEOKLAzvWEAL/ALAMGxUnxD7jSYzJOlWsLKEm6CrZEOi 4hLn5Tp21TBcZIyvNDxXQFuRrSGwkLsIWNIlwZBvIEa3Q+PRARFTlxpgR2CZHmbe7Y4V vEjA== X-Gm-Message-State: AOAM532ODMtEeFY9MqQTP8z3q03uq3pkYL1HPyVQOJaOE2tKVCGerM3m QPl6kSnUIRfwk26dUCHFGHOxAJpML9yUrNVsQ8ZwKNKAJEzG3L99Ho26e2NFDHgxF6a3HsKX1pK YFW8rrXICDkMvlhE= X-Received: by 2002:a1c:b445:: with SMTP id d66mr185897wmf.29.1591634339152; Mon, 08 Jun 2020 09:38:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy//InSCXtGK5GS1f/6niy1pf1RgUssZQ6qSjPq49G3XyYUh5e5mwn/SqGrWO2z8x5rCyzkKg== X-Received: by 2002:a1c:b445:: with SMTP id d66mr185885wmf.29.1591634338971; Mon, 08 Jun 2020 09:38:58 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id i8sm291463wru.30.2020.06.08.09.38.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 09:38:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v8 07/10] accel/Kconfig: Extract accel selectors into their own config Date: Mon, 8 Jun 2020 18:38:20 +0200 Message-Id: <20200608163823.8890-8-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200608163823.8890-1-philmd@redhat.com> References: <20200608163823.8890-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/08 01:05:50 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Move the accel selectors from the global Kconfig.host to their own Kconfig file. Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé --- Makefile | 1 + Kconfig.host | 7 ------- accel/Kconfig | 6 ++++++ 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 accel/Kconfig diff --git a/Makefile b/Makefile index 93903e94b1..7c055a9e32 100644 --- a/Makefile +++ b/Makefile @@ -419,6 +419,7 @@ MINIKCONF_ARGS = \ CONFIG_PVRDMA=$(CONFIG_PVRDMA) MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host \ + $(SRC_PATH)/accel/Kconfig \ $(SRC_PATH)/hw/Kconfig MINIKCONF_DEPS = $(MINIKCONF_INPUTS) \ $(wildcard $(SRC_PATH)/hw/*/Kconfig) diff --git a/Kconfig.host b/Kconfig.host index 55136e037d..a6d871c399 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -2,9 +2,6 @@ # down to Kconfig. See also MINIKCONF_ARGS in the Makefile: # these two need to be kept in sync. -config KVM - bool - config LINUX bool @@ -31,10 +28,6 @@ config VHOST_KERNEL bool select VHOST -config XEN - bool - select FSDEV_9P if VIRTFS - config VIRTFS bool diff --git a/accel/Kconfig b/accel/Kconfig new file mode 100644 index 0000000000..c21802bb49 --- /dev/null +++ b/accel/Kconfig @@ -0,0 +1,6 @@ +config KVM + bool + +config XEN + bool + select FSDEV_9P if VIRTFS From patchwork Mon Jun 8 16:38:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 281144 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C888C433E0 for ; Mon, 8 Jun 2020 16:45:17 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5748E204EF for ; Mon, 8 Jun 2020 16:45:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="glE71eTa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5748E204EF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiKtg-0004E7-Hf for qemu-devel@archiver.kernel.org; Mon, 08 Jun 2020 12:45:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiKny-0003es-7r for qemu-devel@nongnu.org; Mon, 08 Jun 2020 12:39:22 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34490 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jiKnx-000668-9a for qemu-devel@nongnu.org; Mon, 08 Jun 2020 12:39:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591634360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LZewXF1iU0hhE4zzyWMCauxBy0zDRARovOReABXzSsI=; b=glE71eTaJ5qvbc53yHTWonMx46/hVw0dsKQXdl1pBrtJ88+8xY4Hn7md1KKEIFVWn1k02q gRRbim3yXe6AFHXFA68yLTsvvmQ++7I3yGC3K83kpxEi1gEZe7XldLhTS/mcyBgJsU9nQW FBOHPZw8YclZC+I/VWF9ocLFCMqX1Bw= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-388-3b9GCuffOiGLLU5qEFUejA-1; Mon, 08 Jun 2020 12:39:14 -0400 X-MC-Unique: 3b9GCuffOiGLLU5qEFUejA-1 Received: by mail-wm1-f70.google.com with SMTP id k185so24587wme.8 for ; Mon, 08 Jun 2020 09:39:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LZewXF1iU0hhE4zzyWMCauxBy0zDRARovOReABXzSsI=; b=c7tZ0pfPNLrwdCZhP6r1n62bdIj/56kPrJiY8tW92QgYevBDUSY8DhUC4GEjgNsBvC b38LNtHCtG9Zn/2ERV+Epv+TpfizjHiJeBunwJ+jVmRiU460PENtxp/NnHzgJH9cpZEs jAOsP4gDT6zyP+L1RPpd7EtaPwHOpqI4UBqQfbHoHC6s3F6ungcq/NmvjjTgDbhIB5S7 AzgHjdZ7JIPBKGUGd1XRYRuwZVNa0isfJRrGhqXrnsZSpt3flc1wvfr530v+HDGJFnzF m7nc+x3ks2ShWK8a3PQbITfUy5onpK841BGr9GenMHn2pe/GlzvCsdFAgY+RyfXXGatT iEgw== X-Gm-Message-State: AOAM532R8qiF+E8kk2aGkx0ONF2Dq8CH2LwXR4wvMzf8aBfGg539FoSz GY9t/J6d7sX7dWUPsd+Ti2S5Kcl3n1TgF9WlsrN/eDE47HR9PhI4wNXPJtxcYZoxcQbLBKBMynd BE4rYYfzh3cfFfLQ= X-Received: by 2002:a1c:f003:: with SMTP id a3mr174347wmb.119.1591634352846; Mon, 08 Jun 2020 09:39:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbG1h6iWbcMBRhnrPmAzYSd8xD4FLurVE0tLUFzGMSiTZrT8R05kLYa2YmKvk30sVb6EBHxQ== X-Received: by 2002:a1c:f003:: with SMTP id a3mr174333wmb.119.1591634352686; Mon, 08 Jun 2020 09:39:12 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id s8sm250494wrm.96.2020.06.08.09.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 09:39:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v8 10/10] accel/tcg: Add stub for probe_access() Date: Mon, 8 Jun 2020 18:38:23 +0200 Message-Id: <20200608163823.8890-11-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200608163823.8890-1-philmd@redhat.com> References: <20200608163823.8890-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/08 01:05:50 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The TCG helpers where added in b92e5a22ec3 in softmmu_template.h. probe_write() was added in there in 3b4afc9e75a to be moved out to accel/tcg/cputlb.c in 3b08f0a9254, and was later refactored as probe_access() in c25c283df0f. Since it is a TCG specific helper, add a stub to avoid failures when building without TCG, such: target/arm/helper.o: In function `probe_read': include/exec/exec-all.h:362: undefined reference to `probe_access' Reviewed-by: Richard Henderson Reviewed-by: David Hildenbrand Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé --- accel/stubs/tcg-stub.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/accel/stubs/tcg-stub.c b/accel/stubs/tcg-stub.c index 677191a69c..e4bbf997aa 100644 --- a/accel/stubs/tcg-stub.c +++ b/accel/stubs/tcg-stub.c @@ -22,3 +22,10 @@ void tb_flush(CPUState *cpu) void tlb_set_dirty(CPUState *cpu, target_ulong vaddr) { } + +void *probe_access(CPUArchState *env, target_ulong addr, int size, + MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) +{ + /* Handled by hardware accelerator. */ + g_assert_not_reached(); +}