From patchwork Wed Jun 7 15:40:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 690186 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp383403wru; Wed, 7 Jun 2023 08:41:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7paRwY0JJniyEfsooWxTfK7epyfCNx43c0FiOcHFmckLBXJHN9neSzhKwOfTiQBmGedSVr X-Received: by 2002:a05:620a:290d:b0:75b:23a1:d847 with SMTP id m13-20020a05620a290d00b0075b23a1d847mr2972457qkp.9.1686152494922; Wed, 07 Jun 2023 08:41:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686152494; cv=none; d=google.com; s=arc-20160816; b=le0VHRSZ3LkPquQ3h59MSfmUWqvsYG+XVSdFJJIvhpD5v1xJpo9zea6fUgf0Tiz0zi hCDEN3I/lCijkgQ/GVzEDdWWLlJT+wz7ZSlf2EGaU8mdS4ccaZzv1Mh2IPiZByw2UUIx Xtf9K6WBjx+VLdSBrqigdaqvB+o3ZEEkCY+K29IosckktuRbb8+9gtGRMfhMU5fY4v4X KQgv8vkEq6EYWIlPLzgQcWR5YGHrv1vsGj16UKex68yTMwUnS35W09BHHPEH9UqH13JD Yv8/OwX15cpjV/gdn2QrdTmIWsWTtiNAl42xlNBMF/Vz5GgyNT5druS/z/cGiW53t07h yJBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=+ZZ7g1EQ57AiF5AHjTiAcP696FM9VhkE/s4SqVobKrY=; b=rETyRIlSagCtgK/45k4CeKvALG0OwV2cSnX6EoeTcKOrodbHVfk8o05lWWU54PCvH7 f3r0FdyWXSq/EK9X1dV+a4wsH5FpBPtSDtPiK5QfRNoiOwGm7flA2zFbPAFhqdy792bE fs9EplFcXYHylEB49g9hHkMikRRjIyWGWU6QheJNY3agv8DP7cRShctox6F/ZyuXgOW1 TksV458zEZzVAEj1IbNuxZP284nSIgGDTxvKnt5srG0AFmzgvVfcqXTYMkn2m1eGp2mG /VNAK6+smxDOX1oHACbGH4uaPSHyGpDShNSS55J+4Qo0YGz6jywwPMPqbfZ/vXlwMUAF Wd6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oxhAaeg+; 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=pass (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 x20-20020a05620a14b400b0075dabfdefa4si4673098qkj.380.2023.06.07.08.41.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Jun 2023 08:41:34 -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=pass header.i=@linaro.org header.s=google header.b=oxhAaeg+; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6vHS-0001Wd-Rx; Wed, 07 Jun 2023 11:41:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6vHR-0001WI-E2 for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:41:01 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6vHP-0001zb-Rg for qemu-devel@nongnu.org; Wed, 07 Jun 2023 11:41:01 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2564dc37c3eso585050a91.0 for ; Wed, 07 Jun 2023 08:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686152458; x=1688744458; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+ZZ7g1EQ57AiF5AHjTiAcP696FM9VhkE/s4SqVobKrY=; b=oxhAaeg+UEn9MZztaWoV1zcFpw0aA2ISAps6Ue/xze2ELtIDXNTE2ZpyuJiKNjtK2Z sYdFGI6TIM0Yl3+fIgdtcXleEvsf7UqmwlZtbIEwErB5xz5Mtb/mycjjeg3H+s+f0hYi PZW3w7ymTYZrI5QLPIw/fzWd8R6FIh6zs0c2aIRUUweMNSwcMjMJNUCzZqucpFR7CLMc WcXvA9derWcNDEM/GI/mcmrlQP8is6ImelQfN3L8KbHI2I8UFaaKPQdfKOuzWXfn3/GW cg/XdcHfbdvfE8woatZv5sFZtWUOTl96lut0eKUFdsQ86haiPBVaqDzBZ50UJs8xz8ef pp3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686152458; x=1688744458; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+ZZ7g1EQ57AiF5AHjTiAcP696FM9VhkE/s4SqVobKrY=; b=RCW11BFUcXaShV0Dd00vXH1kgtUyzSz6xtgKmh7VXtoUMMRtFTL9WkhmEt5LDbSuYX UOGatS02KrqVEn/0e/3KxFfjRsphN9VZPnBJAShxL2+tAUB6gho+ksgZ3VNEzSEE/GcK 6tG3qhRAjDCfeN4raEKPxrkOCGYtpR4ZtYy1W9AxXyQGyCEoOyQX9J8DclcCA7vRe1yE Qh6c91aznjKMjkmcGgDcGik+PvOhhfUN2Pxl1Ywet/svLBydzWCwEpxDoh8+qcL1uNN4 9qEkI3FZTDHa91WRfEknWk1+cfTxRrXhWogU3Mv/xvVGONI/Ir1Es8pcpvFb079R9XJr Hlog== X-Gm-Message-State: AC+VfDzRv8n+3hT5LnQU+ehkoFS8zmOtdEmtukCdTMLHqVHf0O9v0/Lo 0Lc85glvWgUJY/KLcNlXz21DU79CHYsvVOylSC4= X-Received: by 2002:a17:90b:8d7:b0:256:7866:8c06 with SMTP id ds23-20020a17090b08d700b0025678668c06mr16806499pjb.19.1686152458540; Wed, 07 Jun 2023 08:40:58 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:f25d:ffb3:64e4:8ded]) by smtp.gmail.com with ESMTPSA id o11-20020a17090a420b00b002591b957641sm1518066pjg.41.2023.06.07.08.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 08:40:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 3/5] target/arm: Only include tcg/oversized-guest.h if CONFIG_TCG Date: Wed, 7 Jun 2023 08:40:52 -0700 Message-Id: <20230607154054.625513-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230607154054.625513-1-richard.henderson@linaro.org> References: <20230607154054.625513-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.google.com 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, 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_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Fixes the build for --disable-tcg. This header is only needed for cross-hosting. Without CONFIG_TCG, we know this is an AArch64 host, CONFIG_ATOMIC64 will be set, and the TCG_OVERSIZED_GUEST block will never be compiled. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/arm/ptw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index b2dc223525..37bcb17a9e 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -14,8 +14,9 @@ #include "cpu.h" #include "internals.h" #include "idau.h" -#include "tcg/oversized-guest.h" - +#ifdef CONFIG_TCG +# include "tcg/oversized-guest.h" +#endif typedef struct S1Translate { ARMMMUIdx in_mmu_idx;