From patchwork Tue Jun 6 22:46:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 689759 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp25979wru; Tue, 6 Jun 2023 15:47:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6HY+W64lyxVoSIECxVF08eM1LuriYwngT9DH6qBMZcU+QoH6eodw41VWBe+NErHvAp6ZoW X-Received: by 2002:a05:6214:21c4:b0:628:3e37:e160 with SMTP id d4-20020a05621421c400b006283e37e160mr1511544qvh.30.1686091638055; Tue, 06 Jun 2023 15:47:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686091638; cv=none; d=google.com; s=arc-20160816; b=SUJaJEb5UGRIFC+DMw3V7dA3FO+tNjN2x/FlkwNjKXS1QqeZZceDHbKmBbPwHEw/5N /RLIo6VOCy9hLu12K+Nx4pROALFnRJ2YrqEkjVscTC2hlLHZO7vK/ZqCvQ7nuzGdYN1S scoNHv8c+2x42N70OZSoc3glEBb/SEYQLY+rkfdg7BgFqr8FX/x6RTBPXvtKYYm1ttRS 8YehdLz+326X9wBzHpG8kAqAJGvM1RHz/u45u7osgn5clltrV7VueTNGf62Cn9aXpyL8 pTr47hcX/jI2+Po6JCyVPnwXvBfr/9z8jBxViCaYnh4YwsG7mrcVfYt8coIZKG74Dqka SCCw== 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=3S1R0mxbsbr5r4sN0R70oDeXEHFKtv8G6mrXyAWo4hU=; b=ym8Nmox2yd9DXTUgpjITQlX8uXcvwIl/D4umalw5oqTHT9eydOKRzuhvPFHvX2niTg PCn7LKYx6LyQckcNm1rFXFbB7FUohxFzO3Y5t/6Ek2r7OJEuHZKeIponGaHQMNTsNUSH lARpotdtdbmiroVBftsmthbpYTwa7EP2U5ePZwBB1WMwAOasia8eNorLXgvKLtulidLG fNyxCkkiqWTsKBd62U1K5KWSJjhxq3ocaqfzoAklrstAw6qRdVQOlpYogaf7kuVjn+xQ iDfW+06/hKxM5JfDZBXs66Q3V2wWqSoYWGBnO6SY7rXkYBB/Sb1wSZuWstYTpesHBl0G W3ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=deVpfxIw; 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 gi6-20020a056214248600b0062345c0244csi7153536qvb.138.2023.06.06.15.47.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jun 2023 15:47:18 -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=deVpfxIw; 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 1q6fRW-0005EV-97; Tue, 06 Jun 2023 18:46:22 -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 1q6fRU-0005Cc-BK for qemu-devel@nongnu.org; Tue, 06 Jun 2023 18:46:20 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6fRP-0001Fm-VT for qemu-devel@nongnu.org; Tue, 06 Jun 2023 18:46:20 -0400 Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-53fdae76f3aso6088539a12.0 for ; Tue, 06 Jun 2023 15:46:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686091572; x=1688683572; 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=3S1R0mxbsbr5r4sN0R70oDeXEHFKtv8G6mrXyAWo4hU=; b=deVpfxIw8Ci62xyukJLFSW++zEDhCtLJvycFV7mhBs7u1wCdS+s3RKpelkb/O02erV 1mfCNaahumobc6S4fS7Zb+4agHThtBfz+xOkYNWuwUOwCtukBBxs69bb0ycTF5/sEtTR 2RVr8ZCIOWWouWfnsZBI3PQMd1b68K5pvyJeyCelt0B62tE+IkoK1vh4fEhKV6b8xoyl J1nt7uhiBfPUK24lhC2dCNV2hP/tgxBEJdjBDWLhye0970AsvxBeozlJilCfTHn7jFKN oSiCYXA3gDoNUiN/qW+ssOwGkOVMOlkYYqJ7cLDsGk2GX1ZuXvIsRF58Meuh3GehbVfO DUdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686091572; x=1688683572; 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=3S1R0mxbsbr5r4sN0R70oDeXEHFKtv8G6mrXyAWo4hU=; b=TAX4aKuYQrTumDAo+tkJ9+so8shLyScYBYbPig5DLyvyRFh3YCNN/g14sDM5lAAAPD 5U5189LKzYjgPn3N0TNwC7dltbhRIbtC+Dxc7cuLUevAoq3fzC90PkAxxYotspOBY78X JbOnp2j5ZgKMJ8KRvshMz+Mdb8L0qkyvFrJvs3uHa5LUXOkEVuE/oiLg6z+zjBQGbpci 9wHS0w8yEVJ7Xf9peSYv9JOFZc+CJgNWODmbbvVckSR43hcc4UQTA3TNvkMQXrOWJ4nT WozsHUkEECqCViYJdwqkqPxBNLqzpKSr3Oy/LQC8PLLzLAQS6nJnW9P4bHiV258S6Gdn y7+w== X-Gm-Message-State: AC+VfDy6Svyq6UUQNoZ53qB4E+GQOn5UXbNG4XyNLlTtsvzBCorwOBJI 3Vz224az9Vhlpdgv8jJPxH0Dbdy9sm3bG9Zc7bo= X-Received: by 2002:a05:6a20:2d26:b0:10c:1047:68b9 with SMTP id g38-20020a056a202d2600b0010c104768b9mr972795pzl.50.1686091571835; Tue, 06 Jun 2023 15:46:11 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:b7fa:ce59:1445:805a]) by smtp.gmail.com with ESMTPSA id t8-20020aa79388000000b0065cfd5cbef3sm3346969pfe.15.2023.06.06.15.46.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jun 2023 15:46:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, alex.bennee@linaro.org, thuth@redhat.com Subject: [PATCH 1/2] target/arm: Only include tcg/oversized-guest.h if CONFIG_TCG Date: Tue, 6 Jun 2023 15:46:08 -0700 Message-Id: <20230606224609.208550-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230606224609.208550-1-richard.henderson@linaro.org> References: <20230606224609.208550-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.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. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- 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;