From patchwork Tue Mar 25 04:58:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875970 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475791wrb; Mon, 24 Mar 2025 22:04:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVMXNuRYwsJPYHob/HfO7bxzGhOEUzvRBc3NjLuiR58A3tByLW9svMBXVey0awXR4zr65VlqQ==@linaro.org X-Google-Smtp-Source: AGHT+IGAm2gS/JFBx33nUx/MDfkW5rxgQfj5LHDnb/8FOOiLOpgJ4aA4X2XSUVRAiqdOJfPE9ivn X-Received: by 2002:a05:6214:ca7:b0:6d8:b3a7:75a5 with SMTP id 6a1803df08f44-6eb3f3afde1mr197995306d6.42.1742879086457; Mon, 24 Mar 2025 22:04:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879086; cv=none; d=google.com; s=arc-20240605; b=NI2B2ZfG5znzS9M9a3bsYgN+zK8cDLQ+5QcT0Lmt2yCVrpXk1f0J3XRP3N4IqZA6uS jWruOUHAApAofEkm6PxbPMesCcWLN2pUt/wyeN9ooVOa2KUdzT8SMdGO7GLYl9Op4NJj eI2bbJDC+e45ZnXZzojF0DRZ+TvmjHEAFFOEfWY0sqEZtamxhWv4fW1TSvMwa+XkY1Kb vxWQ3XT1txwzfYPGf9D918kq7f72WVR9oMTbnEwQmm/PXAu8Ap6IABP5DZxw30RF2z9j ORfCyH0lQWDhP/FlJ11wdYhzVs4Vhl+MyvFEr0cQee2vGyQb+s5FaZwJNcKcmdZV4Nj6 KMfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=5F5Dzae+RyDol+flZMgGIl7VK6PFPHMGXCHLqJN/jSE=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=TmVDlNqQyQfDyZuGVQ6nUp+0qrhmH0a1gN/r0r7VNZtqywAP5fQ9BCa/dSf2Rxofa9 zX6zprwz3MIa1dYHHaFfEJgknzLYNSoYYZG9T55k9VrfR3BoG+Qv8liSYBjyYtIoxALR CoWP124fmXIGEYgCJ+HFEJYxZ3cThmUvM8zsavWkVmxJ7VygTrWNnN1qOGPQIdOS4ys/ 2Et0bOnUjIHupkyVt8b/vD5ELAfmdAkL/TpHsZl3fBhMcQL5F4zoBOzNN048INTjwwxg +5sAdpG+dIXHtq9h4vJDz2CdTQMW7c364ZWkzmv63OeSQqCmmbxhAaz58b1/RWvB7Z+j 8k8A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="ap/YXrei"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eb3ef48d46si91651916d6.43.2025.03.24.22.04.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:04:46 -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="ap/YXrei"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOJ-0004Fk-0h; Tue, 25 Mar 2025 00:59:55 -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 1twwNs-0003kX-Q1 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:30 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwNo-0005nz-NU for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:28 -0400 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-300fefb8e06so9160890a91.0 for ; Mon, 24 Mar 2025 21:59:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878763; x=1743483563; darn=nongnu.org; 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=5F5Dzae+RyDol+flZMgGIl7VK6PFPHMGXCHLqJN/jSE=; b=ap/YXreiltXMYBxzNXzrzaFS13kjNa1+YZP7e2e/95vbPdTcdv3Xqq+7SfvrKmUxEw nFpnrTIbGJSBd5XQEfET4qouMzGQ0UuvioWIuHWIOmxbFwiJlK6RE3lQrfF4ekE1UNKk ncldqxScrdj4cDHueiao7jJjse4q/u5WyueZOT61RFEvxbfFM8zhCqU+YVDwTII/X8xm 7HxeYpZtY5MWy0XcxcM6ylT1rnsNmcCoSjEkw1BHj5h+wftzO2/wAcNQioOza0szM/y7 iarKCy87CMkEk6E898ZCnK1+v0vvwSgEP+k+QJzQwAROz49zDsuQ5a5t7uPuZtDOHZ3u WAqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878763; x=1743483563; 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=5F5Dzae+RyDol+flZMgGIl7VK6PFPHMGXCHLqJN/jSE=; b=xCkexbjDgPr5OSL+jX452oLCIKP8Jy+jhtKanlCTU7SWdQzReg5YActa+PAQEc8wP7 evWSA+87UeObHzCN1sJmcC1pjCUg0AHJTXL9oE2b/FlVA+hl62a0CfE/qKy76ak6mBnD XZM1fycBSKEM0NjXEIUwyW8StVmgKNdc9wVHAm4+Iii+23dou7jc2bMRe1PqpfGDNMpw 2w4SrNc28Hh5o3sMaWmfGlYz53WminDMoSv4Vca0pfASkWAQZBPm4X7V078ReYB4gZMg zgH16vXpZlmPcDlCwH8+d/SVm3sgqj4vA3BhM6lyqtilS7k4DMOHcvB3LJtm9dkrbIqT 96RQ== X-Gm-Message-State: AOJu0Yx9j1lwcuG7qQgpBQzd25id0NjwW+nmZDEreF0SwmIZShO+DOZe gDiZ3oluGpJpqoVGt/BMH1Ck0gvtl/qSzOVGSC0SbIdo+75d+8faUCG+7gtjzBN8AaLfeHYaZ4r 7 X-Gm-Gg: ASbGnctI3bo2asT9DtgNEQXqZl+yH2qNhQQXkzvmwpPNn2EBWtlL1a0Li919Gs40/dy J+TGMmRdih7vTs9dGCfMEgw/p1Xs/Ap3NMPdGDLt2JsCFNxMCLpffKn8c2yeb8XXzuIiQrpo0w2 9djpin7hU9ouVLlKzkXmhWXHkXdHJt0WeHGZOd6x6OlnPiX9b7L2i/YhP6gSezkIn3D/gOrwqP4 6zzRaNVNZq5asUIu/tsn91eIq/1Eor7yjxl9KyIclMbntMxfrUrisozLDHxQ/3NTqVAbpj27Cfe WFBw6iRNhrTekXUQ4Gkt+D/mtIoSBc6XzoLFKMtBxgV5 X-Received: by 2002:a17:90b:1f81:b0:2fa:157e:c78e with SMTP id 98e67ed59e1d1-3030fe6a098mr26719254a91.7.1742878762798; Mon, 24 Mar 2025 21:59:22 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:22 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 01/29] exec/cpu-all: extract tlb flags defines to exec/tlb-flags.h Date: Mon, 24 Mar 2025 21:58:46 -0700 Message-Id: <20250325045915.994760-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102b.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 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 63 -------------------- include/exec/tlb-flags.h | 87 ++++++++++++++++++++++++++++ accel/tcg/cputlb.c | 1 + accel/tcg/user-exec.c | 1 + semihosting/uaccess.c | 1 + target/arm/ptw.c | 1 + target/arm/tcg/helper-a64.c | 1 + target/arm/tcg/mte_helper.c | 1 + target/arm/tcg/sve_helper.c | 1 + target/i386/tcg/system/excp_helper.c | 1 + target/riscv/op_helper.c | 1 + target/riscv/vector_helper.c | 1 + target/s390x/tcg/mem_helper.c | 1 + target/sparc/mmu_helper.c | 1 + 14 files changed, 99 insertions(+), 63 deletions(-) create mode 100644 include/exec/tlb-flags.h diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 013fcc9412a..d2895fb55b1 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -36,69 +36,6 @@ CPUArchState *cpu_copy(CPUArchState *env); #include "cpu.h" -#ifdef CONFIG_USER_ONLY - -/* - * Allow some level of source compatibility with softmmu. We do not - * support any of the more exotic features, so only invalid pages may - * be signaled by probe_access_flags(). - */ -#define TLB_INVALID_MASK (1 << (TARGET_PAGE_BITS_MIN - 1)) -#define TLB_MMIO (1 << (TARGET_PAGE_BITS_MIN - 2)) -#define TLB_WATCHPOINT 0 - -#else - -/* - * Flags stored in the low bits of the TLB virtual address. - * These are defined so that fast path ram access is all zeros. - * The flags all must be between TARGET_PAGE_BITS and - * maximum address alignment bit. - * - * Use TARGET_PAGE_BITS_MIN so that these bits are constant - * when TARGET_PAGE_BITS_VARY is in effect. - * - * The count, if not the placement of these bits is known - * to tcg/tcg-op-ldst.c, check_max_alignment(). - */ -/* Zero if TLB entry is valid. */ -#define TLB_INVALID_MASK (1 << (TARGET_PAGE_BITS_MIN - 1)) -/* Set if TLB entry references a clean RAM page. The iotlb entry will - contain the page physical address. */ -#define TLB_NOTDIRTY (1 << (TARGET_PAGE_BITS_MIN - 2)) -/* Set if TLB entry is an IO callback. */ -#define TLB_MMIO (1 << (TARGET_PAGE_BITS_MIN - 3)) -/* Set if TLB entry writes ignored. */ -#define TLB_DISCARD_WRITE (1 << (TARGET_PAGE_BITS_MIN - 4)) -/* Set if the slow path must be used; more flags in CPUTLBEntryFull. */ -#define TLB_FORCE_SLOW (1 << (TARGET_PAGE_BITS_MIN - 5)) - -/* - * Use this mask to check interception with an alignment mask - * in a TCG backend. - */ -#define TLB_FLAGS_MASK \ - (TLB_INVALID_MASK | TLB_NOTDIRTY | TLB_MMIO \ - | TLB_FORCE_SLOW | TLB_DISCARD_WRITE) - -/* - * Flags stored in CPUTLBEntryFull.slow_flags[x]. - * TLB_FORCE_SLOW must be set in CPUTLBEntry.addr_idx[x]. - */ -/* Set if TLB entry requires byte swap. */ -#define TLB_BSWAP (1 << 0) -/* Set if TLB entry contains a watchpoint. */ -#define TLB_WATCHPOINT (1 << 1) -/* Set if TLB entry requires aligned accesses. */ -#define TLB_CHECK_ALIGNED (1 << 2) - -#define TLB_SLOW_FLAGS_MASK (TLB_BSWAP | TLB_WATCHPOINT | TLB_CHECK_ALIGNED) - -/* The two sets of flags must not overlap. */ -QEMU_BUILD_BUG_ON(TLB_FLAGS_MASK & TLB_SLOW_FLAGS_MASK); - -#endif /* !CONFIG_USER_ONLY */ - /* Validate correct placement of CPUArchState. */ QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) != 0); QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) != sizeof(CPUState)); diff --git a/include/exec/tlb-flags.h b/include/exec/tlb-flags.h new file mode 100644 index 00000000000..c371ae77602 --- /dev/null +++ b/include/exec/tlb-flags.h @@ -0,0 +1,87 @@ +/* + * TLB flags definition + * + * Copyright (c) 2003 Fabrice Bellard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ +#ifndef TLB_FLAGS_H +#define TLB_FLAGS_H + +#include "exec/cpu-defs.h" + +#ifdef CONFIG_USER_ONLY + +/* + * Allow some level of source compatibility with softmmu. We do not + * support any of the more exotic features, so only invalid pages may + * be signaled by probe_access_flags(). + */ +#define TLB_INVALID_MASK (1 << (TARGET_PAGE_BITS_MIN - 1)) +#define TLB_MMIO (1 << (TARGET_PAGE_BITS_MIN - 2)) +#define TLB_WATCHPOINT 0 + +#else + +/* + * Flags stored in the low bits of the TLB virtual address. + * These are defined so that fast path ram access is all zeros. + * The flags all must be between TARGET_PAGE_BITS and + * maximum address alignment bit. + * + * Use TARGET_PAGE_BITS_MIN so that these bits are constant + * when TARGET_PAGE_BITS_VARY is in effect. + * + * The count, if not the placement of these bits is known + * to tcg/tcg-op-ldst.c, check_max_alignment(). + */ +/* Zero if TLB entry is valid. */ +#define TLB_INVALID_MASK (1 << (TARGET_PAGE_BITS_MIN - 1)) +/* Set if TLB entry references a clean RAM page. The iotlb entry will + contain the page physical address. */ +#define TLB_NOTDIRTY (1 << (TARGET_PAGE_BITS_MIN - 2)) +/* Set if TLB entry is an IO callback. */ +#define TLB_MMIO (1 << (TARGET_PAGE_BITS_MIN - 3)) +/* Set if TLB entry writes ignored. */ +#define TLB_DISCARD_WRITE (1 << (TARGET_PAGE_BITS_MIN - 4)) +/* Set if the slow path must be used; more flags in CPUTLBEntryFull. */ +#define TLB_FORCE_SLOW (1 << (TARGET_PAGE_BITS_MIN - 5)) + +/* + * Use this mask to check interception with an alignment mask + * in a TCG backend. + */ +#define TLB_FLAGS_MASK \ + (TLB_INVALID_MASK | TLB_NOTDIRTY | TLB_MMIO \ + | TLB_FORCE_SLOW | TLB_DISCARD_WRITE) + +/* + * Flags stored in CPUTLBEntryFull.slow_flags[x]. + * TLB_FORCE_SLOW must be set in CPUTLBEntry.addr_idx[x]. + */ +/* Set if TLB entry requires byte swap. */ +#define TLB_BSWAP (1 << 0) +/* Set if TLB entry contains a watchpoint. */ +#define TLB_WATCHPOINT (1 << 1) +/* Set if TLB entry requires aligned accesses. */ +#define TLB_CHECK_ALIGNED (1 << 2) + +#define TLB_SLOW_FLAGS_MASK (TLB_BSWAP | TLB_WATCHPOINT | TLB_CHECK_ALIGNED) + +/* The two sets of flags must not overlap. */ +QEMU_BUILD_BUG_ON(TLB_FLAGS_MASK & TLB_SLOW_FLAGS_MASK); + +#endif /* !CONFIG_USER_ONLY */ + +#endif /* TLB_FLAGS_H */ diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 613f919fffb..b2db49e305e 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -34,6 +34,7 @@ #include "qemu/error-report.h" #include "exec/log.h" #include "exec/helper-proto-common.h" +#include "exec/tlb-flags.h" #include "qemu/atomic.h" #include "qemu/atomic128.h" #include "tb-internal.h" diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index ebc7c3ecf54..667c5e03543 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -21,6 +21,7 @@ #include "disas/disas.h" #include "exec/vaddr.h" #include "exec/exec-all.h" +#include "exec/tlb-flags.h" #include "tcg/tcg.h" #include "qemu/bitops.h" #include "qemu/rcu.h" diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c index a9578911669..cb64725a37c 100644 --- a/semihosting/uaccess.c +++ b/semihosting/uaccess.c @@ -11,6 +11,7 @@ #include "exec/cpu-all.h" #include "exec/cpu-mmu-index.h" #include "exec/exec-all.h" +#include "exec/tlb-flags.h" #include "semihosting/uaccess.h" void *uaccess_lock_user(CPUArchState *env, target_ulong addr, diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 43309003486..8d4e9e07a94 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -12,6 +12,7 @@ #include "qemu/main-loop.h" #include "exec/exec-all.h" #include "exec/page-protection.h" +#include "exec/tlb-flags.h" #include "cpu.h" #include "internals.h" #include "cpu-features.h" diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 9244848efed..fa79d19425f 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -31,6 +31,7 @@ #include "exec/cpu-common.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" +#include "exec/tlb-flags.h" #include "qemu/int128.h" #include "qemu/atomic128.h" #include "fpu/softfloat.h" diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c index 80164a80504..888c6707547 100644 --- a/target/arm/tcg/mte_helper.c +++ b/target/arm/tcg/mte_helper.c @@ -31,6 +31,7 @@ #endif #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" +#include "exec/tlb-flags.h" #include "accel/tcg/cpu-ops.h" #include "qapi/error.h" #include "qemu/guest-random.h" diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index d786b4b1118..e3bed77b48e 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -23,6 +23,7 @@ #include "exec/exec-all.h" #include "exec/page-protection.h" #include "exec/helper-proto.h" +#include "exec/tlb-flags.h" #include "tcg/tcg-gvec-desc.h" #include "fpu/softfloat.h" #include "tcg/tcg.h" diff --git a/target/i386/tcg/system/excp_helper.c b/target/i386/tcg/system/excp_helper.c index 6876329de21..b0b74df72fd 100644 --- a/target/i386/tcg/system/excp_helper.c +++ b/target/i386/tcg/system/excp_helper.c @@ -22,6 +22,7 @@ #include "exec/cpu_ldst.h" #include "exec/cputlb.h" #include "exec/page-protection.h" +#include "exec/tlb-flags.h" #include "tcg/helper-tcg.h" typedef struct TranslateParams { diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index 72dc48e58d3..f3d26b6b957 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -25,6 +25,7 @@ #include "exec/cputlb.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" +#include "exec/tlb-flags.h" #include "trace.h" /* Exceptions processing helpers */ diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index 67b3bafebbe..83978be0603 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -25,6 +25,7 @@ #include "exec/cpu_ldst.h" #include "exec/page-protection.h" #include "exec/helper-proto.h" +#include "exec/tlb-flags.h" #include "fpu/softfloat.h" #include "tcg/tcg-gvec-desc.h" #include "internals.h" diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 8187b917ba1..0ff2e10d816 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -29,6 +29,7 @@ #include "exec/cputlb.h" #include "exec/page-protection.h" #include "exec/cpu_ldst.h" +#include "exec/tlb-flags.h" #include "accel/tcg/cpu-ops.h" #include "qemu/int128.h" #include "qemu/atomic128.h" diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c index 4a0cedd9e21..cce3046b694 100644 --- a/target/sparc/mmu_helper.c +++ b/target/sparc/mmu_helper.c @@ -23,6 +23,7 @@ #include "exec/cputlb.h" #include "exec/cpu-mmu-index.h" #include "exec/page-protection.h" +#include "exec/tlb-flags.h" #include "qemu/qemu-print.h" #include "trace.h" From patchwork Tue Mar 25 04:58:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875957 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2474637wrb; Mon, 24 Mar 2025 22:01:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVLPApOwUUHL3xeFjBOL+B3Pd2cRPNztdnYHVpiZZM7B+aqbsZF9feU6QCVWDgo+oxRS0bpGg==@linaro.org X-Google-Smtp-Source: AGHT+IE9RilbcsBFWak7goaoPe/QNdYN/5MOtyjuelocyNpYr1tThfWzHar1Uxq8dnETFCSvizLU X-Received: by 2002:a05:620a:43a8:b0:7c5:5f58:9158 with SMTP id af79cd13be357-7c5ba139d53mr2537262485a.9.1742878879308; Mon, 24 Mar 2025 22:01:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878879; cv=none; d=google.com; s=arc-20240605; b=NhdaOTAzr6fBDqFYV+FBNAmBuUlCqurXX6/jtqyoArkWXk7+nMK276K0eCOiF+tFCf 4yLXfQRH3ozIn9ahoLW09DnHxXFZ5+3cMOjK/kxAnxDl66mxAt1P4vAu6t1Yu5KIciAb ySa/aUBgorRBhF8uMfhFBgDw/FlXbcHhUK1aiHl5zuK2MaDbDtN0xLxC0+lpbb2M4pX9 wKnlt+EGH2olQxmgBUib9G+H4zdDsSPKm0NzPfAtn15xaM1EJluOpFc14i04MCyQgHq1 rLXecyvtH3KnmDI4/3ipe2MkZs/7LrWqn7dHh+oiQo1Z/GShFROrupMjXQs+50MFGsdG 0XRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=jR5zdvst1499BI4mZMYVh63tqJtsj49dtruLLQFFpJU=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=ViOUH1xXS3x4eXD97hrMiX/sQSeF3N6pFSR3RUG1ev13vqEW6Ghv39s7MaFey0SWZ/ PVO5r/sHkZ8HiHslLBV69zdNKFP9tlU2/A8sPnNO2VjQHM7kI//XXuWlkfuC6RElOwk+ oBRn93cqDZtdcajr+DuTbznfO91rL20LwnXOo4KECn/xCZgpljYCfltA4dUCWoFSou4X b1kFoavsgDVZ5gkz7iJBzuRuENqvdSjtFsj6mxSV8rcONyJ0QSUvoE+M1pUAxOpZAazY mX6Dz9PPM140gWdRA42dhz1dd4V/pPG/Fo5sJ9L+sf8ecda0Mxm0RYYb4o2dhNI4GTD4 JVaQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=W8sLISSm; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b92b0433si926568085a.108.2025.03.24.22.01.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:01:19 -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=W8sLISSm; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwO4-0003vr-KK; Tue, 25 Mar 2025 00:59:40 -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 1twwNs-0003kK-Bs for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:28 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwNp-0005o9-TS for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:27 -0400 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-301c4850194so7514839a91.2 for ; Mon, 24 Mar 2025 21:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878764; x=1743483564; darn=nongnu.org; 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=jR5zdvst1499BI4mZMYVh63tqJtsj49dtruLLQFFpJU=; b=W8sLISSmEjFnu59CZE7HWpAmFYwJAqCmvuXAF2UAWmUhNCekQu8ZvMBc69gClH72MZ F4RlP+aserkmrORWYkJrcX77Rwxf32p5HjEW3QrQ4sa//YhvPEu9dVtIYLgOGglhdZZR 4+oIf4ohOfSJF3iy0QeTlYdTrsH/OIZoYHb4wixoTEHwWnoSS4dCxgs5Of0fVwQtXUJQ LDxRPMvWObdZWbxQD8R5PDO1/6G3m5GLN9LSfSASQkHxj3rvLCNms5mn/x6KqBZ0O5/8 VQm48us51OUyHYRNsyZ2MHrj85KvqRaMwVErPalsuBKFeQKNjfl2cYFBG0YSg/Qybd7Q eYIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878764; x=1743483564; 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=jR5zdvst1499BI4mZMYVh63tqJtsj49dtruLLQFFpJU=; b=CQTPXDeEL/q7+u1n45BOY6wHraTZr/dRWJlMVVNVyGJ/INaPuw7qACIaYqtvrCcSmP hLpToFjiuNgzv3ifNh7TCRGVs8A8DpTC3kZeiswZ+gPeMMQaIprUku8zME4SLVUJKH9I xGcEUSte1HoPN9LLPaChqBV57pvaKD/0vfwOIoh8GLScGvzksqWxyrdRaoVHPhDQgow/ PRC+WUDWRZ8lNutx5ucGoYK19kMCu3g2jAssliIGJzZ5kuDfnuJsyGmPKbqNWtiM4xZq W1xcGtaR+ibNjP2/9jU6EY/YD6taNiC+gXhosMQZjedhYicFytuSvehceZl7R5hNot/p ejJw== X-Gm-Message-State: AOJu0YyoNPbTKUA4kbNXnHsKbOLV+/gO+kgq+Svv6bVDtS6MXTeyCh1h RHwBSj+H6lfGzEf3u6LScE7SZ+qH9daG2LZexUc4jRJG2SbZ2/gsl0HCT5YyfaHSPyTw9c8Ek1K O X-Gm-Gg: ASbGncthD9DhHnMGz0sG1GtnDc/IjG+RWEO+s9yUg0VY2CI9o8zcoSHWom/ogy6Isft 0wCw+yd4jsBdOGyAT5+FW1Dbt416fEriOSgKlF0coGO8MVJXLPmr9er75RY6FUxnLE1lukpu/JT IW8n5iVWkBgVTUziP0d7RxUvbfSQze00JoRxew2zz0sW1W8L3lWKIcjXB7Eqozew0jMZImislfd /Ht1f/Z9EVYXo1x09+XLqegXzOxI3JrNpap7ibEQTZ707gfaWFg936nrxdcZRnSvf7g7F62FJmH O4fcD7TGtlqvG7LcrXeAnk8nefTVbtDLeXdw2a5MXGyU X-Received: by 2002:a17:90a:e185:b0:2ff:52e1:c4b4 with SMTP id 98e67ed59e1d1-3031002b8b9mr20134582a91.32.1742878763623; Mon, 24 Mar 2025 21:59:23 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:23 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 02/29] exec/cpu-all: move cpu_copy to linux-user/qemu.h Date: Mon, 24 Mar 2025 21:58:47 -0700 Message-Id: <20250325045915.994760-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1035.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 autolearn=unavailable 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 2 -- linux-user/qemu.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index d2895fb55b1..74017a5ce7c 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -32,8 +32,6 @@ #include "exec/cpu-defs.h" #include "exec/target_page.h" -CPUArchState *cpu_copy(CPUArchState *env); - #include "cpu.h" /* Validate correct placement of CPUArchState. */ diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 5f007501518..948de8431a5 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -362,4 +362,7 @@ void *lock_user_string(abi_ulong guest_addr); #define unlock_user_struct(host_ptr, guest_addr, copy) \ unlock_user(host_ptr, guest_addr, (copy) ? sizeof(*host_ptr) : 0) +/* Clone cpu state */ +CPUArchState *cpu_copy(CPUArchState *env); + #endif /* QEMU_H */ From patchwork Tue Mar 25 04:58:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875960 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2474882wrb; Mon, 24 Mar 2025 22:02:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXO+z9IJQ2K8BoVRcWxnIuvZOb2vFeZmk9W/ti4Y+FQsX/rh/k1MvUMLGuoPg68UCSyOyLFAg==@linaro.org X-Google-Smtp-Source: AGHT+IGV6c2WNgkTZITgT5hCCXNYEbJoqZIHtk0CdpFlSjClCdKC6/rtWDeuG2biJYJEaFvGRxhL X-Received: by 2002:a05:620a:d8b:b0:7c5:6a35:81c1 with SMTP id af79cd13be357-7c5ba1fba0fmr2823278985a.48.1742878925820; Mon, 24 Mar 2025 22:02:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878925; cv=none; d=google.com; s=arc-20240605; b=P15PmadLStogE3R3TMU4q1b3DhielOPE+yQwrEinWarzpJOSxF9I1avXHYCe7AuASt bFHrFkBi2FBeVX9wXx+yucAAl2/jkqP2cZAQRtmF6zPdnvzCvJG17//EmopATj6YzrQK fP0MPPKf6J33GyG4LZVn3q37IHPmWj7H/aWeq044EI9fgoX8cLdk/SBBFmXrHkpZuUAi EwkFk3pmjzV8BLpN0lvzZsNbfqSoIQ0I2p+R3cJ4dV7Ufp/U7r+OJ07FuISs14AdIyn1 IoB/3rqsNTMUypcnwCyt/HPHX+S0yWh3wZWytOw3F9c5j/zZSylFVqeVI6RXrFVYZ9+E ngiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=MN4UgqEwiL4w4rQY8ucWfe1J0m6eYAX694euQp2wpb4=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=Q8d5//CYMHLvJdelaAoi/uDBg7tKtcBnAwyapRHjDm8F2MuUWsTBZWSyY09FTRgpfs sWeLpE2LzZKftz697mYx+CAjsawHy7NLZedRMD7nvjCmC/bUK1J6xu1PYkTcDb1JXOPh AC0G9C0aiNo+zAiOwP78s1xCIzFoJzzaiJyJF2oVmfva1s3SNaykFs7VUNcicwTplycn zFK5Epsxl/ixvmb8Y0tK8alYOpxzdKkQzSgKkaAfyuCrSnxm8s8zLX1aqP7OmN3qtw9u bd96HBLwb4EYKguToKJF1Huw+HzsxZyH+4NLWP7S85D5+GNYGLwkvqgVjDmPqJhccinF Nnkg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k83ByWI4; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b93471desi864023785a.283.2025.03.24.22.02.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:02:05 -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=k83ByWI4; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOF-000436-3p; Tue, 25 Mar 2025 00:59:51 -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 1twwNu-0003nC-88 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:33 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwNq-0005oE-JG for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:29 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-224100e9a5cso99101705ad.2 for ; Mon, 24 Mar 2025 21:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878765; x=1743483565; darn=nongnu.org; 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=MN4UgqEwiL4w4rQY8ucWfe1J0m6eYAX694euQp2wpb4=; b=k83ByWI4TFK83qu4WOoJrkbavzkRc8B/ycStIv+HjBMz2Z95RA5SOLZfBUCMuOpq6J wsQJLnrz+JlhQ5v1eao1B1pYWY4GY8xpWLgrbqOJAXsiYK9NP4E+IFzvfltyn9Yrlr9z O7XsyNbMvbgCJeE0/9dOuXQuhbVKodB4O6ggZqnQQtFKp4i2khm+RtpELkHcul0lk8mZ N8IrDnFyxUJy31IK6ZUnt534jZXvmi0f9rT3yB4fHBfHHanNr3PW/6l4+XOPEHz9nmDI vfxyUF2X649irwfBB2banZ4/y+7rVhxLDa9k+wwHTn1SMw5+puXzlv/JXph/Npy0Ddmx a9kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878765; x=1743483565; 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=MN4UgqEwiL4w4rQY8ucWfe1J0m6eYAX694euQp2wpb4=; b=twxP6zPSGU9MfdS+zxntX1PvdvTF7tsjx39gL5SK2DzSf4M1vw49SZ53Vqk+Tike+J vaZx1Sm++AF8r/GtSVNVcvS1i2CstLYEVyYQ5AolGXWFL2iS3vy9Fvg0Tfi9TrAzS5+H sK55nVdZtPhACYuvI84geLO2i7EMe1qtb2yEjaONJhReSOQcCGK5Ukc0NuV/Tf2glzzi x2vuzGnb/k/+GQboA4NzfvtkpmlrFiPjX8MU8cSFm1MhGF/bqKVHQvuJR2hlxEEJ88R/ c480EPpPI0/yEGEQe1uJJTQ4ViBoTx0KSaDvqkI1BRds1bQO6jed52LFmA1MjzaNW0Ux tGbw== X-Gm-Message-State: AOJu0YyyTQj5BXQNGJvuRPOq30YGVDdtR/11EnSXVKnh1mvHp8Wu5JcN yCPwhppTf7Rs8b4RUc2eJFGLeBbC5b67FGW0HiAS0e6FTC6s9ryUj1DLqJ9KGzpkOW1Y568Lyhl z X-Gm-Gg: ASbGncvn5/hmJC7GvvxjKtyWsZPtBzaKMI0z/puvB+n1FXUmXftbZGzKnzcRvPB95wT 7l/gSmMnW5o0kIhw9cWaeZ2PtpqHuu5isIp53GAgD1PBp1qWClO6gQevodG78xYBuRNU9H6BefC gytyE37fDxzfXvJkqlb+gVQZv+wBMKAZIGMHwPRnx8CBy1yXypklSuovfEvnO4IfG5i5LgYWZfX U8m2yQLSQdEkigYVaxVYD3i2d4OePCYbCSDfoABPE3vX6EBRtvzRXMjyqofIP9n/D4j2sTaHsq2 DTDeIb9GT1PJb00tf9W/v0eaadkiOmm0Y6fetnqvT4sH X-Received: by 2002:a17:90b:4a08:b0:2ee:863e:9ffc with SMTP id 98e67ed59e1d1-3030feabaf5mr19365794a91.21.1742878764496; Mon, 24 Mar 2025 21:59:24 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:24 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 03/29] include/exec/cpu-all: move compile time check for CPUArchState to cpu-target.c Date: Mon, 24 Mar 2025 21:58:48 -0700 Message-Id: <20250325045915.994760-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x634.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 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 4 ---- cpu-target.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 74017a5ce7c..b1067259e6b 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -34,8 +34,4 @@ #include "cpu.h" -/* Validate correct placement of CPUArchState. */ -QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) != 0); -QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) != sizeof(CPUState)); - #endif /* CPU_ALL_H */ diff --git a/cpu-target.c b/cpu-target.c index 519b0f89005..587f24b34e5 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -29,6 +29,10 @@ #include "accel/accel-cpu-target.h" #include "trace/trace-root.h" +/* Validate correct placement of CPUArchState. */ +QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) != 0); +QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) != sizeof(CPUState)); + char *cpu_model_from_type(const char *typename) { const char *suffix = "-" CPU_RESOLVING_TYPE; From patchwork Tue Mar 25 04:58:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875961 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2474958wrb; Mon, 24 Mar 2025 22:02:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU0p6PQXSC0vjbmaNyTAqtQHNyUKn7b71q5/QrOHm149/lbpBkla85PC4zusXgWuASHKgw9Gw==@linaro.org X-Google-Smtp-Source: AGHT+IGs7mjmO/DjXxewVBzC/V/l5NVro0jcRhRtEtEo3qGuXCUNkXGqfVy2EepO4gnY8jb3ypVI X-Received: by 2002:a05:620a:2454:b0:7c0:a70e:b934 with SMTP id af79cd13be357-7c5ba13af22mr2467871885a.7.1742878937559; Mon, 24 Mar 2025 22:02:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878937; cv=none; d=google.com; s=arc-20240605; b=c9gn23Adn64REghi9EWJczdspSp0AhjENMDn+WkiT4yISQHG6zcp2Vepq6NXaXLmOS bX3QCBR+Hz7M7QraKo8tlE/FENOEyLwBFnSSLogDFomm2MhTDqEVOQYKzG+7bILgZwhO yxnwb26y3Lgh8LFLXzWor1MS8AlYoWNUzaEJ+1xS9vCwkqa7bmvcEp9AU2h+P93GtAPu vO0i++qwqhwQ35tUtQmJUlZMhT1YBnnABYbJnyObM0HIwlay9N7E8PJVLuWCCTaT48S3 CWLc1dheaev98STNeeN2/cfLjisn6AyAjMAL4JdDh7yt+zrRd0HFz+kIh4a5iXd8zece DhWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=HISsD/yjiDCIhuWCuAB0iBmxKFE5uY8JxwYjacPHlXU=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=O+FJ3C0rqm1dYV6q3JbpRBkwJaZ5TAkomxfg5rOIUknVaEEsMf9f4ELI0pOAhwv9gw Vt2zmdJHsm3C+XH10cGew9eet5s8ZPd3NUgPjWs4Z2DWMMIwTQfq1ugHBbf00i8vCm0w AnRWQ068ceQbDCPFu9BnbpuqfY4J9Smm1D38qRiI2bbYhbTae8EovbqbQYpHwV7EcA3j 5O5wp+T+XlLij+znEb6QHRXARvWSLtfn7fUtDuBV1LVKbZ9CkDqYkx105lDMjDKMhnYH H5iRZYWeF9N3qQBcCx2twggq85sbNVAjJgjqRiXxTmfKH0h1yrpkpsF2uTdWrXoq5Ji6 vroA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MBZsXZyc; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b93576b6si868268985a.345.2025.03.24.22.02.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:02:17 -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=MBZsXZyc; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOH-0004BY-LC; Tue, 25 Mar 2025 00:59:53 -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 1twwNu-0003nI-V7 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:36 -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 1twwNr-0005oQ-4q for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:30 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-301a4d5156aso8931452a91.1 for ; Mon, 24 Mar 2025 21:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878765; x=1743483565; darn=nongnu.org; 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=HISsD/yjiDCIhuWCuAB0iBmxKFE5uY8JxwYjacPHlXU=; b=MBZsXZyc67MCCBwUH0qS3NPuggSeabSxFlzVa364hDD9Hul4kp6v+aH441bIevDz7X ZhV4G8C2Lej5/u1DjOmPdUAR4gP2iGSWvhj2mRxY1f8OEBOUu4K0oERyUmI/tCQZtA+A 2ZFfBQtv01YAgb2abzCsxkjTRJb71o7O8d7nRtf+q3ba5mcUvBc45jhZVF+jGK2tf4oT OM8SWI61gm1/R0BKK+z1/1s7h7sQU1eedgNcUmChhQPFbpyIWtBNPW0O8ncmTKXw1qJv 7cUkzxKX/v4EFxiO/5JgfisSXtdWvMAh35j0AYiDFWzEXPDNz+5vub6rA/jT2b97kdCZ W+qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878765; x=1743483565; 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=HISsD/yjiDCIhuWCuAB0iBmxKFE5uY8JxwYjacPHlXU=; b=iR9Ar10Y+KSVzbHsDxJVltXx0wM/I5XV0btEibu2zRPmvxOpnTv5R1EnBn3RTPsnWt G4yFe0EL97s0edxLsiRc4YyhEN/RjrPEVhDgUZZWbfGxhkh58p9xfjMjc9nniKNXEq5B wKnTW8WzXHIvm1PA8cVUA7OVH3wu+/sfgzfyR58KT2h3fFhqtKtmt/w2Nd9VYmFqoGLm EFX5R0DOFP6RJz08ygtwF9pbJx0CHnrcpn6kJFtQ8ZWq7+4ecsxH7QTquo7SXyYx766m ke1gJwOadFXgavII02WrzpPrXg/FN9LcmEAIOqw4TjcbXEA62qRYBtTkxw+NLT8wVoE+ hGiQ== X-Gm-Message-State: AOJu0Yw/ZxHdN5rcL5uQ9fscx++pgtUfR4ioNp3KQ3uG4u5Dg2RMU9Tp KwbqWPTldT1xZ5qrNrLuPjGc3g9QdIkf49GsP4VGRmOdb3NNrILFwKIJOIREqvqD8098d1wcvZU / X-Gm-Gg: ASbGnctiAhhSNOsYeQG5ZRPTtN7kwgNbKQx1XROkyfPUCGET99Y0F1vbF9AQuC8GrtR YtZjZ9ks08OvMbbYWBQrbZS0NqGwl5S2DjwzX1GsOFDkCkvaUIu34V0NaqjR6CF+E9FUNyo/kbd bA3XHFkHa6iYHSU1oTQAT0V6XbM8UySECBKM9A/pMPCk8r8o7RQk2aREKEFDXUOtI0zsrL1Ymba FpgK0zJRFCcSTvVNROWL9pXB/h/3e87DGbFGW6KNiB4sAu+bedSqBdQG8TITin+McLjc/rhFjys g/H7Nvb8vpzqrhORwhBhTVua2A6AyqpJYJPXgU7aNPUUGc32THHJgSQ= X-Received: by 2002:a17:90b:350f:b0:2ff:7c2d:6ff3 with SMTP id 98e67ed59e1d1-303100222fdmr22200481a91.35.1742878765386; Mon, 24 Mar 2025 21:59:25 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:24 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 04/29] exec/cpu-all: remove system/memory include Date: Mon, 24 Mar 2025 21:58:49 -0700 Message-Id: <20250325045915.994760-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=pierrick.bouvier@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 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 We include this header where needed. When includes set already have ifdef CONFIG_USER_ONLY, we add it here, else, we don't condition the include. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/s390x/ipl.h | 1 + include/exec/cpu-all.h | 3 --- target/arm/internals.h | 1 + target/hppa/cpu.h | 1 + target/i386/hvf/vmx.h | 1 + target/ppc/mmu-hash32.h | 2 ++ hw/ppc/spapr_ovec.c | 1 + target/alpha/helper.c | 1 + target/arm/hvf/hvf.c | 1 + target/avr/helper.c | 1 + target/i386/arch_memory_mapping.c | 1 + target/i386/helper.c | 1 + target/i386/tcg/system/misc_helper.c | 1 + target/i386/tcg/system/tcg-cpu.c | 1 + target/m68k/helper.c | 1 + target/ppc/excp_helper.c | 1 + target/ppc/mmu-book3s-v3.c | 1 + target/ppc/mmu-hash64.c | 1 + target/ppc/mmu-radix64.c | 1 + target/riscv/cpu_helper.c | 1 + target/sparc/ldst_helper.c | 1 + target/sparc/mmu_helper.c | 1 + target/xtensa/mmu_helper.c | 1 + target/xtensa/op_helper.c | 1 + 24 files changed, 24 insertions(+), 3 deletions(-) diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index c6ecb3433cc..6557ac3be5b 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -15,6 +15,7 @@ #include "cpu.h" #include "system/address-spaces.h" +#include "system/memory.h" #include "hw/qdev-core.h" #include "hw/s390x/ipl/qipl.h" #include "qom/object.h" diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index b1067259e6b..eb029b65552 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -24,9 +24,6 @@ #include "exec/cpu-interrupt.h" #include "exec/tswap.h" #include "hw/core/cpu.h" -#ifndef CONFIG_USER_ONLY -#include "system/memory.h" -#endif /* page related stuff */ #include "exec/cpu-defs.h" diff --git a/target/arm/internals.h b/target/arm/internals.h index 28585c07555..895d60218e3 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -28,6 +28,7 @@ #include "exec/breakpoint.h" #include "hw/registerfields.h" #include "tcg/tcg-gvec-desc.h" +#include "system/memory.h" #include "syndrome.h" #include "cpu-features.h" diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 7be4a1d3800..bb997d07516 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -22,6 +22,7 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" +#include "system/memory.h" #include "qemu/cpu-float.h" #include "qemu/interval-tree.h" #include "hw/registerfields.h" diff --git a/target/i386/hvf/vmx.h b/target/i386/hvf/vmx.h index 87a478f7fde..3ddf7982ff3 100644 --- a/target/i386/hvf/vmx.h +++ b/target/i386/hvf/vmx.h @@ -34,6 +34,7 @@ #include "system/hvf_int.h" #include "system/address-spaces.h" +#include "system/memory.h" static inline uint64_t rreg(hv_vcpuid_t vcpu, hv_x86_reg_t reg) { diff --git a/target/ppc/mmu-hash32.h b/target/ppc/mmu-hash32.h index 2838de031c7..04c23ea75ed 100644 --- a/target/ppc/mmu-hash32.h +++ b/target/ppc/mmu-hash32.h @@ -3,6 +3,8 @@ #ifndef CONFIG_USER_ONLY +#include "system/memory.h" + bool ppc_hash32_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type, hwaddr *raddrp, int *psizep, int *protp, int mmu_idx, bool guest_visible); diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c index 6d6eaf67cba..75ab4fe2623 100644 --- a/hw/ppc/spapr_ovec.c +++ b/hw/ppc/spapr_ovec.c @@ -16,6 +16,7 @@ #include "migration/vmstate.h" #include "qemu/bitmap.h" #include "system/address-spaces.h" +#include "system/memory.h" #include "qemu/error-report.h" #include "trace.h" #include diff --git a/target/alpha/helper.c b/target/alpha/helper.c index 57cefcba144..f6261a3a53c 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -25,6 +25,7 @@ #include "fpu/softfloat-types.h" #include "exec/helper-proto.h" #include "qemu/qemu-print.h" +#include "system/memory.h" #define CONVERT_BIT(X, SRC, DST) \ diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 93a3f9b53d4..34ca36fab55 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -23,6 +23,7 @@ #include #include "system/address-spaces.h" +#include "system/memory.h" #include "hw/boards.h" #include "hw/irq.h" #include "qemu/main-loop.h" diff --git a/target/avr/helper.c b/target/avr/helper.c index 6b90fa82c3d..64781bbf826 100644 --- a/target/avr/helper.c +++ b/target/avr/helper.c @@ -27,6 +27,7 @@ #include "exec/page-protection.h" #include "exec/cpu_ldst.h" #include "system/address-spaces.h" +#include "system/memory.h" #include "exec/helper-proto.h" #include "qemu/plugin.h" diff --git a/target/i386/arch_memory_mapping.c b/target/i386/arch_memory_mapping.c index ced199862dd..a2398c21732 100644 --- a/target/i386/arch_memory_mapping.c +++ b/target/i386/arch_memory_mapping.c @@ -14,6 +14,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "system/memory_mapping.h" +#include "system/memory.h" /* PAE Paging or IA-32e Paging */ static void walk_pte(MemoryMappingList *list, AddressSpace *as, diff --git a/target/i386/helper.c b/target/i386/helper.c index c07b1b16ea1..64d9e8ab9c4 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -25,6 +25,7 @@ #include "system/runstate.h" #ifndef CONFIG_USER_ONLY #include "system/hw_accel.h" +#include "system/memory.h" #include "monitor/monitor.h" #include "kvm/kvm_i386.h" #endif diff --git a/target/i386/tcg/system/misc_helper.c b/target/i386/tcg/system/misc_helper.c index 0555cf26041..67896c8c875 100644 --- a/target/i386/tcg/system/misc_helper.c +++ b/target/i386/tcg/system/misc_helper.c @@ -23,6 +23,7 @@ #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" #include "system/address-spaces.h" +#include "system/memory.h" #include "exec/cputlb.h" #include "tcg/helper-tcg.h" #include "hw/i386/apic.h" diff --git a/target/i386/tcg/system/tcg-cpu.c b/target/i386/tcg/system/tcg-cpu.c index ab1f3c7c595..0538a4fd51a 100644 --- a/target/i386/tcg/system/tcg-cpu.c +++ b/target/i386/tcg/system/tcg-cpu.c @@ -24,6 +24,7 @@ #include "system/system.h" #include "qemu/units.h" #include "system/address-spaces.h" +#include "system/memory.h" #include "tcg/tcg-cpu.h" diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 0bf574830f9..82512722191 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -25,6 +25,7 @@ #include "exec/page-protection.h" #include "exec/gdbstub.h" #include "exec/helper-proto.h" +#include "system/memory.h" #include "gdbstub/helpers.h" #include "fpu/softfloat.h" #include "qemu/qemu-print.h" diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index c941c89806e..da8b525a41b 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "qemu/log.h" +#include "system/memory.h" #include "system/tcg.h" #include "system/system.h" #include "system/runstate.h" diff --git a/target/ppc/mmu-book3s-v3.c b/target/ppc/mmu-book3s-v3.c index a812cb51139..38655563105 100644 --- a/target/ppc/mmu-book3s-v3.c +++ b/target/ppc/mmu-book3s-v3.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "system/memory.h" #include "cpu.h" #include "mmu-hash64.h" #include "mmu-book3s-v3.h" diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c index 5ca4faee2ab..3ba4810497e 100644 --- a/target/ppc/mmu-hash64.c +++ b/target/ppc/mmu-hash64.c @@ -25,6 +25,7 @@ #include "qemu/error-report.h" #include "qemu/qemu-print.h" #include "system/hw_accel.h" +#include "system/memory.h" #include "kvm_ppc.h" #include "mmu-hash64.h" #include "exec/log.h" diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c index 461eda4a3dc..4ab5f3bb920 100644 --- a/target/ppc/mmu-radix64.c +++ b/target/ppc/mmu-radix64.c @@ -23,6 +23,7 @@ #include "exec/page-protection.h" #include "qemu/error-report.h" #include "system/kvm.h" +#include "system/memory.h" #include "kvm_ppc.h" #include "exec/log.h" #include "internal.h" diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 0dd8645994d..ca58094fb54 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -26,6 +26,7 @@ #include "exec/cputlb.h" #include "exec/exec-all.h" #include "exec/page-protection.h" +#include "system/memory.h" #include "instmap.h" #include "tcg/tcg-op.h" #include "accel/tcg/cpu-ops.h" diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c index b559afc9a94..eda5f103f10 100644 --- a/target/sparc/ldst_helper.c +++ b/target/sparc/ldst_helper.c @@ -27,6 +27,7 @@ #include "exec/cputlb.h" #include "exec/page-protection.h" #include "exec/cpu_ldst.h" +#include "system/memory.h" #ifdef CONFIG_USER_ONLY #include "user/page-protection.h" #endif diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c index cce3046b694..48fb2179b2d 100644 --- a/target/sparc/mmu_helper.c +++ b/target/sparc/mmu_helper.c @@ -24,6 +24,7 @@ #include "exec/cpu-mmu-index.h" #include "exec/page-protection.h" #include "exec/tlb-flags.h" +#include "system/memory.h" #include "qemu/qemu-print.h" #include "trace.h" diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index 96140c89c76..72910fb1c80 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -36,6 +36,7 @@ #include "exec/cpu-mmu-index.h" #include "exec/exec-all.h" #include "exec/page-protection.h" +#include "system/memory.h" #define XTENSA_MPU_SEGMENT_MASK 0x0000001f #define XTENSA_MPU_ACC_RIGHTS_MASK 0x00000f00 diff --git a/target/xtensa/op_helper.c b/target/xtensa/op_helper.c index 028d4e0a1c7..c125fa49464 100644 --- a/target/xtensa/op_helper.c +++ b/target/xtensa/op_helper.c @@ -31,6 +31,7 @@ #include "exec/page-protection.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" +#include "system/memory.h" #include "qemu/atomic.h" #include "qemu/timer.h" From patchwork Tue Mar 25 04:58:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875968 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475452wrb; Mon, 24 Mar 2025 22:03:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVT97KdSmFmY/1tRciPdEJMwDGVc5phWOf8OV5ewlYeRD3REmzXsuDWAX8lOWDJfkqxPwHomg==@linaro.org X-Google-Smtp-Source: AGHT+IFZJ3r2IHNMtjbHsEtkvjcKzKYwBRVqJu44XkX0ABZcS6Jnx+vof8+ESAdW3YDjkyoxM23R X-Received: by 2002:ad4:576e:0:b0:6e8:fb8c:e6dd with SMTP id 6a1803df08f44-6eb3f27f43emr200031866d6.5.1742879028163; Mon, 24 Mar 2025 22:03:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879028; cv=none; d=google.com; s=arc-20240605; b=IvTs6Ef7KI+bCttm0UPxJN4q4vN1jSy8JvGkazIMtu/RGRk6AB+lbn0MI7Iu/55F0k QjFC0dunzXM6Xr3cpmjGDPkHoxEc1qeMiSHpz8DWtPzPBlTaq/2BeWefEdKZAB5IS5A5 h+/lMojdNl11J6Efi+l7SfT+/7QNaE7tJ+SPOzNfUz8LNVUwg5DefofTCPSLaAHsXJTc SqaI5G3iV6FHvaN50T8dxc//8fKU1Z4Ra/aDgo1+zSCfVC3DqfyPCiTKrC23eCzwXqQt KXdfk4M83UaRl1PS9LordF6gYbBu7vSfzZ085ZzNLkx/m/rIKWMAu7Is3IR/Wxr3OhVo jJEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=RQiP5GUFkFFVY7PDaY5zaedRYxLQ4TsTpg+RlxTtlvE=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=Lrh6WI8zBUctFeR8jagkApT+XsQUaN1juBROWKkzliGXVOPPUeMh2j2gYeMUuww7q+ ImPNLDljln3cPM4R6N2PNrqjeZQky7Ht07L6C9DieYzIDUQHGo6b128kKD90QSg3w9mi hlImuG7fFizcZ1iHzwJx0PBzIompDSqXjXJ3nNgjE9dpT4HvLzEYasXGANxhOzEHYcBC 3BRcZXOuec1+mupOaPaXmDxoJWlFJxh8z4JrFw8MKGmieQ/rmOeob5Cp5k3NXxdNhkLZ RsUCQ3o67PLdRlzWlBwq27cE2Bu9Wm8EpgjjDjhx083UjCWlL3pnpvULNYHQJVbo7K9A ctVg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jaSTuK5X; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6ed0d26b6c8si7683816d6.409.2025.03.24.22.03.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:03:48 -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=jaSTuK5X; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOL-0004L5-4m; Tue, 25 Mar 2025 00:59:57 -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 1twwNv-0003nL-OW for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:36 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwNs-0005oh-3b for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:31 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2255003f4c6so98340255ad.0 for ; Mon, 24 Mar 2025 21:59:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878766; x=1743483566; darn=nongnu.org; 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=RQiP5GUFkFFVY7PDaY5zaedRYxLQ4TsTpg+RlxTtlvE=; b=jaSTuK5XaWJono/YsSt7+RNR3PZmol2aFKRYCtBPt1/0aSJ4tYSD0Gbp1LMExKUxyE TQJF4XPpMl/KD3vV2ASwf9VyqWi70P3+JXO0/MISwo+TxZqbJ/XHBqWSPuIRLUzlVACu 7LB1DXAzmzpQ+oifntFjQNlIQezTOcl56BhIjjcPmvjqVqSKgKdkF5xHbR2PCjU9GI7s 0zZl/XPNkdaZ2lzkRaz8STjxvfavgnyQKRHCLwl0UmRa0rQ4lRDPO2YckQqIrsaqTa9R j/1ZKwYBpfl0Gc7AIzN6jzdcvJZZlb0WFR2NCtDr/o/TPNV3LTNz63STpG3fK82wj8U0 HwXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878766; x=1743483566; 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=RQiP5GUFkFFVY7PDaY5zaedRYxLQ4TsTpg+RlxTtlvE=; b=jI9uGguXJCWQc1OnkwqCiZ/0n78flkip29UJhyYQoCDUr0q5PlLVOcQDypgEYQrRyj hOLkM7L91ZJV10sqK6/twU03mO///AH2P5SJixlWuHANZu8oBUEAxrIWwtAi8zv0pMGO rDj2DfjzBCDj5EzmcPxh+FRAvphUfTm69rRehDGJrtvlSJHqHARsOfTazhGV3w10Jpq6 AZX1CXbSGhwo2p9puqw9grQk/OehtqoQ1LnIIh8+Sncuecdx1qgNPMmnJiUxOGT4ngta kJRlftlleQoyes6RNRzHuj6HkqaT4Ka/nbZ4ekqBWYJyezlxhBF585qOvo43+Olu8tZa AYFA== X-Gm-Message-State: AOJu0YyZJ/CGZc2d1wEbSpuyR3pf9s8RmhLiXZhnU+lj2GahzpmEUeBa IEgsAQbEjkR9sUoZEZeiJTsfLj814rQ3NW9q4GqjvftXMooloeYX7zVaCIYCndLlipc8E9HzV4z u X-Gm-Gg: ASbGncu6wNp/vSzwF2+tpqGwR9vieaItbIp3NhNqnTf1SR/F3dOQchdIStgd6gykl3x SNm569c1GCGiRNTMRE5oe4+2DoqsKAoQvWf1JAPBuIB1RIPNDes0EGEPpSQN7+5o/QemdGmxanT 5O7yXvp4VpFwoTbMjut9yuL2cWhvvG/KtLdxAunwAitRlfKl8VFJSjA298Y/qYxFS/Z1hn+L/ME pGCDoB+veP02oVY7paIQQvUOMzlsxeE0xclPIWGuLcmduyxQYzLPv+7YZSsIB8gqmZckcYH+5Gr 2PjY0D//SWshUqcL6mSw8izb/lK882P7ASkEE+G8wmQy X-Received: by 2002:a17:902:e74d:b0:223:5e6a:57ab with SMTP id d9443c01a7336-22780e10df0mr235483485ad.39.1742878766217; Mon, 24 Mar 2025 21:59:26 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:25 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 05/29] exec/cpu-all: remove exec/page-protection include Date: Mon, 24 Mar 2025 21:58:50 -0700 Message-Id: <20250325045915.994760-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x632.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 autolearn=unavailable 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index eb029b65552..4a2cac1252d 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -19,7 +19,6 @@ #ifndef CPU_ALL_H #define CPU_ALL_H -#include "exec/page-protection.h" #include "exec/cpu-common.h" #include "exec/cpu-interrupt.h" #include "exec/tswap.h" From patchwork Tue Mar 25 04:58:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875971 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475796wrb; Mon, 24 Mar 2025 22:04:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVIRnmB/VR8TiM16zRD1eSp88VHlL5ExPw0avg8mZhfCsfORGRH6rShl//07ODh9QCL2BQyhw==@linaro.org X-Google-Smtp-Source: AGHT+IGiyvSMPID7zG1PSse8eUkqnadNobLXbjMsmDom0x4LcMgUujUiGaWw08DxLrHEGjVRpckL X-Received: by 2002:a05:620a:472c:b0:7c5:5596:8457 with SMTP id af79cd13be357-7c5ba20595bmr2048317285a.57.1742879087762; Mon, 24 Mar 2025 22:04:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879087; cv=none; d=google.com; s=arc-20240605; b=dNf2GK0HN10QYLa+IGKO77/UX2hFG7KoXpnLrcKteo1NzvJTY6/dr4ZW/dcrM15980 6TZN2oGPJyLYx/neZ80N3P7+ZPxxufoihD6+TNsN8ckuHK67FNAhvfC7+gVnL6LdSjKl 9xzU6xvsOApuB89kJ03/TFfiroKZzFcvTD0xPcwmlQ5nboCXXw6vdhcOibDG+aO6auHq Mi3zVA8451XJN1iRWXf75L2Bvf8BoQiEI8UPhq+SAf82WcZXpiydPQodBc9G7/tRkE7e wIHEhXkwdpl+vroxdQ78cFulHNOCVFDii1ab4x6sJ1HsGfSF/GnazQoUAwqwDDcqBJ1B WfNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=7u9igk3DJeYNJ4kHlFRAOur7C++4prjQF3K5i5oOOhU=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=PeYZ0MSoYZHnVYxbzi2XnavUPsJVHyUfp/p/bxEwpW49F8YiowRuzTUojlJhOZXE2i TK4UQEgbVmduYs0cWk3iCOxxsB3oxOTCc9bSWW6nINHTBu+ornlH23vIc15wwTBprlzy 8A7J25S0lMArYvbG9Uhx1V6rBsLSRH1+tXxh0F+7dta++jSNFgK6tCJkc/f+jGSLnr7P HRclC7MkmLO1TiVS4/bKVW8a4Zau1j+pqsVkVcaf9qc90nqf5jzaEd3swax5EzKevvzx +Rbiuj6Y06qOWoMOECjuR9F+wg/wBUks0wUWvw/lXPDxZTTj1X2986Wqtq68x/UcwCTr 2mcA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="q/bl66Cv"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b93628c4si878436985a.565.2025.03.24.22.04.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:04:47 -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="q/bl66Cv"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOJ-0004Fo-1B; Tue, 25 Mar 2025 00:59:55 -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 1twwNv-0003nK-OJ for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:36 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwNs-0005p0-JL for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:31 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2ff4a4f901fso9525309a91.2 for ; Mon, 24 Mar 2025 21:59:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878767; x=1743483567; darn=nongnu.org; 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=7u9igk3DJeYNJ4kHlFRAOur7C++4prjQF3K5i5oOOhU=; b=q/bl66CvooQrDt4rLP4tOGdqXj3/AfslP6o2U+azpuBWSkDE66Eih/yAYCu58zyIHq 5bV+IKBipTrUHV9aBDukxzDakSiahB1fzx8CKmlTFj2587uNDV7JnlEfk8V22DXpYG19 6veQPKTvFhFwycc4Mb4+9fuphB7ODWKxqo2fXgB00v01TbOTW+lh6o7AhGYw1IWdy6si GYi8H2qIESMNafKgYH4T3Dxkmt9u50Le5gOYSgR6nq9dRLUD9gTn4ZonVBehVMER0xwi sbFDDynY03GbCwnSmPYnSCCmrSlXNUxo6NIcQ7X+iFJCfxVUXZYTojxqYzL8guuX0D4a 1Caw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878767; x=1743483567; 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=7u9igk3DJeYNJ4kHlFRAOur7C++4prjQF3K5i5oOOhU=; b=bIH8yGqmOvJDBKkwdUg+GvranY+bk2lyXvU8WSVzJUaSVjEGsbL1O+5RT6VdZSVttg 806L/dDaGLuikoNQRKZwqg2msSFP0KTX3O2200vrjpazNdJ5RB6P5MX1gYbLxEFp+mY7 U2eoyZTn+jmqaofcxCAzd/u/N2XBPfqEfHSjFPLFhAE2fJg1djdj+XDLDvof0m+k9Q6k aO9MLBSY+u1SFI6NAz8ZBIA+62j1HLHI0rl4rNxH4BZLqYzin+zlW89ZFKWRkTisr5Ia XKfcvcgHDepWC7hv6vKkQDiVGvmZIu34wCJ4Cbx6EBRRXCJslmJ8gZwauVM3tWM+90pw /KcQ== X-Gm-Message-State: AOJu0YwgzzFbCj0UxlZO3WjeFHLdpXju+qHHcEWzQzR26yzpdIkajE1g 0fpAWX1sWaAJ4WPpb6K+8nfRGqdYhXiVNE4O1suy0xYGrrITaxxO5JkL73JWa3RD9wRp4ztR+Ng a X-Gm-Gg: ASbGnctBrke5qLnoFcZj85RMgYfD2wgpajBLkTGR9VydASkXTvuYu9JFsfFZGmNziSR Rxg2RqJj4Vm2+67ddSnwiMd3pRZVNWchRHw4dS5MDmjYgQJu188QyUjFzXqEaDIRbzp2xxn8SUr tFRU24rVJ4qVhttEQA/JSaYX+BEL18wjyTNV3VB8XjfL38WLsjwb9+NnwFXl0V61E/O6b9Ie3oj mPjWgcr40d4J9y3eBkuZ/rlllJ1TuvQA6pkylaKR7kh3ZfeAFNBM99htH5bOj8N9wXiFaHW4p8M yfOp21dLzfUJwvmRo1CZk9u5b5U1WWzeQRT4HjYCU70Z X-Received: by 2002:a17:90b:5108:b0:2ff:7b28:a519 with SMTP id 98e67ed59e1d1-3030ff24236mr23516938a91.30.1742878767084; Mon, 24 Mar 2025 21:59:27 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:26 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 06/29] exec/cpu-all: remove tswap include Date: Mon, 24 Mar 2025 21:58:51 -0700 Message-Id: <20250325045915.994760-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102a.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 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 1 - target/ppc/mmu-hash64.h | 2 ++ target/i386/tcg/system/excp_helper.c | 1 + target/i386/xsave_helper.c | 1 + target/riscv/vector_helper.c | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 4a2cac1252d..1539574a22a 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -21,7 +21,6 @@ #include "exec/cpu-common.h" #include "exec/cpu-interrupt.h" -#include "exec/tswap.h" #include "hw/core/cpu.h" /* page related stuff */ diff --git a/target/ppc/mmu-hash64.h b/target/ppc/mmu-hash64.h index ae8d4b37aed..b8fb12a9705 100644 --- a/target/ppc/mmu-hash64.h +++ b/target/ppc/mmu-hash64.h @@ -1,6 +1,8 @@ #ifndef MMU_HASH64_H #define MMU_HASH64_H +#include "exec/tswap.h" + #ifndef CONFIG_USER_ONLY #ifdef TARGET_PPC64 diff --git a/target/i386/tcg/system/excp_helper.c b/target/i386/tcg/system/excp_helper.c index b0b74df72fd..4badd739432 100644 --- a/target/i386/tcg/system/excp_helper.c +++ b/target/i386/tcg/system/excp_helper.c @@ -23,6 +23,7 @@ #include "exec/cputlb.h" #include "exec/page-protection.h" #include "exec/tlb-flags.h" +#include "exec/tswap.h" #include "tcg/helper-tcg.h" typedef struct TranslateParams { diff --git a/target/i386/xsave_helper.c b/target/i386/xsave_helper.c index 996e9f3bfef..24ab7be8e9a 100644 --- a/target/i386/xsave_helper.c +++ b/target/i386/xsave_helper.c @@ -5,6 +5,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/tswap.h" void x86_cpu_xsave_all_areas(X86CPU *cpu, void *buf, uint32_t buflen) { diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c index 83978be0603..7fffa23bc8d 100644 --- a/target/riscv/vector_helper.c +++ b/target/riscv/vector_helper.c @@ -26,6 +26,7 @@ #include "exec/page-protection.h" #include "exec/helper-proto.h" #include "exec/tlb-flags.h" +#include "exec/tswap.h" #include "fpu/softfloat.h" #include "tcg/tcg-gvec-desc.h" #include "internals.h" From patchwork Tue Mar 25 04:58:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875978 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2476441wrb; Mon, 24 Mar 2025 22:07:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVou+tnbEMnUUWIAPd9JPt7/n+uMnBoeYWtuCvvj+j3TSw1QGUyPmnm0Mw+9rLSl4A9hPMdPw==@linaro.org X-Google-Smtp-Source: AGHT+IHoWuk8wTt1qJKDZ9EGlX0+y066WVV5shQ6rpGg2vPOU86NrbivzvtSk/sciT1m8L8eDk9O X-Received: by 2002:a05:6214:f0e:b0:6e8:ff46:b33e with SMTP id 6a1803df08f44-6eb3f3543eemr215653196d6.37.1742879228959; Mon, 24 Mar 2025 22:07:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879228; cv=none; d=google.com; s=arc-20240605; b=VnlVxMwvMjsw5yyOyFgEzJ4H3pNcnbwHe7UxA6RW+fLaqacx2tQvGha9M02VLORPXC MvVhM+ra9dKV1jkudd5vDH+6FPeC7RL+jtcLRZw37I8YfUuCOZucrlUC6wx1BJnScTJ4 X6zlDVwONdBE29sR3S2ZFJ0FxREg4f20O54VfBh6QqdFIariAHhAxtEbtGg4KYzFOG8K 5EgCfxoH8pYnLhyVJyiQwqbaLEbDjU7GpJQA6PVXQ89raidweqxFg4djrcHMB6uxquyG emUG6/SOOC2PPStTCBKo5kG9j/5HaEko1WSXXdMgHf5ur0CrApXbBXcO6Q7FWz+9f5an VBfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Org2345gwISbkRqtcCIQg/RHNCRTSRlXvAPbgPEQ0IA=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=bzzUnMqZD+TGmt0ytpnwMjncgvZbSO81DIXbzzcMNkH4E1cAkd2rI0GxTon+JVSizB XmU4jQ2OjvzY8Mg723pjiZlKQzDRmCQCHxhk6pCeNjozcCLtjKFh+7KEV6nI+BuBcF3T XpHPim6xf09mPrHW6ZOhMhfsTpmxPLa7BssBLREVgmY8MceU/0mdprAEHKbKGitq4F6h twtOfIqSh0RB5pUdwdtIhCdRPqSNlIyHuHj1kit0B/4nsm4WRNZ+4+ewhR4wvFJSsOwC irJL75gWpl+B1H1M7xu/gL2w47NR6MknGP87J+F3cjI3bf0DZLb/FJL/SL7n2Pa5t/bF E0pQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hI3l+9f2; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eb3f03dc5asi87989056d6.386.2025.03.24.22.07.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:07:08 -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=hI3l+9f2; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOM-0004Ng-JN; Tue, 25 Mar 2025 00:59:58 -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 1twwNx-0003nb-6h for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:36 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwNu-0005pO-Ak for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:32 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-301918a4e3bso9479804a91.3 for ; Mon, 24 Mar 2025 21:59:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878768; x=1743483568; darn=nongnu.org; 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=Org2345gwISbkRqtcCIQg/RHNCRTSRlXvAPbgPEQ0IA=; b=hI3l+9f2JDgKmYPpXat/Ywu0gFo08Hp5tXjclUo5HgFCvfkCQUciy0I1uyTCYt09U6 shMJ3Ssc+qWbZsTGJF7nZnm/2gj2dshNE9vlqtTtHjgaqeAMieIkRO9zpBe4jXEi+erg AsExOkwQlsrtBey5kOFarkopIe78fZmb4cwQ/ZIWKwXOGErh19g/ObBMPaLCxkZubfWs JseR9FayeGsmnn3gJATh9E9C0MgKa8VIHxZEOp6u1FCmQU0PtXdkwKBiDZsJaQQMn7nG ryIqPKdsDRDo10zs0pUK7GHI5H3brO5n3uhY+On0EFUFahAluwY+nZZWcwnblmBK0jS1 GamQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878768; x=1743483568; 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=Org2345gwISbkRqtcCIQg/RHNCRTSRlXvAPbgPEQ0IA=; b=K0VccdLrUdt34J9E4wrzhYvD+QIMBoKW/6SynGE3jZ7b4pUExU6RoERMTm5teB+HHH vS3L0GuuUkGxrenwRnNwPHXDbnUNI/+2AA4+6BYa2Sj5QMDkAl7GqK3Sd6wNHIz2q5OP pKIy9Hm3wjuyDNiOSt3PcfjjoM7OX57tfVlJv9iXX3tVJQqTtPDW0y4liNrDX5TLA8jI LTyeiWMqGW05lPJUBGNv0BVyaPl+3pcs1tb28J3xdwFp8moBsQy6jRNrPR4cVS+uxNLt jfXVJyq1y94h1aq9QiAcgtyCEQuXWyhb5ZdYVDz3kNBpd224jTv/OC+B+DnZ9PBRQPXQ /aSw== X-Gm-Message-State: AOJu0Yzc45NNUwTNHykMTl/wPkq0xfo5x5im+FJ4XBbQiPyKjpFD1IBr uCLkJAuIG9kP7agQF5kUETjSO3Pcx4ft+tM+3vynCp5Uqj0jrpe9YKBEeCAW1PjhV80zdNPTjil / X-Gm-Gg: ASbGncvjmFVG7hR/G64bBGkKSb1WsRdExyyAn0K/oAxi0isoXsb1gQ1JUJsBGkp0BwH 1OCktkORk4YAkNAhOwh+X5gBIIQ8ZXw7FyaLy9oCL2qiDQLYg2K2iw/x70H/X9cZVWbyaP4/gP6 ylVupKqD8f/9nP80c65rlliSRnuqSa45o/+zARpd9vR5qrc19DJxHSR5hEeDe6CgCxgm4PvajAy BnISeGb6QnitfvWV+RKQ9miL/oFHHRFV5+HpZ8bnMGqVAbgjiMwiRE/3uZUONQbyCXaZnsxxQ+I YlgiBNgTyMxCNdfNxdr5fpXvce9dzeu5cWQBVDRynpvl X-Received: by 2002:a17:90b:51cf:b0:2ee:edae:75e with SMTP id 98e67ed59e1d1-3030fe86471mr24805706a91.13.1742878767928; Mon, 24 Mar 2025 21:59:27 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:27 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 07/29] exec/cpu-all: remove exec/cpu-interrupt include Date: Mon, 24 Mar 2025 21:58:52 -0700 Message-Id: <20250325045915.994760-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1031.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 autolearn=unavailable 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 1 - target/alpha/cpu.h | 1 + target/arm/cpu.h | 1 + target/avr/cpu.h | 1 + target/hppa/cpu.h | 1 + target/i386/cpu.h | 1 + target/loongarch/cpu.h | 1 + target/m68k/cpu.h | 1 + target/microblaze/cpu.h | 1 + target/mips/cpu.h | 1 + target/openrisc/cpu.h | 1 + target/ppc/cpu.h | 1 + target/riscv/cpu.h | 1 + target/rx/cpu.h | 1 + target/s390x/cpu.h | 1 + target/sh4/cpu.h | 1 + target/sparc/cpu.h | 1 + target/xtensa/cpu.h | 1 + accel/tcg/cpu-exec.c | 1 + hw/alpha/typhoon.c | 1 + hw/m68k/next-cube.c | 1 + hw/ppc/ppc.c | 1 + hw/xtensa/pic_cpu.c | 1 + 23 files changed, 22 insertions(+), 1 deletion(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 1539574a22a..e5d852fbe2c 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -20,7 +20,6 @@ #define CPU_ALL_H #include "exec/cpu-common.h" -#include "exec/cpu-interrupt.h" #include "hw/core/cpu.h" /* page related stuff */ diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index 80562adfb5c..42788a6a0bc 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -22,6 +22,7 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" #define ICACHE_LINE_SIZE 32 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index a8177c6c2e8..958a921490e 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -25,6 +25,7 @@ #include "hw/registerfields.h" #include "cpu-qom.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "exec/gdbstub.h" #include "exec/page-protection.h" #include "qapi/qapi-types-common.h" diff --git a/target/avr/cpu.h b/target/avr/cpu.h index 06f5ae4d1b1..714c6821e2f 100644 --- a/target/avr/cpu.h +++ b/target/avr/cpu.h @@ -23,6 +23,7 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #ifdef CONFIG_USER_ONLY #error "AVR 8-bit does not support user mode" diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index bb997d07516..986dc655fc1 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -22,6 +22,7 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "system/memory.h" #include "qemu/cpu-float.h" #include "qemu/interval-tree.h" diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 76f24446a55..64706bd6e5d 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -24,6 +24,7 @@ #include "cpu-qom.h" #include "kvm/hyperv-proto.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "exec/memop.h" #include "hw/i386/topology.h" #include "qapi/qapi-types-common.h" diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h index 1916716547a..1dba8ac6a7c 100644 --- a/target/loongarch/cpu.h +++ b/target/loongarch/cpu.h @@ -10,6 +10,7 @@ #include "qemu/int128.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "fpu/softfloat-types.h" #include "hw/registerfields.h" #include "qemu/timer.h" diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index ddb0f29f4a3..451644a05a3 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -22,6 +22,7 @@ #define M68K_CPU_H #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" #include "cpu-qom.h" diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index e44ddd53078..d29681abed4 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -23,6 +23,7 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" #include "qemu/cpu-float.h" +#include "exec/cpu-interrupt.h" typedef struct CPUArchState CPUMBState; #if !defined(CONFIG_USER_ONLY) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 9ef72a95d71..29362498ec4 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -3,6 +3,7 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #ifndef CONFIG_USER_ONLY #include "system/memory.h" #endif diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index b97d2ffdd26..c153823b629 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -22,6 +22,7 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "fpu/softfloat-types.h" /** diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 3ee83517dcd..7489ba95648 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -23,6 +23,7 @@ #include "qemu/int128.h" #include "qemu/cpu-float.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "cpu-qom.h" #include "qom/object.h" #include "hw/registerfields.h" diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 51e49e03dec..556eda57e94 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -24,6 +24,7 @@ #include "hw/registerfields.h" #include "hw/qdev-properties.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "exec/gdbstub.h" #include "qemu/cpu-float.h" #include "qom/object.h" diff --git a/target/rx/cpu.h b/target/rx/cpu.h index 349d61c4e40..5f2fcb66563 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -24,6 +24,7 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" #ifdef CONFIG_USER_ONLY diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 5b7992deda6..0a32ad4c613 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -28,6 +28,7 @@ #include "cpu-qom.h" #include "cpu_models.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" #include "qapi/qapi-types-machine-common.h" diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index d536d5d7154..18557d8c386 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -22,6 +22,7 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" /* CPU Subtypes */ diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 462bcb6c0e6..923836f47c8 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -4,6 +4,7 @@ #include "qemu/bswap.h" #include "cpu-qom.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" #if !defined(TARGET_SPARC64) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 8d70bfc0cd4..66846314786 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -31,6 +31,7 @@ #include "cpu-qom.h" #include "qemu/cpu-float.h" #include "exec/cpu-defs.h" +#include "exec/cpu-interrupt.h" #include "hw/clock.h" #include "xtensa-isa.h" diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 034c2ded6b1..207416e0212 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -26,6 +26,7 @@ #include "trace.h" #include "disas/disas.h" #include "exec/cpu-common.h" +#include "exec/cpu-interrupt.h" #include "exec/page-protection.h" #include "exec/mmap-lock.h" #include "exec/translation-block.h" diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index e8711ae16a3..9718e1a579c 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" #include "qemu/units.h" +#include "exec/cpu-interrupt.h" #include "qapi/error.h" #include "hw/pci/pci_host.h" #include "cpu.h" diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 0570e4a76f1..4ae5668331b 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "exec/hwaddr.h" +#include "exec/cpu-interrupt.h" #include "system/system.h" #include "system/qtest.h" #include "hw/irq.h" diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index 3a80931538f..43d0d0e7553 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -27,6 +27,7 @@ #include "hw/ppc/ppc.h" #include "hw/ppc/ppc_e500.h" #include "qemu/timer.h" +#include "exec/cpu-interrupt.h" #include "system/cpus.h" #include "qemu/log.h" #include "qemu/main-loop.h" diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c index 8cef88c61bc..e3885316106 100644 --- a/hw/xtensa/pic_cpu.c +++ b/hw/xtensa/pic_cpu.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "exec/cpu-interrupt.h" #include "hw/irq.h" #include "qemu/log.h" #include "qemu/timer.h" From patchwork Tue Mar 25 04:58:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875974 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475933wrb; Mon, 24 Mar 2025 22:05:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX7hqAg8J1nlp3W9P8v2pSW6avy5+io2CeJ8aFS/eBc1o4n1Wqm6O/q5JZRgUh3NuVTnIWp3w==@linaro.org X-Google-Smtp-Source: AGHT+IEBhVasv//uPyiuxmpuhCX/Z/J7Ouha/sodaedalM3oGdZ814O8XLC63L9rF+jQI/YVRnLv X-Received: by 2002:a05:620a:26a0:b0:7c5:4949:23f3 with SMTP id af79cd13be357-7c5ba19046amr2033518985a.27.1742879114857; Mon, 24 Mar 2025 22:05:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879114; cv=none; d=google.com; s=arc-20240605; b=LrLbEXjavyo8LFbzjfm3x14ylYJaNOJH8ZaYklXIRFCTUXVrUM3F873rU7XB9C8FLW 4VNoOP1BJqDmvmZzglH2bwhIFwsWolyOZKi5c9eFKRlKmLUddyXw79G6fDIL1lpRfVZ7 FXxgv+1QWfqCzIr0n1tFZboys77Xjf+0y6qERjxFiiNjtx7BwtHgtH7uVm71jrGWqHCN 5GBy8lFYcQNMBDh2D/xMA9lJaTrkSQ0RKDNeyUnX7KtZRHjnUSJTaxN1dgT6rFtKLEXX nfujfJQhELYiKpShlbpEmL0YVOdeP1+MAzQxvJPCUeNoXZhhScZ+aiFSaCDan9FOb0Au PewQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=8rvUTTGe7RSowwob33glnfX6lSJ/LNSVbNxwketpLmc=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=RfR8Axql2NxnvS5qSF/qRS/jEy6O3UB8FtGXAcS6jgnasu8bEBt3wfgFK89UnJYCsO V+ElZFpFlZsPXRx3aiyWMM3/HmnJY1saj7iSqJGB54O9H6GGG4lWCSQ+RHc7wDm6Hfz9 9VB4/BxlTBUz0qcL5ObyryQcCBE+vJNm9M7BzZB2a4fnnYoK7AaoWKF9SMVpNMwIX04n ERgqmns5mNIRAmVn1yXgdAhp0i3T/NG06AovPVbZDCLn/dUC7/H38It42bFZdu2JgvuJ Zet2zPlG1h1h31Ipzp0e8Z+ZAIrplodkRYlYw/s6VOr617kymzAGb0AmiVcMxk1WUxMc XhOQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E46pVlgf; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b92af761si914664485a.16.2025.03.24.22.05.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:05:14 -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=E46pVlgf; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOJ-0004It-SU; Tue, 25 Mar 2025 00:59:55 -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 1twwNx-0003nR-0Y for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:36 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwNu-0005qC-MG for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:32 -0400 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-3014cb646ecso6658655a91.1 for ; Mon, 24 Mar 2025 21:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878769; x=1743483569; darn=nongnu.org; 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=8rvUTTGe7RSowwob33glnfX6lSJ/LNSVbNxwketpLmc=; b=E46pVlgffJE0YrHPRPU/+n9wmcpldQsM2nY8vJYE2rSuhSX73IG3A9iwgEuSOrIhQ+ pjTEsAZP0fVGaG1ww/0I/83YOWtp23vRlFWNoFRKy2DUeKUVfh3K264T5izv0Dnxk6n+ 0t2aqcuUyaOfufDSwQR3lUcrFMUh/haCWwDBYrLV6+s9XznpGHHk4Q54r8p+mZcj9rZd HL8QrM/uVcWMtXX0mEc+u2xMUyCpE5HEoTAgu/1kFCqv3ToIL4MlwwnpnVBb7IPncaMa BZOs1I/fG05Q55NbyME83AaH9E/VgDkf94LoeMzgug1UD/2gan/LneDPmGBH5ryyWDfd tmHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878769; x=1743483569; 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=8rvUTTGe7RSowwob33glnfX6lSJ/LNSVbNxwketpLmc=; b=CDW94nPOTDh5fRz0H5ipUEG8bUVoxsmfOhihyu1nBoITZQVZ+oqcI6gRa10xe5971I RtC2RhfNByCYhSqp4qW/58mBEp4Q0BABeUCafzzGgHkA+QFSS8FCr16/j+8rL6L3dKRP uFCfkojrDqOBamAh3PvEkKgZ881Lyr2VLpusTGdnPLdrCuaZpR/fnt/W7vYC5sky20VF WdFII6U4KSYUeRaUFWMCRz8VccpXhyn3ljoQqmMv8VY4R1IZeXLrthtaUYgp8251+Sa5 Z4x1LJrb0tDDYfcj3Qrkh0dpi/FqQPH5cF0gSAzlD8Qj3gTSv4axJt8EwparfTBOpri/ XgnQ== X-Gm-Message-State: AOJu0Yzj0kgk2cIB0AGAgYi7JD10WmyF0qV0ROhQrJTgkkA7KCMHAmWc Ix3ydpD8A7YSQ+x/GTfrRsKlweWYQD7yjRntVNiySyZ4MMxfAkjJDjQo+IhB+y77GMDi5capt6Z o X-Gm-Gg: ASbGncvNDn05znH38Xw3+pSXoaghUHzrzy3/tOfFVU1U6Ks9JoTZQ/FBpeh+s7jYiVo I4j1tS89KszCWfCwQwYz1FQM2wN214A3UYtKKj6ImTuDllQ9fG2BbiFExshpuGYUFwAwI+RtyN5 j+KMLz/ovIPXWm2cQqjsqw+X1lAPTJ9s4sZ+YER8GJx2VWwybzklgJ+vVG/eIVfFsaZP33JWSyI Ibhkr2tITiwH4k0Wyg7dYATO9u8r6MEMAn0qyqz+XiAdZIVBAqerkBCZ/ca/53+OIx4M5sE2D5B 3+P2WQAScAMbNofLX/GgRmbmmK7b9LtH8rAs5h5WPH2V X-Received: by 2002:a17:90b:35c4:b0:2ee:b6c5:1def with SMTP id 98e67ed59e1d1-3030fe75747mr22925455a91.8.1742878768857; Mon, 24 Mar 2025 21:59:28 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:28 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 08/29] exec/cpu-all: remove exec/cpu-defs include Date: Mon, 24 Mar 2025 21:58:53 -0700 Message-Id: <20250325045915.994760-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1032.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 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e5d852fbe2c..db44c0d3016 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -23,7 +23,6 @@ #include "hw/core/cpu.h" /* page related stuff */ -#include "exec/cpu-defs.h" #include "exec/target_page.h" #include "cpu.h" From patchwork Tue Mar 25 04:58:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875955 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2474423wrb; Mon, 24 Mar 2025 22:00:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUFhM5geLHf6b+WqmTggoi5iQexDE0I1dVDZZnTMpTSD705dQpojkM7c0Mwi4GPpFmFjsl6Aw==@linaro.org X-Google-Smtp-Source: AGHT+IHxekuPojtoyGix2dDqrgS9Mj/g6pzDFhR+8Mke4qBW3pHxa2fVUfMIz8vyZJeam1QaWkPc X-Received: by 2002:a05:620a:44c6:b0:7c5:4278:d161 with SMTP id af79cd13be357-7c5ba1ea844mr2425186285a.35.1742878845547; Mon, 24 Mar 2025 22:00:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878845; cv=none; d=google.com; s=arc-20240605; b=D7DAlSOlh8l53MQtvozyOqec3adpJf+HBxxM6p+FkS4YzLqNCjdKNK8Ev1LTnd4Fh1 svs8H9y8EglKWSpyjQlBSZYM7SdplOEp7cq9HgfJ90C/+NvmHKgbmg9DG0vxTzABFn1z AbD6ygB39JzNJ7hwpA4qAX9ByeKrHpnkyMcBc1V7BiqO5MgZndROCSbBmvArwupUYcGI 23kNKFaeR1Byawm9y5OAOb2k0SWwp9ifIVTFnH7TSXOYekTdCcd+VnOH3mPLWkUm1vxf iB7CbOlttU7/PYUndGG9eKohcn0tR0IjxMM6XRtJFkUrutzJjbQa9Y1alweQKpAU7pQ0 4Tqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=WTNae8XkEmsB47R0C3fMvPlwK+1d7ZJ05j1htpY09PQ=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=J0glTYD6y/izQz8u5plc7DxEUv4nyiBivvCGf9KHoLu+1OQwnSaVeJFh5BUz8UZ1Pj Ml72r/e/l0OXFtJIVOhYvXLbuin3wnwSBVQiR5163sRukVFIiLXaLr6UeG4QqbsFqJ7/ iL3a6B8E+Vp5q466+HKEryLn3gCoZcAbuA0kHRbffmlEKrfn9HSTfYyHZZPgqEMMyS0V Uan7BuoQTG2qmIWl+9YHRv92vWL//MrwsdOJ3GJmE6EqyQkgPlFA9KNAB32mKwVWnfx/ X1vDDwxH/cc6ynGd/R9DC1pV8RStSmUV6sxsis5t9ciX06SatYxBBGwjRx/2+JRYz0rS Ooew==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qXZUjsuQ; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b9348389si963421685a.274.2025.03.24.22.00.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:00:45 -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=qXZUjsuQ; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOT-0004XA-4p; Tue, 25 Mar 2025 01:00:06 -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 1twwO0-0003of-DA for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:38 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwNv-0005rg-I1 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:35 -0400 Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-30155bbbed9so6729537a91.1 for ; Mon, 24 Mar 2025 21:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878770; x=1743483570; darn=nongnu.org; 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=WTNae8XkEmsB47R0C3fMvPlwK+1d7ZJ05j1htpY09PQ=; b=qXZUjsuQjby9sSVVYWnuJV/3rcGzu9Eh0Pj7nMjwoYFj1QP1cdYcJUsaVfvJ4y2SWB YwnSlGmQYPYVrPq6ZZkQRrM6EjhcgoyWA9ZBXIgJYXXN6B051s6dvAIG5THlqAYlwKpw a72bDG+ILZFplc/pjeDuBnRw2A3h+z5MouPkik3cy0vpCORxpKdrjdbjqnFx6rs97X4H P3PxmLtjHaQ3ur9kLTB8rUbaYSmbeZtqpqIdbXWWflruyQqXf/k6VDcn96DyQOlTjJDe 7+02kt81YrwSv+4LVLT7ZsQKaL/WLcbe0QqAlqRuCVbJ6zbqZP1+WoFgP+czObRIl6kj YFtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878770; x=1743483570; 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=WTNae8XkEmsB47R0C3fMvPlwK+1d7ZJ05j1htpY09PQ=; b=o+h0su67RWNNF6EUStytTXf6Xw2i4tni3x2gzKiqf0/tWJc+6PtSczCrkHlkNjUFkr 9+BODo0uBTlVL+S7K+EHMAg0Inm0sgH66LKKcUH5dacEpNhidZdYvfGQIV9BpjEeMdpN l4pjDMN1aavuL5252K7NvhktAEZuk3XWpAjh5DObLvWhX6kJCDk6deEKDTHyvhXPOZt0 /wOI3jvyoM1qkUfevsxKYcStCKyZWVkLp05SoQ1Rt9WC98RSVeenmMmPrqtx261ApW3N dp+YsV0JNNV1ddDo5FzDbcO+rm+aZm3cbmdB5cnzDUNMtCbmaIHvC5V1PnKFaYlHeKRH gmKw== X-Gm-Message-State: AOJu0YznVy6hbx82giTpRp0qylPFsOs0JURyq+nOdBFqJoLhizUakxAB ZLAlEmhOb8+U1BzpJNk1aj38Ui2cFSCtDvhBBdEYIzrZ5wpdX8ER0JL3ex9r8Zk4R2wiWEbakov g X-Gm-Gg: ASbGncsWtsChVjGMZsKXSwOolDDPj/NKvB7j7uPNuVHWDVjuDO897GN9xVqLzM9I0s2 r6RSuu4fpnRkq+FkQZsluYrupHWTI9lwQyQn2FydV3Rcylo+n5HX3PdxFoFCXVqx1S68FvbYWGT LFqh012FhTF35oLUcJ7y3GZcNUKoIEw70MZT3PvDNhDM9vMBfevCGlO2iP/q3LDP+S6ClQiAJWX 6IQYlXbRYf3KBm6aWQEd1cO/pLkdGXQK/bW1cbRfIOughfUDCmB/bvtHt8Cs+19dCSt2lSBnD9E 7P6LY/uYdkckRb0Bf4/z3fjNAfvUt6GBXiSeoyJ4qB/m X-Received: by 2002:a17:90b:5408:b0:2ff:6788:cc67 with SMTP id 98e67ed59e1d1-3030ff0dfd6mr21566664a91.34.1742878769766; Mon, 24 Mar 2025 21:59:29 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:29 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 09/29] exec/cpu-all: remove exec/target_page include Date: Mon, 24 Mar 2025 21:58:54 -0700 Message-Id: <20250325045915.994760-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1030.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 autolearn=unavailable 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/s390x/ipl.h | 1 + include/exec/cpu-all.h | 3 --- include/exec/exec-all.h | 1 + include/exec/tlb-flags.h | 1 + linux-user/sparc/target_syscall.h | 2 ++ hw/alpha/dp264.c | 1 + hw/arm/boot.c | 1 + hw/arm/smmuv3.c | 1 + hw/hppa/machine.c | 1 + hw/i386/multiboot.c | 1 + hw/i386/pc.c | 1 + hw/i386/pc_sysfw_ovmf.c | 1 + hw/i386/vapic.c | 1 + hw/loongarch/virt.c | 1 + hw/m68k/q800.c | 1 + hw/m68k/virt.c | 1 + hw/openrisc/boot.c | 1 + hw/pci-host/astro.c | 1 + hw/ppc/e500.c | 1 + hw/ppc/mac_newworld.c | 1 + hw/ppc/mac_oldworld.c | 1 + hw/ppc/ppc_booke.c | 1 + hw/ppc/prep.c | 1 + hw/ppc/spapr_hcall.c | 1 + hw/riscv/riscv-iommu-pci.c | 1 + hw/riscv/riscv-iommu.c | 1 + hw/s390x/s390-pci-bus.c | 1 + hw/s390x/s390-pci-inst.c | 1 + hw/s390x/s390-skeys.c | 1 + hw/sparc/sun4m.c | 1 + hw/sparc64/sun4u.c | 1 + monitor/hmp-cmds-target.c | 1 + target/alpha/helper.c | 1 + target/arm/gdbstub64.c | 1 + target/arm/tcg/tlb-insns.c | 1 + target/avr/helper.c | 1 + target/hexagon/translate.c | 1 + target/i386/helper.c | 1 + target/i386/hvf/hvf.c | 1 + target/i386/kvm/hyperv.c | 1 + target/i386/kvm/kvm.c | 1 + target/i386/kvm/xen-emu.c | 1 + target/i386/sev.c | 1 + target/loongarch/cpu_helper.c | 1 + target/loongarch/tcg/translate.c | 1 + target/microblaze/helper.c | 1 + target/microblaze/mmu.c | 1 + target/mips/tcg/system/cp0_helper.c | 1 + target/mips/tcg/translate.c | 1 + target/openrisc/mmu.c | 1 + target/riscv/pmp.c | 1 + target/rx/cpu.c | 1 + target/s390x/helper.c | 1 + target/s390x/ioinst.c | 1 + target/tricore/helper.c | 1 + target/xtensa/helper.c | 1 + target/xtensa/xtensa-semi.c | 1 + 57 files changed, 57 insertions(+), 3 deletions(-) diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index 6557ac3be5b..cb55101f062 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -14,6 +14,7 @@ #define HW_S390_IPL_H #include "cpu.h" +#include "exec/target_page.h" #include "system/address-spaces.h" #include "system/memory.h" #include "hw/qdev-core.h" diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index db44c0d3016..d4705210370 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -22,9 +22,6 @@ #include "exec/cpu-common.h" #include "hw/core/cpu.h" -/* page related stuff */ -#include "exec/target_page.h" - #include "cpu.h" #endif /* CPU_ALL_H */ diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 19b0eda44a7..c00683f74b0 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -24,6 +24,7 @@ #include "exec/cpu_ldst.h" #endif #include "exec/mmu-access-type.h" +#include "exec/target_page.h" #include "exec/translation-block.h" #if defined(CONFIG_TCG) diff --git a/include/exec/tlb-flags.h b/include/exec/tlb-flags.h index c371ae77602..2273144f421 100644 --- a/include/exec/tlb-flags.h +++ b/include/exec/tlb-flags.h @@ -20,6 +20,7 @@ #define TLB_FLAGS_H #include "exec/cpu-defs.h" +#include "exec/target_page.h" #ifdef CONFIG_USER_ONLY diff --git a/linux-user/sparc/target_syscall.h b/linux-user/sparc/target_syscall.h index e4211653574..c22ede1ddd2 100644 --- a/linux-user/sparc/target_syscall.h +++ b/linux-user/sparc/target_syscall.h @@ -1,6 +1,8 @@ #ifndef SPARC_TARGET_SYSCALL_H #define SPARC_TARGET_SYSCALL_H +#include "exec/target_page.h" + #if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) struct target_pt_regs { abi_ulong u_regs[16]; diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 570ea9edf24..c1e24a4ffe8 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -15,6 +15,7 @@ #include "hw/rtc/mc146818rtc.h" #include "hw/ide/pci.h" #include "hw/isa/superio.h" +#include "exec/target_page.h" #include "net/net.h" #include "qemu/cutils.h" #include "qemu/datadir.h" diff --git a/hw/arm/boot.c b/hw/arm/boot.c index e296b62fa12..d3811b896fd 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -14,6 +14,7 @@ #include #include "hw/arm/boot.h" #include "hw/arm/linux-boot-if.h" +#include "exec/target_page.h" #include "system/kvm.h" #include "system/tcg.h" #include "system/system.h" diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 704469abf19..62d0b3933ca 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -25,6 +25,7 @@ #include "hw/qdev-core.h" #include "hw/pci/pci.h" #include "cpu.h" +#include "exec/target_page.h" #include "trace.h" #include "qemu/log.h" #include "qemu/error-report.h" diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index c5f247633eb..c430bf28dd2 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -11,6 +11,7 @@ #include "elf.h" #include "hw/loader.h" #include "qemu/error-report.h" +#include "exec/target_page.h" #include "system/reset.h" #include "system/system.h" #include "system/qtest.h" diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index cd07a058614..6e6b96bc345 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -29,6 +29,7 @@ #include "multiboot.h" #include "hw/loader.h" #include "elf.h" +#include "exec/target_page.h" #include "system/system.h" #include "qemu/error-report.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 01d0581f62a..3b98089e908 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" +#include "exec/target_page.h" #include "hw/i386/pc.h" #include "hw/char/serial-isa.h" #include "hw/char/parallel.h" diff --git a/hw/i386/pc_sysfw_ovmf.c b/hw/i386/pc_sysfw_ovmf.c index 07a4c267faa..da947c3ca41 100644 --- a/hw/i386/pc_sysfw_ovmf.c +++ b/hw/i386/pc_sysfw_ovmf.c @@ -26,6 +26,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "hw/i386/pc.h" +#include "exec/target_page.h" #include "cpu.h" #define OVMF_TABLE_FOOTER_GUID "96b582de-1fb2-45f7-baea-a366c55a082d" diff --git a/hw/i386/vapic.c b/hw/i386/vapic.c index 26aae64e5d8..347431eeef3 100644 --- a/hw/i386/vapic.c +++ b/hw/i386/vapic.c @@ -11,6 +11,7 @@ #include "qemu/osdep.h" #include "qemu/module.h" +#include "exec/target_page.h" #include "system/system.h" #include "system/cpus.h" #include "system/hw_accel.h" diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index ddf3f1f6e0a..27f72049f34 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -8,6 +8,7 @@ #include "qemu/units.h" #include "qemu/datadir.h" #include "qapi/error.h" +#include "exec/target_page.h" #include "hw/boards.h" #include "hw/char/serial-mm.h" #include "system/kvm.h" diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index aeed4c8ddb8..c2e365a8205 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -24,6 +24,7 @@ #include "qemu/units.h" #include "qemu/datadir.h" #include "qemu/guest-random.h" +#include "exec/target_page.h" #include "system/system.h" #include "cpu.h" #include "hw/boards.h" diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index d967bdd7438..911f018c03e 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -14,6 +14,7 @@ #include "cpu.h" #include "hw/boards.h" #include "hw/qdev-properties.h" +#include "exec/target_page.h" #include "elf.h" #include "hw/loader.h" #include "ui/console.h" diff --git a/hw/openrisc/boot.c b/hw/openrisc/boot.c index 0a5881be314..c81efe8138a 100644 --- a/hw/openrisc/boot.c +++ b/hw/openrisc/boot.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/cpu-defs.h" +#include "exec/target_page.h" #include "elf.h" #include "hw/loader.h" #include "hw/openrisc/boot.h" diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c index 039cc3ad01d..eef154335f9 100644 --- a/hw/pci-host/astro.c +++ b/hw/pci-host/astro.c @@ -31,6 +31,7 @@ #include "hw/qdev-properties.h" #include "hw/pci-host/astro.h" #include "hw/hppa/hppa_hardware.h" +#include "exec/target_page.h" #include "migration/vmstate.h" #include "target/hppa/cpu.h" #include "trace.h" diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 69269aa24c4..f77b2cb9233 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -26,6 +26,7 @@ #include "hw/block/flash.h" #include "hw/char/serial-mm.h" #include "hw/pci/pci.h" +#include "exec/target_page.h" #include "system/block-backend-io.h" #include "system/system.h" #include "system/kvm.h" diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 2d5309d6f55..023105416e0 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -59,6 +59,7 @@ #include "hw/ppc/mac_dbdma.h" #include "hw/pci/pci.h" #include "net/net.h" +#include "exec/target_page.h" #include "system/system.h" #include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index b5814690f5a..a461c193da8 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -32,6 +32,7 @@ #include "hw/qdev-properties.h" #include "hw/boards.h" #include "hw/input/adb.h" +#include "exec/target_page.h" #include "system/system.h" #include "net/net.h" #include "hw/isa/isa.h" diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c index 925e670ba0a..8b9467753f3 100644 --- a/hw/ppc/ppc_booke.c +++ b/hw/ppc/ppc_booke.c @@ -26,6 +26,7 @@ #include "cpu.h" #include "hw/ppc/ppc.h" #include "qemu/timer.h" +#include "exec/target_page.h" #include "system/reset.h" #include "system/runstate.h" #include "hw/loader.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 3e68d8e6e20..50e86cafd5f 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -32,6 +32,7 @@ #include "hw/pci/pci_host.h" #include "hw/ppc/ppc.h" #include "hw/boards.h" +#include "exec/target_page.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/log.h" diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 406aea4ecbe..fb949a760ef 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qapi/error.h" +#include "exec/target_page.h" #include "system/hw_accel.h" #include "system/runstate.h" #include "system/tcg.h" diff --git a/hw/riscv/riscv-iommu-pci.c b/hw/riscv/riscv-iommu-pci.c index 12451869e41..e49f593446c 100644 --- a/hw/riscv/riscv-iommu-pci.c +++ b/hw/riscv/riscv-iommu-pci.c @@ -27,6 +27,7 @@ #include "qemu/error-report.h" #include "qemu/host-utils.h" #include "qom/object.h" +#include "exec/target_page.h" #include "cpu_bits.h" #include "riscv-iommu.h" diff --git a/hw/riscv/riscv-iommu.c b/hw/riscv/riscv-iommu.c index 76e0fcd8733..92260f4e285 100644 --- a/hw/riscv/riscv-iommu.c +++ b/hw/riscv/riscv-iommu.c @@ -25,6 +25,7 @@ #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/timer.h" +#include "exec/target_page.h" #include "cpu_bits.h" #include "riscv-iommu.h" diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 2591ee49c11..8d460576b1c 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -26,6 +26,7 @@ #include "hw/pci/msi.h" #include "qemu/error-report.h" #include "qemu/module.h" +#include "exec/target_page.h" #include "system/reset.h" #include "system/runstate.h" diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index b4e003c19c9..2f23a4d0768 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -23,6 +23,7 @@ #include "hw/s390x/s390-pci-kvm.h" #include "hw/s390x/s390-pci-vfio.h" #include "hw/s390x/tod.h" +#include "exec/target_page.h" #include "trace.h" diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 425e3e4a878..d21bcffa7b9 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -18,6 +18,7 @@ #include "qapi/qapi-commands-misc-target.h" #include "qobject/qdict.h" #include "qemu/error-report.h" +#include "exec/target_page.h" #include "system/memory_mapping.h" #include "system/address-spaces.h" #include "system/kvm.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 5aaafb40dac..126fcc34c03 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -35,6 +35,7 @@ #include "migration/vmstate.h" #include "hw/sparc/sparc32_dma.h" #include "hw/block/fdc.h" +#include "exec/target_page.h" #include "system/reset.h" #include "system/runstate.h" #include "system/system.h" diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index d3cb7270ff5..becdf3ea980 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -28,6 +28,7 @@ #include "qapi/error.h" #include "qemu/datadir.h" #include "cpu.h" +#include "exec/target_page.h" #include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c index 011a367357e..8e4d8f66309 100644 --- a/monitor/hmp-cmds-target.c +++ b/monitor/hmp-cmds-target.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "disas/disas.h" +#include "exec/target_page.h" #include "system/address-spaces.h" #include "system/memory.h" #include "monitor/hmp-target.h" diff --git a/target/alpha/helper.c b/target/alpha/helper.c index f6261a3a53c..096eac34458 100644 --- a/target/alpha/helper.c +++ b/target/alpha/helper.c @@ -22,6 +22,7 @@ #include "cpu.h" #include "exec/cputlb.h" #include "exec/page-protection.h" +#include "exec/target_page.h" #include "fpu/softfloat-types.h" #include "exec/helper-proto.h" #include "qemu/qemu-print.h" diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c index a9d8352b766..cb596d96ea9 100644 --- a/target/arm/gdbstub64.c +++ b/target/arm/gdbstub64.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "cpu.h" +#include "exec/target_page.h" #include "internals.h" #include "gdbstub/helpers.h" #include "gdbstub/commands.h" diff --git a/target/arm/tcg/tlb-insns.c b/target/arm/tcg/tlb-insns.c index 630a481f0f8..0407ad5542d 100644 --- a/target/arm/tcg/tlb-insns.c +++ b/target/arm/tcg/tlb-insns.c @@ -8,6 +8,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "exec/cputlb.h" +#include "exec/target_page.h" #include "cpu.h" #include "internals.h" #include "cpu-features.h" diff --git a/target/avr/helper.c b/target/avr/helper.c index 64781bbf826..1ea7a258d1d 100644 --- a/target/avr/helper.c +++ b/target/avr/helper.c @@ -26,6 +26,7 @@ #include "exec/cputlb.h" #include "exec/page-protection.h" #include "exec/cpu_ldst.h" +#include "exec/target_page.h" #include "system/address-spaces.h" #include "system/memory.h" #include "exec/helper-proto.h" diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c index fe7858703c8..deb945829ee 100644 --- a/target/hexagon/translate.c +++ b/target/hexagon/translate.c @@ -22,6 +22,7 @@ #include "tcg/tcg-op-gvec.h" #include "exec/helper-gen.h" #include "exec/helper-proto.h" +#include "exec/target_page.h" #include "exec/translation-block.h" #include "exec/cpu_ldst.h" #include "exec/log.h" diff --git a/target/i386/helper.c b/target/i386/helper.c index 64d9e8ab9c4..265b3c1466f 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -21,6 +21,7 @@ #include "qapi/qapi-events-run-state.h" #include "cpu.h" #include "exec/cputlb.h" +#include "exec/target_page.h" #include "exec/translation-block.h" #include "system/runstate.h" #ifndef CONFIG_USER_ONLY diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 9ba0e04ac75..638a1d0e5ea 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -76,6 +76,7 @@ #include "qemu/main-loop.h" #include "qemu/accel.h" #include "target/i386/cpu.h" +#include "exec/target_page.h" static Error *invtsc_mig_blocker; diff --git a/target/i386/kvm/hyperv.c b/target/i386/kvm/hyperv.c index 70b89cacf94..9865120cc43 100644 --- a/target/i386/kvm/hyperv.c +++ b/target/i386/kvm/hyperv.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" +#include "exec/target_page.h" #include "hyperv.h" #include "hw/hyperv/hyperv.h" #include "hyperv-proto.h" diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 6c749d4ee81..c9a3c02e3e3 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -67,6 +67,7 @@ #include "hw/pci/msix.h" #include "migration/blocker.h" #include "exec/memattrs.h" +#include "exec/target_page.h" #include "trace.h" #include CONFIG_DEVICES diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c index b23010374f1..0918b7aa9c4 100644 --- a/target/i386/kvm/xen-emu.c +++ b/target/i386/kvm/xen-emu.c @@ -14,6 +14,7 @@ #include "qemu/main-loop.h" #include "qemu/error-report.h" #include "hw/xen/xen.h" +#include "exec/target_page.h" #include "system/kvm_int.h" #include "system/kvm_xen.h" #include "kvm/kvm_i386.h" diff --git a/target/i386/sev.c b/target/i386/sev.c index ba88976e9f7..878dd20f2c9 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -26,6 +26,7 @@ #include "qemu/uuid.h" #include "qemu/error-report.h" #include "crypto/hash.h" +#include "exec/target_page.h" #include "system/kvm.h" #include "kvm/kvm_i386.h" #include "sev.h" diff --git a/target/loongarch/cpu_helper.c b/target/loongarch/cpu_helper.c index 8662fb36ed6..4597e29b153 100644 --- a/target/loongarch/cpu_helper.c +++ b/target/loongarch/cpu_helper.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/cpu-mmu-index.h" +#include "exec/target_page.h" #include "internals.h" #include "cpu-csr.h" diff --git a/target/loongarch/tcg/translate.c b/target/loongarch/tcg/translate.c index e59e4ed25b1..03573bbf81f 100644 --- a/target/loongarch/tcg/translate.c +++ b/target/loongarch/tcg/translate.c @@ -9,6 +9,7 @@ #include "cpu.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" +#include "exec/target_page.h" #include "exec/translation-block.h" #include "exec/translator.h" #include "exec/helper-proto.h" diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c index 996514ffe88..9e6969ccc9a 100644 --- a/target/microblaze/helper.c +++ b/target/microblaze/helper.c @@ -23,6 +23,7 @@ #include "exec/cputlb.h" #include "exec/cpu-mmu-index.h" #include "exec/page-protection.h" +#include "exec/target_page.h" #include "qemu/host-utils.h" #include "exec/log.h" diff --git a/target/microblaze/mmu.c b/target/microblaze/mmu.c index 987ac9e3a73..7f20c4e4c69 100644 --- a/target/microblaze/mmu.c +++ b/target/microblaze/mmu.c @@ -24,6 +24,7 @@ #include "exec/cputlb.h" #include "exec/cpu-mmu-index.h" #include "exec/page-protection.h" +#include "exec/target_page.h" static unsigned int tlb_decode_size(unsigned int f) { diff --git a/target/mips/tcg/system/cp0_helper.c b/target/mips/tcg/system/cp0_helper.c index 01a07a169f6..0ff86686f3f 100644 --- a/target/mips/tcg/system/cp0_helper.c +++ b/target/mips/tcg/system/cp0_helper.c @@ -28,6 +28,7 @@ #include "qemu/host-utils.h" #include "exec/helper-proto.h" #include "exec/cputlb.h" +#include "exec/target_page.h" /* SMP helpers. */ diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 78b848a6d9a..d0a166ef537 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -26,6 +26,7 @@ #include "translate.h" #include "internal.h" #include "exec/helper-proto.h" +#include "exec/target_page.h" #include "exec/translation-block.h" #include "semihosting/semihost.h" #include "trace.h" diff --git a/target/openrisc/mmu.c b/target/openrisc/mmu.c index 47ac783c525..acea50c41eb 100644 --- a/target/openrisc/mmu.c +++ b/target/openrisc/mmu.c @@ -23,6 +23,7 @@ #include "cpu.h" #include "exec/cputlb.h" #include "exec/page-protection.h" +#include "exec/target_page.h" #include "gdbstub/helpers.h" #include "qemu/host-utils.h" #include "hw/loader.h" diff --git a/target/riscv/pmp.c b/target/riscv/pmp.c index b0841d44f4c..c13a117e3f9 100644 --- a/target/riscv/pmp.c +++ b/target/riscv/pmp.c @@ -26,6 +26,7 @@ #include "trace.h" #include "exec/cputlb.h" #include "exec/page-protection.h" +#include "exec/target_page.h" static bool pmp_write_cfg(CPURISCVState *env, uint32_t addr_index, uint8_t val); diff --git a/target/rx/cpu.c b/target/rx/cpu.c index 0ba0d55ab5b..948ee5023e6 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -23,6 +23,7 @@ #include "migration/vmstate.h" #include "exec/cputlb.h" #include "exec/page-protection.h" +#include "exec/target_page.h" #include "exec/translation-block.h" #include "hw/loader.h" #include "fpu/softfloat.h" diff --git a/target/s390x/helper.c b/target/s390x/helper.c index e660c69f609..3c57c32e479 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -27,6 +27,7 @@ #include "target/s390x/kvm/pv.h" #include "system/hw_accel.h" #include "system/runstate.h" +#include "exec/target_page.h" #include "exec/watchpoint.h" void s390x_tod_timer(void *opaque) diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c index a944f16c254..8b0ab38277a 100644 --- a/target/s390x/ioinst.c +++ b/target/s390x/ioinst.c @@ -17,6 +17,7 @@ #include "trace.h" #include "hw/s390x/s390-pci-bus.h" #include "target/s390x/kvm/pv.h" +#include "exec/target_page.h" /* All I/O instructions but chsc use the s format */ static uint64_t get_address_from_regs(CPUS390XState *env, uint32_t ipb, diff --git a/target/tricore/helper.c b/target/tricore/helper.c index be3d97af78d..a5ae5bcb619 100644 --- a/target/tricore/helper.c +++ b/target/tricore/helper.c @@ -22,6 +22,7 @@ #include "exec/cputlb.h" #include "exec/cpu-mmu-index.h" #include "exec/page-protection.h" +#include "exec/target_page.h" #include "fpu/softfloat-helpers.h" #include "qemu/qemu-print.h" diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c index 4824b97e371..553e5ed271f 100644 --- a/target/xtensa/helper.c +++ b/target/xtensa/helper.c @@ -31,6 +31,7 @@ #include "exec/cputlb.h" #include "gdbstub/helpers.h" #include "exec/helper-proto.h" +#include "exec/target_page.h" #include "qemu/error-report.h" #include "qemu/qemu-print.h" #include "qemu/host-utils.h" diff --git a/target/xtensa/xtensa-semi.c b/target/xtensa/xtensa-semi.c index 2ded8e5634e..636f421da2b 100644 --- a/target/xtensa/xtensa-semi.c +++ b/target/xtensa/xtensa-semi.c @@ -29,6 +29,7 @@ #include "cpu.h" #include "chardev/char-fe.h" #include "exec/helper-proto.h" +#include "exec/target_page.h" #include "semihosting/semihost.h" #include "semihosting/uaccess.h" #include "qapi/error.h" From patchwork Tue Mar 25 04:58:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875982 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2476761wrb; Mon, 24 Mar 2025 22:08:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUmmmBZri1JeG8W1jTTaBWWXxu3hVto58M1gx8xN3eZDdvztXxuSEzPyQPg+0f6p8kOuK8X9w==@linaro.org X-Google-Smtp-Source: AGHT+IHZxCqAN4ZZLK/NGjlIbbG0E5iwihTbDbdifyWF9oy8oJ5OEMOUTrb9942dl87CsfBUEwSH X-Received: by 2002:a05:620a:2946:b0:7c5:a441:f440 with SMTP id af79cd13be357-7c5ba134078mr1778082185a.12.1742879294524; Mon, 24 Mar 2025 22:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879294; cv=none; d=google.com; s=arc-20240605; b=EXbI5ls0GVypalFjOSRh1amR6cn543B3nbNyPMY+L59x2ZOw3JpWvuhmfdQRJ9m0aI 79idVImCHw4EgxBjjlS3bShMASi/gIjIxmI79E5nEpPxGN/zRoxez3S9UpyNJIonmWYe WYUhzD+fjbarY7QJkpBiy82U3M7jTMrEOUwSqsYNJu/vBGk/yJ5U5ibalq6uP9YftXGF ctDUURJf4UXwyVUXRwISOFd7me2C9LgNzy9YpTQGaU6hNCFzqJP5x6JsCwk4dE0s5W9+ vQ7JVEmxKmLkN2E1ZqQ9jPB9/aCAJEafYpwGc4pAxgtE4Wwuheld5SvR15o84EwtY/Oh 13Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=4oOs5VbZVOvjmzXBjhiG3M4+ph6BhOZ9OEQr0J3OxEc=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=lDdFRfB83fasFxorDm8StEWqRsgFfVxLhu3PesVfVvXGqTeTS1KUFNIdRH59EWDfKE jaRQHcBCdKQjF4BIBhCexQGh6N67OjZx99/aDI7JdEbgS1avtl6t9ehMNB78NkPe2Q48 j4lyf6/ixMezP+ZYUAW6suRSm64rXLPF0CbsCx0HQUmfKfJA4d5fEZkOfqSRtDBaxmxA UQ3OBXC+4Z2egGAIIT3L6VO99n1utNvImorJsblqCa2EdK+JdZD1hLCGHeSQxP5xvK8y BmuwoIJtn6O1TDfULB8y9d39mORcCWCfC5DtzsKwOzWmdwWOtIVHllN14lMU1Yjf+K+4 N4FQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KcdnRnb0; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b92b1352si881703485a.21.2025.03.24.22.08.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:08:14 -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=KcdnRnb0; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwON-0004SK-Pi; Tue, 25 Mar 2025 00:59:59 -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 1twwNy-0003nn-Kq for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:36 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwNw-0005s1-Ae for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:34 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-301918a4e3bso9479854a91.3 for ; Mon, 24 Mar 2025 21:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878771; x=1743483571; darn=nongnu.org; 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=4oOs5VbZVOvjmzXBjhiG3M4+ph6BhOZ9OEQr0J3OxEc=; b=KcdnRnb0Te7hatntx83UKIQy5/DBhqGnSRXGmYw6iKbDccM25r4fiQk+FU53qf9nt7 +mYtIIWED3FojU6nG5blodn03wYAp/HDTmKIzJ+qW6XD9A/8qM3WhqoAFjRaJP9V1RdN jVkthaulWTQTmemN0VNwOapBZgw0YUFIC6OUhw8NSq5X16Idrw8XfqwPMYi6pnu69i1k u5ln0Un67MkUvH7d2qOWgM+1yXP07oHu/13HCMWGhi7Z6LcCektoXG5wb6uFd0UcHrAg uAVsTNBCbk2QLTJka6QuJUbKtaIJWK4iD452J1c9v/ftRIY08QEXAR4vJszO3smnmO/a 0woA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878771; x=1743483571; 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=4oOs5VbZVOvjmzXBjhiG3M4+ph6BhOZ9OEQr0J3OxEc=; b=LYIssq1dT2DQDLII2Q3/QGhC4gVyAPTQcAkMffUxovTXTPQ6DKwWVg5iT1zd+PAi3d a7M79anTiEU4Lsei+YdbkBiDfqgGGIjN1ee9LEJU+UskrHyx6UxzBM77VlMGc+xNMm/B Qq594MCh4b+xIUN9spC7nkYPhVejsq0FSMy1okKes8ruQILspau0ZdcuQKpAU7I5L9cT 1y4GZQte2VGWmI9cAT3TUTh2OTGLgfNvIZMst4TryACJdC6yloCFwpolrL1xfEs/R1mK Bx6xW5Sf452kXCO23P67MgneZTwPqhmuKbX2krOA3bFGwWCsiBjZNjeGfFGmYt2huitA 4nPg== X-Gm-Message-State: AOJu0YwDpD/NFX0iWdHD46oo88XN8TTxOT8l/mCxTm0bg2z547AT3Sa7 irNjF6XjT9y2cvs1RiZlKv8iVj0V9nvdkUxfm4UNY1EMY6rDLygELhTrbBsCpQkkifq06HeJhpC T X-Gm-Gg: ASbGncuUvkKF0D2k9Jun25BAl2nqtz5ihBE6yGyFQCVioR9VK4g4H6iXa2p0gKPcPYh DNfUK1L2MehVGM2SKqLf2WyA+o0R/o/E9dUhvnx8+JYH8LxeIHetEDa/+uzBCstRe6/3e3m/+K2 vad0ZeuJ4zDLXYwzSc2hxCDWtfQsAtGUNgtk47da7J3Hpon91wcAMixjanAz6xebDdZW7fkOr7z he5WXwkknu3JS4vD7dqfBVdHq7XCdlvFvL4gB+SYbkX27NE+8pdW1dS4Sn4uODi0QmZvR1Qwb/1 WDB5EQTEoyfvw1fN1xQ6rn2XLQ24ButDTuPmOjtvP1wJenEHsAXvLf8= X-Received: by 2002:a17:90b:4cc1:b0:2ff:5cb7:5e73 with SMTP id 98e67ed59e1d1-3030feebe86mr22119927a91.23.1742878770766; Mon, 24 Mar 2025 21:59:30 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:30 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 10/29] exec/cpu-all: remove hw/core/cpu.h include Date: Mon, 24 Mar 2025 21:58:55 -0700 Message-Id: <20250325045915.994760-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102f.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 autolearn=unavailable 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index d4705210370..d4d05d82315 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -20,7 +20,6 @@ #define CPU_ALL_H #include "exec/cpu-common.h" -#include "hw/core/cpu.h" #include "cpu.h" From patchwork Tue Mar 25 04:58:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875956 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2474557wrb; Mon, 24 Mar 2025 22:01:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV9f7rsmk0+6t0JmrE7HK+U2JvYzCu9uJpdApKO7Kh4p198gEt2uuAoSRJyQ/znImamy4jJOw==@linaro.org X-Google-Smtp-Source: AGHT+IHJs668QryQOGYvN2B1T3u1zibE29w8BnVtepRKcnmzRQdHk5l0jC+8F9Vhav+dbVeIMFO/ X-Received: by 2002:a05:622a:2b0b:b0:476:850a:5b34 with SMTP id d75a77b69052e-4771dd94f25mr269526951cf.30.1742878868634; Mon, 24 Mar 2025 22:01:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878868; cv=none; d=google.com; s=arc-20240605; b=J22QYaRHtVQ+eHAL7CMND7NhOZW6upaFIOmuwBlx0fmV2sJTMtlihnM0iXIQsDVWqU 1IpR6stoOi1l2YD54H5nsZnNxt4twKVq5iOr/gCfQi+m1I/WyOg8DDdkLJ/7OC8Vd4ll X/IWZUlWWOGtFtM4eNC99RMFaSlCkrsyNAKQ3sYIpYaLcF8eNXBhMJONPQ3F4SG6W7YD Im0yO8p4KfMKXY9q/iQiE6k5dynfwegrOX3zxhU1svxU0mDKqqw0XLCSlXba7AU+Z63j y4KJzjct6zHqmpocjrJPMdKYJBDwZk/Rjz5kGYuXhQcTc79xNSvHRSKQSPRRIJK6l4C8 rqIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=nPsnrBhccWgusioYoG8wwAVpFwZsZiOnGsl/PTdMWhk=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=AB9seA7IgUyDvm03WuYCMvG51RMa2fp1iCcHdkjHZmkBoLxXvUk0lttXcnG20A4wq7 vP718LTyZhBkF6p02QDRAyjuE5xqqe7egHYZV3hWSvVQGLBRqHvcYUZ4mENQh+PXvUbS uktXpWWM8NsGs5wvcJK2Z8QhULEn9Y11EUWnwQX8zTiNEWftfgeP90ir060PWnVM9+8z j3VLA21BxxNcY6TPASfSINnAgTg52uSdEpCCe8xfTuKhNwhiI4644szSveAy7aOMS6Qf P4NE9j5dwFq6gJ6FeWZIPmlRv1h4GD++1jbamyRx+f3yhXT+Iz0uuHnDksjagn4p9wwg jWyg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QYQ5FLfG; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4771d4fe9efsi87730011cf.264.2025.03.24.22.01.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:01:08 -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=QYQ5FLfG; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOH-0004Bj-Lw; Tue, 25 Mar 2025 00:59:53 -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 1twwO0-0003oe-DB for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:38 -0400 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwNx-0005t5-L7 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:35 -0400 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-2ff694d2d4dso8328503a91.0 for ; Mon, 24 Mar 2025 21:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878772; x=1743483572; darn=nongnu.org; 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=nPsnrBhccWgusioYoG8wwAVpFwZsZiOnGsl/PTdMWhk=; b=QYQ5FLfGYyk0roLRa/859uMqIXXokqW6lfkv7UgrRuTAOGh1VcDHJHc4BBR12dD5Vl 4fJBglEvMEbo0/MDjcT3uLKKZ4FbGrmY/wnY78EWO27Pj9bMdUQ7I1sTD7y8pHClAEnT nJA2LRDzfnnrt8mlHPkeubt6yIKGcPayz+URqXGdcEWSzpXeFXpN6f0T11MeB2wp7MHi 1aZT1pWnA39n5E4aiJLnxV225XTS/rrjP3mO+fqSErXD7nkJKxcDuJj1VF+HFJpqOuex qgbFuEK4BIRnq/MbVs5QCw69MDzRlTtSOq7CO2IqIGmimg5YNn9jOYSJxoqTcbqgjzUV w7Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878772; x=1743483572; 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=nPsnrBhccWgusioYoG8wwAVpFwZsZiOnGsl/PTdMWhk=; b=dp6SU2H/7TynPO+MQr5dc/lAWKrpICEwChNW/bHty5KegyaeXgIuveGYt/zbTtjCGM 2kXjGbFZrzRzZvrvyAJrLR0LnXa3cqbAYpmrjnNNUivMkGGgLm5C0XS2zcmyzK0+Cgk5 LgobGo8JlnvNnpW7rQaD7ufpUTL3n/PN4F9ufpCV+9Qxbn0TM3ADs1ksIDBruQMpwagY 0Xni48IDnfT1k/le2kZZWsKzjfb2ryYoU1a7wDTFaB9i8GmmXTVBJ2o7NF/NHU27Hx3Z iY2Hnq+gH949cnsemLhI6Hq/eKBezUypnNjJ7iQP4yrZ5tEJw5GYSvPMb2H2s/rADMLl JI6g== X-Gm-Message-State: AOJu0Yw4uZPwQtE4VnZOqXTZSMrXN4QfO6X3vR3Lpgl2o/anmPBEUTNF of/0vQINa1vOol01IHljX+07k1pOfwTgv+yBCjyB7XhoigwiY8ddNOZRvlr53hTWSkKCZFjbbkr F X-Gm-Gg: ASbGnctToc+bayLDfoaMLtI1BFQ+lMdCyPTuQG73ZD7E62WmIN4m4I9R3hbO4Pk7gar NqKjphZbGC1AcPSsJxuhGU/YjbTs8ShejSXyaqg6wHJYb489FJEO6W0LxanpadgbmcrVvq1rsOc ezhuehlX4yjKFGy669alFS4uOGaYaeJPLgX0mDF6AqEngq9b1KzVRGUgwuHCx/z+5FkXuXJEfQa uPQ7h1NUW0Ge555DRF93OW8th/XtRtpacj7ZpH84U1O6TJKNtIaA2EGr7JP4n6Sieum/hbV5AcW bDMtuW1U+P5GKCm60OOvBdj7j6VFLBNFigc+QsaZNaoh X-Received: by 2002:a17:90b:4d:b0:2ee:db8a:2a01 with SMTP id 98e67ed59e1d1-3030ff00e7bmr22295807a91.30.1742878772239; Mon, 24 Mar 2025 21:59:32 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:31 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 11/29] accel/tcg: fix missing includes for TCG_GUEST_DEFAULT_MO Date: Mon, 24 Mar 2025 21:58:56 -0700 Message-Id: <20250325045915.994760-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1034.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 autolearn=unavailable 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 We prepare to remove cpu.h from cpu-all.h, which will transitively remove it from accel/tcg/tb-internal.h, and thus from most of tcg compilation units. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- accel/tcg/internal-target.h | 1 + include/exec/poison.h | 1 + accel/tcg/translate-all.c | 1 + 3 files changed, 3 insertions(+) diff --git a/accel/tcg/internal-target.h b/accel/tcg/internal-target.h index c88f007ffb7..05abaeb8e0e 100644 --- a/accel/tcg/internal-target.h +++ b/accel/tcg/internal-target.h @@ -9,6 +9,7 @@ #ifndef ACCEL_TCG_INTERNAL_TARGET_H #define ACCEL_TCG_INTERNAL_TARGET_H +#include "cpu-param.h" #include "exec/exec-all.h" #include "exec/translation-block.h" #include "tb-internal.h" diff --git a/include/exec/poison.h b/include/exec/poison.h index 4180a5a4895..8ec02b40e84 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -37,6 +37,7 @@ #pragma GCC poison TARGET_NAME #pragma GCC poison TARGET_SUPPORTS_MTTCG #pragma GCC poison TARGET_BIG_ENDIAN +#pragma GCC poison TCG_GUEST_DEFAULT_MO #pragma GCC poison TARGET_LONG_BITS #pragma GCC poison TARGET_FMT_lx diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index bb161ae61ad..8b8d9bb9a4a 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -43,6 +43,7 @@ #include "system/ram_addr.h" #endif +#include "cpu-param.h" #include "exec/cputlb.h" #include "exec/page-protection.h" #include "exec/mmap-lock.h" From patchwork Tue Mar 25 04:58:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875963 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475073wrb; Mon, 24 Mar 2025 22:02:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV2LHhaWtE8OJTC8bSduTc2wRHqedYsuiQ3vO8KJGB9wAzIo4jQKtElfwBtEh1Zedd9TW9LPA==@linaro.org X-Google-Smtp-Source: AGHT+IG00KH/IsDCz0/vn5KBH3dQEuh+uo9uYL2POZhi7ox0LQ/mcu+YLupLrWnMkiJ34Rct9fxe X-Received: by 2002:a05:620a:440f:b0:7c5:5cc4:ca63 with SMTP id af79cd13be357-7c5ba1e3f5cmr1907625085a.38.1742878956931; Mon, 24 Mar 2025 22:02:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878956; cv=none; d=google.com; s=arc-20240605; b=Gl+BrKf1HX0bFR3rHEJjIbW8VB4XsZ2ljazVEneZQHlKlVLbznu0pj8Gns0CN3x30f BZlxsx+TL2yzTtupOPVypXwFoMl1WpmN6T+IOj3zeYrjdYsTzTzeC/5RXg6a9YLyu3om VIQ4mYvorUIQskd+gDM5tN94u8QRftPpGbr2aQWOQDOYhz9ESyzIeHaTpsmN+W9Nc4mz csCI61/Vdv8f4+6VIx74TFnpNsAqs59GRYmdw8PQLpR2yE/ptZ9QIBq4RcXjiYJsT7sl Smenx2n1/viXhWgKuKp4ub9nS6Ro6EB6zc4hrOznQs5ymVTaGmkoPIAXzVZykmh4zujq r2tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Id5pPosDfyEQ/m8+tZSrdDNfNTCKXAcrGpGPGvWGZxY=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=UcraGqNCaMY4jLKXOyEu7PTlaQmj/J68mhl1NC6Vywr9raYbGkZ2KXcHl0CUR9nVwa 7t3iI4Yz3AM9KDzDuPSo8UvJjCWyFnGHYb+rwhp1f95hj/X3zQVSqAbiVYJIiSvQ1PYp 1LQUblzwTGnbb6NpB5e3NKDvg/Xk5HfGccLqQYgaxOVqk5DfCVy2kSSlvU7trDZOw7mh 2cjKiXSj6cFFFV7HOI6snhrJgf8rZno4OfZs38sKd/fReoe8wcNV9hiGj4WOKyfEMrn+ wMFW3nIQlTGj3fiwSTRamUuaA8w3k+eAy/258kxytcEXM5sxuZae678iXq4t49j4vNGW F80g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TSeIP6c3; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b93472basi925299885a.209.2025.03.24.22.02.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:02:36 -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=TSeIP6c3; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOG-0004A5-Sj; Tue, 25 Mar 2025 00:59:52 -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 1twwO2-0003sG-2d for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:39 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO0-0005tR-3P for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:37 -0400 Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-2ff694d2d4dso8328515a91.0 for ; Mon, 24 Mar 2025 21:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878773; x=1743483573; darn=nongnu.org; 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=Id5pPosDfyEQ/m8+tZSrdDNfNTCKXAcrGpGPGvWGZxY=; b=TSeIP6c3ghjxERHzQYkUL0ghewjcjRX5eCZYfJMPx5E5PuWK7LEM2kZg+NJMIbrUbX GD7KRu/EXPK0qnzK51rLwQfltU7Estv9sFFxCW0aX+KpDQtr2DLQxTan3xO1R25Kifkv qHDHz8G/t8qMBAfXSUzrtv8a1M/fDZ/l1V9FDKvfbaSik1QZyWLA7dtEOIZTD0wVUfw7 XyG/gf6qzEiF1LO8zKJL3A7hKS+Oy7T5SIp2o/ExQiNXrXssJ68tz9/blPQZSKYR9+Gy DHKPgV9HSaW8tpVVDlI3onHCpLEUwm4T0g24ZGCqRPMo7AmN47dR8BjOYXLxjKUTQhZ8 RQRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878773; x=1743483573; 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=Id5pPosDfyEQ/m8+tZSrdDNfNTCKXAcrGpGPGvWGZxY=; b=PDCX7SruUakh/nvMujfbhSJGm0ttwImPyWvm8u/1h7FUojQDmKSwhs5xmquDGnGB9Q ZIaleKhX8U1yiMrnmJPeC6kMp2VZaJjzN7Gw2z3XYXLZeoSZgxHOV/RgO0x77uOkdEHf d1yBc3qpIFu6xzyAG4/NY0o2+/6XiG0UKvXs+E6EzsVQVcltttQk6M9hycOEQiQazC8Y NRXPMmrX2JqT8PgI5DQqg8IBPrwBwDJmqOJeeEFCBdj17UqhG6lzXRvFSKWzuRn1BA95 zfMcFPJDsWVnp6H4bN5ZFB5CuYoV4l9KR9SP/ceRBPjacUyatuvwDk9tsezR+teGm/ZY IhUQ== X-Gm-Message-State: AOJu0YyqGtum7F2hy10+Mn/G8JGZZPwYVeaOt7FJZfoDpDkFUyMrTG1h i/s2sdKt80s65v/ENhLxPY/9CQyDEDEWfoPoB6H7EtGDPjxCcyN+h4cvqhLTUXzzbetvc3QMkEZ T X-Gm-Gg: ASbGncvl3UrT/OqZ2piJJ6AZkqsDvOxiql38XdMXkfiEJs1VVSzpCMnT+5aI2u4om8N 7aDcNsmKipL3M9SO6x9YOscgaWOdRSnULQife1f4+P0MfrnjolTHop2RWfqdFbRn12nnWd74gO8 pxJ7xtidSrxqf2ER2Aue1peP1y4ddzFCYv1By1pXEu0oX62WGkqmZadBc/aQKKuDVNBZ7Hrk8wC fzPhZg93SzWsqWdQiOCput1K6Y6BtujjZos5rTjgK9wDFOKAjs/e8Fwz5kupQab8Q2UqT4RxBRz Us06CjeceefnkicKCftnrINB/c5Qw3/uiIyycXbbuRgD X-Received: by 2002:a17:90b:1b46:b0:2ee:ee5e:42fb with SMTP id 98e67ed59e1d1-3030fe7f1a6mr19332641a91.13.1742878773114; Mon, 24 Mar 2025 21:59:33 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:32 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 12/29] accel/tcg: fix missing includes for TARGET_HAS_PRECISE_SMC Date: Mon, 24 Mar 2025 21:58:57 -0700 Message-Id: <20250325045915.994760-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1029.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 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 We prepare to remove cpu.h from cpu-all.h, which will transitively remove it from accel/tcg/tb-internal.h, and thus from most of tcg compilation units. Note: this was caught by a test regression for s390x-softmmu. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/poison.h | 1 + accel/tcg/tb-maint.c | 1 + accel/tcg/user-exec.c | 1 + 3 files changed, 3 insertions(+) diff --git a/include/exec/poison.h b/include/exec/poison.h index 8ec02b40e84..f267da60838 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -38,6 +38,7 @@ #pragma GCC poison TARGET_SUPPORTS_MTTCG #pragma GCC poison TARGET_BIG_ENDIAN #pragma GCC poison TCG_GUEST_DEFAULT_MO +#pragma GCC poison TARGET_HAS_PRECISE_SMC #pragma GCC poison TARGET_LONG_BITS #pragma GCC poison TARGET_FMT_lx diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c index d5899ad0475..efe90d2d695 100644 --- a/accel/tcg/tb-maint.c +++ b/accel/tcg/tb-maint.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/interval-tree.h" #include "qemu/qtree.h" +#include "cpu.h" #include "exec/cputlb.h" #include "exec/log.h" #include "exec/exec-all.h" diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 667c5e03543..9d82d22bf40 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "accel/tcg/cpu-ops.h" #include "disas/disas.h" +#include "cpu.h" #include "exec/vaddr.h" #include "exec/exec-all.h" #include "exec/tlb-flags.h" From patchwork Tue Mar 25 04:58:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875975 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2476093wrb; Mon, 24 Mar 2025 22:05:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUq18YqCAYzTIoSvExakl/M87xWXTl3cr3IF4oQkNyqrTSbnWw/PdaLzht3f2UHX38ZagEdiw==@linaro.org X-Google-Smtp-Source: AGHT+IF5Lc818524Irt/UKEdVUTxvEupP4ChmhRpYFnddhgrcNzDxA7BIGrIgD78uD6fcFc+tIYQ X-Received: by 2002:a05:622a:248e:b0:477:dc1:1991 with SMTP id d75a77b69052e-4771dd8a00cmr207937551cf.17.1742879149205; Mon, 24 Mar 2025 22:05:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879148; cv=none; d=google.com; s=arc-20240605; b=kA9qkKYobMkuC604nv1nYDaLnUQzWeHuQNfVD1WI3Mg7IGOwpi+6GIBAA59W9ourTB Xs7Bk1aU0tSyXneb7/4eTTj1tDMX4YuIuMHSWt3Pg+akg0IMCDrh5L0LsKjddQzOqxQv nxrWJ8GT7l/N1dSmmjaUG9gxiF6qCkooRf/iFfN2Ke3+JUrCeOVxxWgT9TRILS4FqQIV pEECGpufL2uIGqU5DXFCGktv+yPB/2QCwmZc9GksHjzh2L+RHm5vuoTPLG6A1NzS7MDO DYrgEYofgi3wlRNrQxAUj/gk49WuM2qnkWsuGiDBV7Y14Z1Cum5IHOpUnx2gerETxU4P Mv+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=suKjzNx+ro19ZSxlCmxY92LJNBi/ThyI6kfAqCnEFLE=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=Ja1Mjculvx2A4IoCEKF+109wIIhK09/vly6iPm3hJ9mC7pyQ1yEE7DxgwYlOl1gP85 W6Lxw2RrgGtrOV/NKOR/x+7mY/pJBm9JWrhIgGvBOUwvKSKyU0970VZn8hNL3tUuZqPz xMpTAsxCZDaibOZMLDWFI7v8A78GHK0G2D7l4xDnW640Piofc6E3FmZhw6UzQWDpFvnS FctUMrhpClmrph1IoinFK/Wp0S0Lt+FATZMhZDfMFwaj4jI64NmFgmp6y8HeOhieeddf H5drQc3+pOjX+Kc6lbftJ2eZ4oG0QCP11/q/noukWrIt4UueNUoDm3Omxc4eosLyQ8Hm cFTg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PWcmRIvr; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4771d4fe681si87370801cf.261.2025.03.24.22.05.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:05:48 -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=PWcmRIvr; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOM-0004No-Ju; Tue, 25 Mar 2025 00:59:58 -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 1twwO2-0003t2-Mx for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:39 -0400 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO0-0005to-43 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:38 -0400 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-3014ae35534so7976714a91.0 for ; Mon, 24 Mar 2025 21:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878774; x=1743483574; darn=nongnu.org; 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=suKjzNx+ro19ZSxlCmxY92LJNBi/ThyI6kfAqCnEFLE=; b=PWcmRIvrxmaIoyjQruE48FxCPdRveh3YTNKfiRVtrvw3RkCdDHlqbHVKKzY/MoBfIy MFu2TptdoX2LkwqCehAJHrykKTjGNPe50S1NCv4GePda0Tq9ZV1VZGVVjqdziQoQZCcH +p4OtsLJ4FvSJtDtY3gnKWi5+XESqOuKFVVZk5ZRpy/QlnYItZ4LAIjqAGk2y+e6HSA2 AsA56jC/xLlwijWP1dLcQMl91QHhDm1xnpZ8ilECbG/DKeoMgBEywxn2Y+z2hRESGJFo WuXKPNu3zHJUZB6FLibXPyUXY6xWp9tUuRRPlehr/h5xSiA4KII4YpzZiiFeIrGTg6QI N71A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878774; x=1743483574; 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=suKjzNx+ro19ZSxlCmxY92LJNBi/ThyI6kfAqCnEFLE=; b=B528iJhY/X+At1vmB477+cmV28ou0qdmlTUBEQy/tEbHIfWMtk+fK7pTbP9B5zKRXC gw0BknennPHU3OC7QG49oMjBiheXwkl+qTWkQcw5MPv7eWWArsx8uOCM5au+mhxxi88d bz9OulvJ+8uzrOmbYivbmZsQCgJJqU2MRf19EF2q58/vKCGIq0Iyhb+qRPSZa1rYGmfg P/UN3jydB+4t9lbvC/rq4tGvRg+EXHnogiN9QMccfkywhACCQ5Bn/qSaeXVegD5Yj7n0 hNIhb25TLYorKM/O655287RevNtkTC+090NBBNy2fk5ycI33cvzz83ew0mkM2ounAY/z SDqA== X-Gm-Message-State: AOJu0YyraJksizTNGe3EXmVaK1Np3QktPfA72TMnfu2GKjhbNN04hqwp MfVLVMQBF1kaLIqLessFl5O3DoaER4lK99tuys5TM/8uYAnM4h+21E51yRE1B3woNruxlRLxcIV l X-Gm-Gg: ASbGncugJ2Va8x7142D7No1k9IOFpOLRryRe8BzYQL7v7nXrC2D59YZvK97gqcHHIux ieQUElp06elpM45MRk5T9FxS3uF2gGdwfpSCdpweJmxYWIk0uFog5yUyaptNQYiRNarstGZkuXO Nr4H14nICIbE9eQDXVCqN6FvV3GHoDr5s2UqIRtq43ywSaOnHoBLCY2dtVDtu210qj9nxxMnPhV LqNL4TJc1VKK4/3ms4ZlsN2aeuGrUcbguZJneDa4OrqorZ4eQ93evFtEH9gcnOjow7QRIxf2wXa pN1oHNULcNnOFMzK2vqeDtZsq3ES+f19/XSLax6qhOrXRsNtzd+4BdY= X-Received: by 2002:a17:90b:3e47:b0:2f4:4500:bb4d with SMTP id 98e67ed59e1d1-3030fec4e66mr25832284a91.20.1742878774134; Mon, 24 Mar 2025 21:59:34 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:33 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 13/29] exec/cpu-all: remove cpu include Date: Mon, 24 Mar 2025 21:58:58 -0700 Message-Id: <20250325045915.994760-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1034.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 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 Now we made sure important defines are included using their direct path, we can remove cpu.h from cpu-all.h. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 2 -- accel/tcg/cpu-exec.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index d4d05d82315..da8f5dd10c5 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -21,6 +21,4 @@ #include "exec/cpu-common.h" -#include "cpu.h" - #endif /* CPU_ALL_H */ diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 207416e0212..813113c51ea 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -36,6 +36,7 @@ #include "exec/log.h" #include "qemu/main-loop.h" #include "exec/cpu-all.h" +#include "cpu.h" #include "exec/icount.h" #include "exec/replay-core.h" #include "system/tcg.h" From patchwork Tue Mar 25 04:58:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875964 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475110wrb; Mon, 24 Mar 2025 22:02:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXaiMGYr1iguiY9RMdXTcQm5bjnJOWVt5N3u0D+6Y5M/VIFZCqR2WQtp8FiYoBDp8+5ZBAw3Q==@linaro.org X-Google-Smtp-Source: AGHT+IHGsyC5drYU7eLqfYRli2yS2L3+/2KKA5m11AFtIy+9CmDV5RBWiZuIzeKtjGSaBF41gLyY X-Received: by 2002:a05:620a:1a89:b0:7c3:bc90:a46b with SMTP id af79cd13be357-7c5ba13365emr2312558985a.1.1742878962768; Mon, 24 Mar 2025 22:02:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878962; cv=none; d=google.com; s=arc-20240605; b=UlRUlEtzWl94vwBJZ69x6TiQccbWNI6kEnAijGgRQOdqh697Ssiaxe8gOWJ89TQydZ DGUg5l3jQGw82RQ/uXtqN4GSU1sVckURYaWfYiIgVoCUfEA8ROIIB+tLkaWRGB757GCn KLp0/96Tdv0KaEFKe/yG7cy+us4J3YMmYzO1LLjyfLzxf4GI/lb7j2FYIu8HEijNNCJf fPIIrURG+KKH5Wxz+XCV+OjCbx+k1f8ZGx+IYKX83hx1zAJSZRlHdOdEU4nT/+n4GWmf DuK0sa/6yOM5hq8x63woX6/E4X4xEGOIshafwkWU21MeYKNG5IbBsPkXIRUWwjHahC/6 8bCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=da9qCgJ+S1UaM0j+OYD82icAp+J1ucJQQo9Biij6cxI=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=FIxYIK/1dqboZor/9WgZIpgzHk5ZHmSb32g1+E6+xliEqPWXGax0pGs7iNWUSM6G+b xQ0PGqAjOUaA5T2rGJrSivwyrDS+I05A1ei4GkqF0A6JbP3M7bG6C22rserD4s0RuSgL e8OgUvAYd/GkQ9omsxfsMIiRtLVno8ZnHaVJOmdP+6YgmtIDi0ftSBVw1dF8xR0FV1ac CeIFYZ/+zk/BaLKxR7A7zF6BdTAo+b6zLap5ai71JcZSvcXCYiMotvCgyqL14bea51fP 76HIO2/M1uR5jYa7TKTyWBe+fqleN+ViTNzhYddFTZ7wVAKVF7CgqeJnPm7SOL/sjfnm c6Mw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P5qbc44y; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b935787bsi896771685a.374.2025.03.24.22.02.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:02:42 -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=P5qbc44y; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOI-0004EG-Fb; Tue, 25 Mar 2025 00:59:54 -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 1twwO4-0003tB-0E for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:40 -0400 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO0-0005ty-M1 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:39 -0400 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-300fefb8e06so9161060a91.0 for ; Mon, 24 Mar 2025 21:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878775; x=1743483575; darn=nongnu.org; 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=da9qCgJ+S1UaM0j+OYD82icAp+J1ucJQQo9Biij6cxI=; b=P5qbc44yqxpd4FwvDAY8ku4vCk+v0BahlK7LS9O15nkQd4cnklhgNOIJKJuFs+NxVt PhUNFyYPnKIeoF9W3jmM20NhR0BUNhRMjXm+yAfecazQ57uCtOvjTLHc4ObKCWB1PlPT bwd7qxzIT3PN4pKeRWEs0LfjN7XKdYp50tmtQzy0KZ2fKKI04NmBEGVIAC361X7c7luK H37Ld6O2Tmkv6+E3z/IvtZClbwOmg0vK0ityWfp/jP6TAVfQ70CFeebsaKnfAiUUwoU/ 3iMV5F/cWc8R9FEC2oecEcaSVgIvASbQk54T9xlGCKleyus1VT3km9N/0I2EqZUAA1SW MP9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878775; x=1743483575; 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=da9qCgJ+S1UaM0j+OYD82icAp+J1ucJQQo9Biij6cxI=; b=E/uSAd6/gBBVnSu3UHe8kgt+8+NdKIzAGrhY3AlnswnJsN7QYhx0eepdkxZ4l+5I+I qTVsZAnkI26f62Ge3duKq2FnJYgv5xx+yVebSW9rO4V/SylnpMxrrTr/8ZCU/byH+ewc jOLIqB2solcZpUFqM3dLldjbYXjAVgAZA0ZGDSFOdTPsO9okNmUv9/Ril7b0cO6aRpC/ 5OhGdpuGCN08xy+79kTo3c6ggJu3F52k5VssotkLi4G2hYsxG63opm99WFMxCfxpqhOa h5b1GfnDgy7SUubExcR0CJ5UwsfLvhp6PbgmpSKv9AaNytULUfpdhvrEkVF4z3KsJQSP EvtQ== X-Gm-Message-State: AOJu0Yx1mPDqifGeuveryQ83MBAIUc70CLrv/K1Iuv+nrrb8Wk0/PDQe gnJt+czCN+UMxAYjLsBpGufE7OF6MCua9xxSdvSbacBte3a/2jQ31kY2LHVroiqwXOFVBfafHBy 4 X-Gm-Gg: ASbGncs/hRGdPRVJVnWPTXYVNkpJoT626Y7tqs9x7MxCS2fMTFCjtXdl4zt3T/A6Ikl eoCcx9aVydc4thr3qZaVFPvxbAFhTjhbvLyxym1vfl3Pmf19hbBh4OdTtVOGPGdQA8VIfurAxoa PfnR6c0lFN/AenRfdJRWQ1ZB2qRvl+xHzKTu9OeH40EU4VMaV8rK9e5FF2Yrp0d2QGdWDWF5C7M DTUbKlcexnLmXOzf+/wCEES0i8CXrLEdHW0nMWerIxgdAm1NPBPateBcGOmGCCg+FWUZsUOlOQM ckCdqQo+MCSBOUW21YHsL5kwQo9YsbGrxvFrjmckVIny X-Received: by 2002:a17:90b:4b8e:b0:2f9:c139:b61f with SMTP id 98e67ed59e1d1-3030fe8bdf1mr32282657a91.14.1742878775136; Mon, 24 Mar 2025 21:59:35 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:34 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 14/29] exec/cpu-all: transfer exec/cpu-common include to cpu.h headers Date: Mon, 24 Mar 2025 21:58:59 -0700 Message-Id: <20250325045915.994760-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1034.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 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 2 -- include/exec/cpu_ldst.h | 1 + target/alpha/cpu.h | 1 + target/arm/cpu.h | 1 + target/avr/cpu.h | 1 + target/hexagon/cpu.h | 1 + target/hppa/cpu.h | 1 + target/i386/cpu.h | 1 + target/loongarch/cpu.h | 1 + target/m68k/cpu.h | 1 + target/microblaze/cpu.h | 1 + target/mips/cpu.h | 1 + target/openrisc/cpu.h | 1 + target/ppc/cpu.h | 1 + target/riscv/cpu.h | 1 + target/rx/cpu.h | 1 + target/s390x/cpu.h | 1 + target/sh4/cpu.h | 1 + target/sparc/cpu.h | 1 + target/tricore/cpu.h | 1 + target/xtensa/cpu.h | 1 + cpu-target.c | 1 + 22 files changed, 21 insertions(+), 2 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index da8f5dd10c5..b488e6b7c0b 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -19,6 +19,4 @@ #ifndef CPU_ALL_H #define CPU_ALL_H -#include "exec/cpu-common.h" - #endif /* CPU_ALL_H */ diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 82e67eff682..313100fcda1 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -66,6 +66,7 @@ #error Can only include this header with TCG #endif +#include "exec/cpu-common.h" #include "exec/cpu-ldst-common.h" #include "exec/cpu-mmu-index.h" #include "exec/abi_ptr.h" diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index 42788a6a0bc..fb1d63527ef 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -21,6 +21,7 @@ #define ALPHA_CPU_H #include "cpu-qom.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 958a921490e..ee92476814c 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -24,6 +24,7 @@ #include "qemu/cpu-float.h" #include "hw/registerfields.h" #include "cpu-qom.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/gdbstub.h" diff --git a/target/avr/cpu.h b/target/avr/cpu.h index 714c6821e2f..f56462912b9 100644 --- a/target/avr/cpu.h +++ b/target/avr/cpu.h @@ -22,6 +22,7 @@ #define QEMU_AVR_CPU_H #include "cpu-qom.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index f78c8f9c2a0..e4fc35b112d 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -21,6 +21,7 @@ #include "fpu/softfloat-types.h" #include "cpu-qom.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "hex_regs.h" #include "mmvec/mmvec.h" diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 986dc655fc1..5b6cd2ae7fe 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -21,6 +21,7 @@ #define HPPA_CPU_H #include "cpu-qom.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "system/memory.h" diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 64706bd6e5d..38ec99ee29c 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -23,6 +23,7 @@ #include "system/tcg.h" #include "cpu-qom.h" #include "kvm/hyperv-proto.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/memop.h" diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h index 1dba8ac6a7c..167989ca7fe 100644 --- a/target/loongarch/cpu.h +++ b/target/loongarch/cpu.h @@ -9,6 +9,7 @@ #define LOONGARCH_CPU_H #include "qemu/int128.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "fpu/softfloat-types.h" diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 451644a05a3..5347fbe3975 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -21,6 +21,7 @@ #ifndef M68K_CPU_H #define M68K_CPU_H +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index d29681abed4..90d820b90c7 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -21,6 +21,7 @@ #define MICROBLAZE_CPU_H #include "cpu-qom.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "qemu/cpu-float.h" #include "exec/cpu-interrupt.h" diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 29362498ec4..79f8041ced4 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -2,6 +2,7 @@ #define MIPS_CPU_H #include "cpu-qom.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #ifndef CONFIG_USER_ONLY diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index c153823b629..f16a070ef6c 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -21,6 +21,7 @@ #define OPENRISC_CPU_H #include "cpu-qom.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "fpu/softfloat-types.h" diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 7489ba95648..aa5df47bdaf 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -22,6 +22,7 @@ #include "qemu/int128.h" #include "qemu/cpu-float.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "cpu-qom.h" diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 556eda57e94..14a6779b4c1 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -23,6 +23,7 @@ #include "hw/core/cpu.h" #include "hw/registerfields.h" #include "hw/qdev-properties.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/gdbstub.h" diff --git a/target/rx/cpu.h b/target/rx/cpu.h index 5f2fcb66563..e2ec78835e4 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -23,6 +23,7 @@ #include "hw/registerfields.h" #include "cpu-qom.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 0a32ad4c613..83d01d5c4e1 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -27,6 +27,7 @@ #include "cpu-qom.h" #include "cpu_models.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index 18557d8c386..7581f5eecb7 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -21,6 +21,7 @@ #define SH4_CPU_H #include "cpu-qom.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 923836f47c8..5dc5dc49475 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -3,6 +3,7 @@ #include "qemu/bswap.h" #include "cpu-qom.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index cf9dbc6df8e..abb9cba136d 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -22,6 +22,7 @@ #include "cpu-qom.h" #include "hw/registerfields.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "qemu/cpu-float.h" #include "tricore-defs.h" diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 66846314786..c5d2042de14 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -30,6 +30,7 @@ #include "cpu-qom.h" #include "qemu/cpu-float.h" +#include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "hw/clock.h" diff --git a/cpu-target.c b/cpu-target.c index 587f24b34e5..52de33d50b0 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -23,6 +23,7 @@ #include "qemu/qemu-print.h" #include "system/accel-ops.h" #include "system/cpus.h" +#include "exec/cpu-common.h" #include "exec/tswap.h" #include "exec/replay-core.h" #include "exec/log.h" From patchwork Tue Mar 25 04:59:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875959 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2474864wrb; Mon, 24 Mar 2025 22:02:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXjlBm3gLnKnsWaJQzY+fhjLbWsR4b4FC9nS3dvFIW3mZam7AooCpJ7nPfULJBVPBYULoCeZQ==@linaro.org X-Google-Smtp-Source: AGHT+IGp5AMEsRgd2QOAS8JNE14bquTj518583nGYvFLmfeaoqSYRE9jE1LCOnL+KQXzc7yoP2uh X-Received: by 2002:a05:6214:226f:b0:6d8:b733:47c with SMTP id 6a1803df08f44-6eb3f187d4dmr268965376d6.22.1742878921735; Mon, 24 Mar 2025 22:02:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878921; cv=none; d=google.com; s=arc-20240605; b=ahcucmAHBXmxL57WLTPTWLTC2KqjW41Pbi1SR9CkuTdBDL/w+zd7XYb+xMxU4Mp4/4 lfu+kFK81SCnXNI34TmtbYu8ZvWmqw6gTg7/iDuhLq7q3/W9t99Ugm8jJ8ttC3Y1NEYA v9/j7nr16GsH2Bu0DdVDHHY+OH+a/sYqfYzlVmmXdLTx+4ve4pd1XUa/Gcxvz8+IQNRZ VpUYiqJcJdu6oPVsREbsRMEEe/XkPChOMN05e4zfn1JAY4mJEPyGnQUGuRd0/as77hJ1 va2CVJaLjK0a6xPLAXC9oEy3aawdP6WGOCD2qtnStc2X0OTlNqeCNlc8oYF8IL1pP0th usqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=CVyG0kIcVLRXO6baEd2Ol9qJEXT6CArKdwqsG/9PeUc=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=azQr2wBfqWsNBEdqGS/uyyED4tpOEKIZE8njjXMZusnbJgmtsbflH9qMB1wTWzDlf3 a71vPZWFpYu1kpT4il0jWe10rdUjVp/RuZYo3iv64pQcNMSKJ9FoNoAM/Ec038hxAr6m 5duZ/f0mVCMeJ+bJrDWnzFciiz59q3uvj/KBQWYwOqYeY4+yBdF2BLFPqwYUxqLH3LYw 7RGkHj+HvKRhqPWhpx4QuFYtll/an1AOtHzfdfr2oF5ZJxMnM8yjO5pgz37/CzJJr+zq VF8P4mIyNEvfxTMQFK+U93t2vuM7jeFGUWZ5wQsu5oaMMCziR7Ln0HJMnPdbmvlmbHE8 63MA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MRS70EwQ; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eb3eff33f9si92810386d6.232.2025.03.24.22.02.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:02:01 -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=MRS70EwQ; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwPY-000586-IW; Tue, 25 Mar 2025 01:01:14 -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 1twwO4-0003ve-Fx for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:40 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO1-0005uV-QC for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:40 -0400 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-2ff615a114bso9041284a91.0 for ; Mon, 24 Mar 2025 21:59:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878776; x=1743483576; darn=nongnu.org; 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=CVyG0kIcVLRXO6baEd2Ol9qJEXT6CArKdwqsG/9PeUc=; b=MRS70EwQYhnSLD8ynToi2SxDgkRkBP6MNl2Kg3NSSblRDj2fQ42UvsfYzA8i2xkc+R WATZ9YUEbcKtkjQHZ7SqxcM+5CDphdRV0fr4Q143lUQ8mSRlqhyVKjgDGWOeJbWae/4a lFAsrpEJfrB0j80Beegy6yBqfv5tKqhN3yVd8QNvQ6fao5Ig36oXlxg9CCwr7LtzTGtx 3v+GZIx0ExDOmrZj1MTCVLHD95PVFpi8qx3fm2rdQ9VM9i8iq8foIYeFjk6KzbLffxIU KByZfXaFGWjSnKTgG1+6A57ignypRNm/Pparvy6RaAnxrix+UPbu3k0XR49yEPEX/hrh 6FJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878776; x=1743483576; 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=CVyG0kIcVLRXO6baEd2Ol9qJEXT6CArKdwqsG/9PeUc=; b=ZkHOpqnOpHwS++c4lZHkRimRQpKlRZebII4SMMGTJDmjCEMo0qC58rDkDsbdp81CXG tTJjACkDSN53cyJA5KqzFMhhg6WGfxTEkFjasHNsDzrGsPDUFtSqWMzCFMIV2hNy3lcq 6rsE6gStDzwfDwvoh3yROHLCqV/ogmTUH2mwpTyCH7+e3Vb2NXeebpnMm55m3hW6diL1 cjVVOSOslJfKsJn51aZareGDurmy4meYu4LwqZK3G1Ab0yoaBziqvkaoAqq2D+sl7eNx jfcZWB9SzIfvlSrOGMuVDZNbZOd5LEeeU5CWqf2gGjsuI3UaS4oRmHHxREeHZMf4VxeU O9ZA== X-Gm-Message-State: AOJu0YxVrNRr/MGyvEkXfoIIlCa+Wcmsu9j5ggssBVWpVxqieCPcABWd Vx9GMGOObT7nhuTAP5aeGLWg2Ere6JN5Mb5+LDswrCod8YAV3WmxZnyab9duYyz1ZwFOPYp4BIv a X-Gm-Gg: ASbGnctaQus5F0ztZ4NtszeMc5iTRMxGBD3YSQMy3ri2mDLPsPGINJdnYbiXNlEsI5q bH+gRDNHYHjQg8ifD27MzfY0b+5UcOiIyWG1vMz1tfq1Px1U+sh3GBObgqvdjowW9veVrlEVSf8 fw2xSqstfYBzDt7J4S0SmiXWxY4pOYImCQIj8RnCyH2JCU5tKTaYzeFtA6jf2/wJAp250cprNt1 nKZDnAHUE0z1k7t4fCyuvqySDuqSeuhPuW1eENeCNMjI8LglQ6Cmup//lpy8J4b5KO9DvzqXiTz VPCl/butjRp5/J/93Ls+RZhCOVSHdcSD9eFG1nyyJ039 X-Received: by 2002:a17:90b:4b09:b0:2fe:b907:5e5a with SMTP id 98e67ed59e1d1-301d42f2f58mr31461523a91.10.1742878776141; Mon, 24 Mar 2025 21:59:36 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:35 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 15/29] exec/cpu-all: remove this header Date: Mon, 24 Mar 2025 21:59:00 -0700 Message-Id: <20250325045915.994760-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1035.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 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- accel/tcg/tb-internal.h | 1 - include/exec/cpu-all.h | 22 ---------------------- include/hw/core/cpu.h | 2 +- include/qemu/bswap.h | 2 +- target/alpha/cpu.h | 2 -- target/arm/cpu.h | 2 -- target/avr/cpu.h | 2 -- target/hexagon/cpu.h | 2 -- target/hppa/cpu.h | 2 -- target/i386/cpu.h | 1 - target/loongarch/cpu.h | 2 -- target/m68k/cpu.h | 2 -- target/microblaze/cpu.h | 2 -- target/mips/cpu.h | 2 -- target/openrisc/cpu.h | 2 -- target/ppc/cpu.h | 2 -- target/riscv/cpu.h | 2 -- target/rx/cpu.h | 2 -- target/s390x/cpu.h | 2 -- target/sh4/cpu.h | 2 -- target/sparc/cpu.h | 2 -- target/tricore/cpu.h | 2 -- target/xtensa/cpu.h | 2 -- accel/tcg/cpu-exec.c | 1 - semihosting/uaccess.c | 1 - tcg/tcg-op-ldst.c | 2 +- 26 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 include/exec/cpu-all.h diff --git a/accel/tcg/tb-internal.h b/accel/tcg/tb-internal.h index 68aa8d17f41..67e721585cf 100644 --- a/accel/tcg/tb-internal.h +++ b/accel/tcg/tb-internal.h @@ -9,7 +9,6 @@ #ifndef ACCEL_TCG_TB_INTERNAL_TARGET_H #define ACCEL_TCG_TB_INTERNAL_TARGET_H -#include "exec/cpu-all.h" #include "exec/exec-all.h" #include "exec/translation-block.h" diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h deleted file mode 100644 index b488e6b7c0b..00000000000 --- a/include/exec/cpu-all.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * defines common to all virtual CPUs - * - * Copyright (c) 2003 Fabrice Bellard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see . - */ -#ifndef CPU_ALL_H -#define CPU_ALL_H - -#endif /* CPU_ALL_H */ diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 1c63266f072..76a9b2c37db 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -582,7 +582,7 @@ QEMU_BUILD_BUG_ON(offsetof(CPUState, neg) != static inline CPUArchState *cpu_env(CPUState *cpu) { - /* We validate that CPUArchState follows CPUState in cpu-all.h. */ + /* We validate that CPUArchState follows CPUState in cpu-target.c */ return (CPUArchState *)(cpu + 1); } diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index b915835bead..8782056ae48 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -206,7 +206,7 @@ CPU_CONVERT(le, 64, uint64_t) * (except for byte accesses, which have no endian infix). * * The target endian accessors are obviously only available to source - * files which are built per-target; they are defined in cpu-all.h. + * files which are built per-target; they are defined in system/memory.h. * * In all cases these functions take a host pointer. * For accessors that take a guest address rather than a diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index fb1d63527ef..849f6734894 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -289,8 +289,6 @@ void alpha_cpu_dump_state(CPUState *cs, FILE *f, int flags); int alpha_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int alpha_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); -#include "exec/cpu-all.h" - enum { FEATURE_ASN = 0x00000001, FEATURE_SPS = 0x00000002, diff --git a/target/arm/cpu.h b/target/arm/cpu.h index ee92476814c..ea9956395ca 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2968,8 +2968,6 @@ static inline bool arm_sctlr_b(CPUARMState *env) uint64_t arm_sctlr(CPUARMState *env, int el); -#include "exec/cpu-all.h" - /* * We have more than 32-bits worth of state per TB, so we split the data * between tb->flags and tb->cs_base, which is otherwise unused for ARM. diff --git a/target/avr/cpu.h b/target/avr/cpu.h index f56462912b9..b12059ee089 100644 --- a/target/avr/cpu.h +++ b/target/avr/cpu.h @@ -246,6 +246,4 @@ bool avr_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); -#include "exec/cpu-all.h" - #endif /* QEMU_AVR_CPU_H */ diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index e4fc35b112d..c065fa8ddcf 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -158,6 +158,4 @@ void hexagon_translate_init(void); void hexagon_translate_code(CPUState *cs, TranslationBlock *tb, int *max_insns, vaddr pc, void *host_pc); -#include "exec/cpu-all.h" - #endif /* HEXAGON_CPU_H */ diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 5b6cd2ae7fe..2269d1c1064 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -306,8 +306,6 @@ struct HPPACPUClass { ResettablePhases parent_phases; }; -#include "exec/cpu-all.h" - static inline bool hppa_is_pa20(const CPUHPPAState *env) { return env->is_pa20; diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 38ec99ee29c..049bdd1a893 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2607,7 +2607,6 @@ int cpu_mmu_index_kernel(CPUX86State *env); #define CC_SRC2 (env->cc_src2) #define CC_OP (env->cc_op) -#include "exec/cpu-all.h" #include "svm.h" #if !defined(CONFIG_USER_ONLY) diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h index 167989ca7fe..a7d6c809cf4 100644 --- a/target/loongarch/cpu.h +++ b/target/loongarch/cpu.h @@ -503,8 +503,6 @@ static inline void cpu_get_tb_cpu_state(CPULoongArchState *env, vaddr *pc, *flags |= is_va32(env) * HW_FLAGS_VA32; } -#include "exec/cpu-all.h" - #define CPU_RESOLVING_TYPE TYPE_LOONGARCH_CPU void loongarch_cpu_post_init(Object *obj); diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 5347fbe3975..0b70e8c6ab6 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -596,8 +596,6 @@ void m68k_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, MemTxResult response, uintptr_t retaddr); #endif -#include "exec/cpu-all.h" - /* TB flags */ #define TB_FLAGS_MACSR 0x0f #define TB_FLAGS_MSR_S_BIT 13 diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 90d820b90c7..2bfa396c96d 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -411,8 +411,6 @@ void mb_translate_code(CPUState *cs, TranslationBlock *tb, #define MMU_USER_IDX 2 /* See NB_MMU_MODES in cpu-defs.h. */ -#include "exec/cpu-all.h" - /* Ensure there is no overlap between the two masks. */ QEMU_BUILD_BUG_ON(MSR_TB_MASK & IFLAGS_TB_MASK); diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 79f8041ced4..20f31370bcb 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1258,8 +1258,6 @@ static inline int mips_env_mmu_index(CPUMIPSState *env) return hflags_mmu_index(env->hflags); } -#include "exec/cpu-all.h" - /* Exceptions */ enum { EXCP_NONE = -1, diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index f16a070ef6c..19ee85ff5a0 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -334,8 +334,6 @@ void cpu_openrisc_count_stop(OpenRISCCPU *cpu); #define CPU_RESOLVING_TYPE TYPE_OPENRISC_CPU -#include "exec/cpu-all.h" - #define TB_FLAGS_SM SR_SM #define TB_FLAGS_DME SR_DME #define TB_FLAGS_IME SR_IME diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index aa5df47bdaf..3c02f7f7d45 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1704,8 +1704,6 @@ void ppc_compat_add_property(Object *obj, const char *name, uint32_t *compat_pvr, const char *basedesc); #endif /* defined(TARGET_PPC64) */ -#include "exec/cpu-all.h" - /*****************************************************************************/ /* CRF definitions */ #define CRF_LT_BIT 3 diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 14a6779b4c1..867e539b53a 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -634,8 +634,6 @@ G_NORETURN void riscv_raise_exception(CPURISCVState *env, target_ulong riscv_cpu_get_fflags(CPURISCVState *env); void riscv_cpu_set_fflags(CPURISCVState *env, target_ulong); -#include "exec/cpu-all.h" - FIELD(TB_FLAGS, MEM_IDX, 0, 3) FIELD(TB_FLAGS, FS, 3, 2) /* Vector flags */ diff --git a/target/rx/cpu.h b/target/rx/cpu.h index e2ec78835e4..5c19c832194 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -147,8 +147,6 @@ void rx_translate_code(CPUState *cs, TranslationBlock *tb, int *max_insns, vaddr pc, void *host_pc); void rx_cpu_unpack_psw(CPURXState *env, uint32_t psw, int rte); -#include "exec/cpu-all.h" - #define CPU_INTERRUPT_SOFT CPU_INTERRUPT_TGT_INT_0 #define CPU_INTERRUPT_FIR CPU_INTERRUPT_TGT_INT_1 diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 83d01d5c4e1..940eda8dd12 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -948,6 +948,4 @@ uint64_t s390_cpu_get_psw_mask(CPUS390XState *env); /* outside of target/s390x/ */ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr); -#include "exec/cpu-all.h" - #endif diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index 7581f5eecb7..7752a0c2e1a 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -288,8 +288,6 @@ void cpu_load_tlb(CPUSH4State * env); /* MMU modes definitions */ #define MMU_USER_IDX 1 -#include "exec/cpu-all.h" - /* MMU control register */ #define MMUCR 0x1F000010 #define MMUCR_AT (1<<0) diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 5dc5dc49475..71e112d8474 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -729,8 +729,6 @@ static inline int cpu_pil_allowed(CPUSPARCState *env1, int pil) #endif } -#include "exec/cpu-all.h" - #ifdef TARGET_SPARC64 /* sun4u.c */ void cpu_tick_set_count(CPUTimer *timer, uint64_t count); diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index abb9cba136d..c76e65f8185 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -251,8 +251,6 @@ void fpu_set_state(CPUTriCoreState *env); #define MMU_USER_IDX 2 -#include "exec/cpu-all.h" - FIELD(TB_FLAGS, PRIV, 0, 2) void cpu_state_reset(CPUTriCoreState *s); diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index c5d2042de14..c03ed71c945 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -733,8 +733,6 @@ static inline uint32_t xtensa_replicate_windowstart(CPUXtensaState *env) #define XTENSA_CSBASE_LBEG_OFF_MASK 0x00ff0000 #define XTENSA_CSBASE_LBEG_OFF_SHIFT 16 -#include "exec/cpu-all.h" - static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, vaddr *pc, uint64_t *cs_base, uint32_t *flags) { diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 813113c51ea..6c6098955f0 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -35,7 +35,6 @@ #include "qemu/rcu.h" #include "exec/log.h" #include "qemu/main-loop.h" -#include "exec/cpu-all.h" #include "cpu.h" #include "exec/icount.h" #include "exec/replay-core.h" diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c index cb64725a37c..c4c4c7a8d03 100644 --- a/semihosting/uaccess.c +++ b/semihosting/uaccess.c @@ -8,7 +8,6 @@ */ #include "qemu/osdep.h" -#include "exec/cpu-all.h" #include "exec/cpu-mmu-index.h" #include "exec/exec-all.h" #include "exec/tlb-flags.h" diff --git a/tcg/tcg-op-ldst.c b/tcg/tcg-op-ldst.c index 73838e27015..3b073b4ce0c 100644 --- a/tcg/tcg-op-ldst.c +++ b/tcg/tcg-op-ldst.c @@ -37,7 +37,7 @@ static void check_max_alignment(unsigned a_bits) { /* * The requested alignment cannot overlap the TLB flags. - * FIXME: Must keep the count up-to-date with "exec/cpu-all.h". + * FIXME: Must keep the count up-to-date with "exec/tlb-flags.h". */ if (tcg_use_softmmu) { tcg_debug_assert(a_bits + 5 <= tcg_ctx->page_bits); From patchwork Tue Mar 25 04:59:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875965 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475155wrb; Mon, 24 Mar 2025 22:02:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWCP3VTTkk+OM42FD47Fn9qCrTQSQm4oeZ/lk3eBeIFmRuypnB6s5zCmGh/3uykls+OvS5zgA==@linaro.org X-Google-Smtp-Source: AGHT+IEJLMuDh9TANLSVTAvkfQZk4wp4JMAaTHoFT3YmlYzxa/Hhtud4KTAR/CRPlVT0FZodK9IJ X-Received: by 2002:a05:622a:4d9a:b0:476:8521:778d with SMTP id d75a77b69052e-4771de7e432mr311817081cf.50.1742878970646; Mon, 24 Mar 2025 22:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878970; cv=none; d=google.com; s=arc-20240605; b=Hh82pWtvYM9zweMnlTrTFdRhBJeraH5I+5NV3JuBGJk52mfOLVujCF7OzKUxiNSRbe 0mEPpaDwIBRP3jQMyOepSdPHEEHqhksykuFowf4hE3IEd8GKx9yhr7ZgX8QRVFJoyvbf Z9OgvyAh0QOoSSl1ArDIX1s5QmWP7NhJLNadDZq6ktNF7EuKXmK1xEze6Nm3DknbrRXG wResDPf2lRtNnXBbTh9leqpAMtdbq52Eju89n+tQUSfsbjT8sjPTz3FQZXIBWwIR0fsv evgPhRtgpUdaM/PqgQQYa/9Tns5S9cZiWXVlbf1FT9oJ9nSUOJcUIMu8oh/R2DsUuFh5 TocA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=7b7Pa/XivG7M4hjK9jqso2S4d+dz1DGry6GtvIR3C8c=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=in2jU0pe/FUX7Y0RvVfOZyOtHDNvxU+38TQLoMeBDpi5kdVz8dzZIkmV83kNPceQws XaJIgVeWCf3yO92D/YzDprqWKf+GMziLpie71rMtPwxTLzLzHJ6IcgIVBmQpCYn6uu6k DnrCfHaQJRMGFT2QmXBgn8J7tkWQx/fx8hIT+Xrpcd6+C2vSO6kg6boVEctwMpk/6Kvk wditK7TyxZMr2y3CwIJmrCp0CQ+M5/ghHJ+Uxdg22Dt7W0Bsi4EkKHwXeA7GEt0tkYnl NgK5PkSC3wqG3UO4X+T0/ZmO/nds1MJdiWnPG8biEk2qgBjC3cOjiSsRDwO0bbqdvlOS 0D9g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=diaOreml; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4771d50b7f8si85692941cf.333.2025.03.24.22.02.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:02:50 -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=diaOreml; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOO-0004Sz-Ta; Tue, 25 Mar 2025 01:00:00 -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 1twwO4-0003u3-6V for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:40 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO2-0005uu-Co for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:39 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2ff4a4f901fso9525491a91.2 for ; Mon, 24 Mar 2025 21:59:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878777; x=1743483577; darn=nongnu.org; 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=7b7Pa/XivG7M4hjK9jqso2S4d+dz1DGry6GtvIR3C8c=; b=diaOremllwQh2p6cetTrB/GPmfQ4PZRaJqG9+cngMMzymAIsj9irkTQYEG66ZVUnfD MgBgkYwymbgyBsk1tLRyw3/lOJ61chBEmu9Yq8cj2WK6NkSF4LMlpwhMiMJIalWL+nc5 r89iU1Aok7QpaNKma8CRSpH6EhYQBW9+nekH8HDGa0wFXCPSjHUhOSrUfmH5bwiwpvsM kvQwryVgmOCsWa/PAvpGGi8+lxQpFA5oXFKGBojifLrPtJYncX9oA2W6oU/qV8ieO48t ODP4kBlvvC1yru2X2ZoW1PDcTKuNzw4G/Hy57W1KS8LTr1h6RZLhx+E3rKPEWir3tCKM E6WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878777; x=1743483577; 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=7b7Pa/XivG7M4hjK9jqso2S4d+dz1DGry6GtvIR3C8c=; b=sJS9V+NBS6jt+Qr/yfAkiSc9slTAKbPRktFYSUWrx+LfoQIwT2xuXvi+P4NNxTExTv F2YJGqwF4gijuS+gjFpKMTvVZBZbQygF/8RgStD67MyHx6jivdJid/zXCM72RWyKCg0M HDyckyu5Nc00IG2SD6OqG/T3J4By8K4+CIxgGst9F2JOdCwRubO1pw9gUAHPCiKv+QSd Qzsi10nRwyIGc8svApxuhGyhBWUiCaKVlpY1Lj34WegUaq/GDLzgf5/fY8lMzu3gERQ1 PH+jXcTdt8BySEbcWjvAUognvwigvBX3rg1lCxgdOKOicpK5q9KfwzXtsSez6ds/WOD7 7vSQ== X-Gm-Message-State: AOJu0Yx4oYiCvFH3+nY7neJ8JpX12wATuU0aouNWa/P7EpS5bcjkNNwr SD/a88+DQwvfT7b2YjlPqu0MUvkzZOuq63Ky0cu7nEyi5nx8KajnAIUvHUI+Uih7/t4fcqRwdvI 5 X-Gm-Gg: ASbGncuaywLaqV9H3AqMKcid23Auq54Q1RxCcwJCZ79nFgyJcTGAbmM7655rQlBGsvD nTFO2GYA9ki4D5PLcJ+T1zqOZnS99M7OxuEaMmARzLDgguKmWR715X8GEGf8pRrMUlGpw9pcL5e 5DyvG44H3fajWI58op2RXmR066m/EiWWyCbmCXXn2uVOv1XWHPCFOpUHUZw5Mb809ruwNXh8O8t 4k+IUHhvdkfUjqjZuqdmLu9am39xNTjd9NNH/YR10XL7J8eXzyvjJgOrGXXEPXVgeYfEkVT8ukE KDm6rLWt9Jy1JxOAwa5Pv+csJpAZZFuhO9ScCyvn+3vS X-Received: by 2002:a17:90b:2743:b0:2ff:4a8d:74f8 with SMTP id 98e67ed59e1d1-3030fe721dfmr22138307a91.6.1742878776987; Mon, 24 Mar 2025 21:59:36 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:36 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 16/29] exec/target_page: runtime defintion for TARGET_PAGE_BITS_MIN Date: Mon, 24 Mar 2025 21:59:01 -0700 Message-Id: <20250325045915.994760-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102f.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 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 We introduce later a mechanism to skip cpu definitions inclusion, so we can detect it here, and call the correct runtime function instead. Signed-off-by: Pierrick Bouvier --- include/exec/target_page.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/exec/target_page.h b/include/exec/target_page.h index 8e89e5cbe6f..aeddb25c743 100644 --- a/include/exec/target_page.h +++ b/include/exec/target_page.h @@ -40,6 +40,9 @@ extern const TargetPageBits target_page; # define TARGET_PAGE_MASK ((TARGET_PAGE_TYPE)target_page.mask) # endif # define TARGET_PAGE_SIZE (-(int)TARGET_PAGE_MASK) +# ifndef TARGET_PAGE_BITS_MIN +# define TARGET_PAGE_BITS_MIN qemu_target_page_bits_min() +# endif #else # define TARGET_PAGE_BITS_MIN TARGET_PAGE_BITS # define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS) From patchwork Tue Mar 25 04:59:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875983 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2476762wrb; Mon, 24 Mar 2025 22:08:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUNjLFrbBRYFjiMeRwyVhlh+rFZrL8jGCZzLyBFZVjGse8tY7xat643VoXzGksYFdS0EwM5Gw==@linaro.org X-Google-Smtp-Source: AGHT+IG+i5FpirYp9eXM/9sig48a04ICXynWeOpJmTYMn8T6J9DxvuwIak99j6pfZtEP/wEXEXbp X-Received: by 2002:ad4:5beb:0:b0:6e8:ffb6:2f90 with SMTP id 6a1803df08f44-6eb3f2c84a7mr231634896d6.11.1742879294515; Mon, 24 Mar 2025 22:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879294; cv=none; d=google.com; s=arc-20240605; b=gvGA1ySQMqzUvuGJeC8CbfmN3rC5k9UbIELyshO8CiExPxa9S3r9YsVXR3hzd62APg /sxzuvc1GHFpdUBpAoXfNhirjyL6dqYG+tM/7YjfmONJd8klAxYd4EBV/kB08ZZU1zJs mZQ8EA2sD7vg4QEG029sTt5EinGAkYg2pnfTrQvzDfP+/ZeGGozfMmqaDwBoGbnhgyh1 SrMXj2Cwxh7uO2WGoYAKgUp8nLnl+UHJYZU4DgwXBgNNMXErJigcyv6mWdJPWYw9nCx7 Tq80K5klrj7ZU8D/Sk2KQMnNxZDAGux+573i3xSWlXw31ajSmMOmS+MQ9W7DCYE26gRf mHHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=pS3gEZRMWOaWak1qsS38oc8ZE/M7wQ+w6QdzWBH2Aio=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=JhT1DDno+AxynVnD4WXSQZ+bw+u9CaeoZtciy0okhtWsaGlDweb6CV05Pvr5lCoNV8 fgXVIG9AlOJxGoN9hM230GwCI671ACwQoMtGV8pqU4GFme+Ce43gZo5hLsj2+t2WRWAa 7lE7ZA3CD7W401AyBkqk13XIo34HPF6Ip4VfQKm7H6PLYh3PxCVmc2iDGC5+nhzKFD4I wFhK2B4aIOAHHYBlaeISRPQIqiPIfcI75+VMvJ75WWoTDky9mD+dnmwEp/q2U6bUgdC5 EbiFEu1IqKDKD7NHcBBvwUiemlqMuMrc3w23+gou6y7djGZeKZYyFpY1gP1CY+vxaatB Opvw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pJT0Cn3G; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eb3eff3834si89719316d6.215.2025.03.24.22.08.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:08:14 -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=pJT0Cn3G; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwPN-0004wP-6H; Tue, 25 Mar 2025 01:01:08 -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 1twwO5-0003ys-Kw for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:42 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO3-0005vM-OF for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:41 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2243803b776so28232315ad.0 for ; Mon, 24 Mar 2025 21:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878778; x=1743483578; darn=nongnu.org; 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=pS3gEZRMWOaWak1qsS38oc8ZE/M7wQ+w6QdzWBH2Aio=; b=pJT0Cn3GcOQjBJcfNXqq8dZaHUNzt2eWdx8i2HefCFVACg8MHGwls2cYDz0ChVVJZ7 S7jEscajIhYiPc+iUxhSCDZR6w8AnHTobEMPHaLv02iBcYy4IRPEUafJjtcytd8v+bTA mHMiek7xHtmyFmG991H/JuwP+FFbOKXC7HkyVQKpyMBfSm2EWT7FrcR/rsmPVrR5z7Sx oTsE008ZnzZyrkX698wbfk0z05UnDg1uG6ttVpBMICFWUqW4vm75KOJIvoPT0srk9qwg znzTErjLOLll3xIeIqWSf+Zj+fNCF4Z9CZwZo92ovsVoadQ1BCrzMYkrZH3twqY2q1ih 0IzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878778; x=1743483578; 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=pS3gEZRMWOaWak1qsS38oc8ZE/M7wQ+w6QdzWBH2Aio=; b=EwPDePBYOKygF0Ja27lGhX5H5VqPpzC5vEZZNN8AUko2m2H7pyQbnJwjjvSSkkOFYl Facbn9Kv7GyAih1V2ekc/gBL3UDxm6GY/wWXQWAuL2bVd4NC5YFwZrSrzPwiYXIqODrN /Z6fRxp2JtqIfgh5kWfHthzBnClAenMwLiNdQcjK5Xf7Xkk+j1/i3lmUcblU0jhxPJOI P0aJMv5czv8Omi11d668EmfadR/sJCvzJySoJshGvDLE4v8Bn2Nz7poQUulLirmFDDzB xVTSdLkxeqzOHcJJ57fRgKnkmKjVVjyB73RpCKTxCCMOxNoNF98/S7dEqtamyQ2viV44 zLMQ== X-Gm-Message-State: AOJu0YyO2NNNpasrqcfoACSACWfuX2wcARlZsyCQ5v9U7tLfEtwiDN3W h3L7d80LJ5FdB1BZFibSbKhV2w1Ba+UT20NzAilL+4CWoXL/5spQgTMUmjTEwjEErekTRG8w7MN c X-Gm-Gg: ASbGncvvkM26AkTdpct2xvHEnBwp/cE3GX2agjg71DJLpiCcRE69AZTsBSrreQ4+lCw vY5KTJOvhPdVD7j8fv6dkHjLU4c5TRyARjewnARgmjSDFY7+bndXPGhYDxRItlsVq7PyLBaedIR tQ3CRbkpyyCgCQniy/oaQbL+r3XX5WOp8rdTcQuEhvRPKNOzetPXxOQN+fkrzev5bPH/WG9Wjm5 yqROl74V/KAIzb/+IEEXn6WW8kDJ5V6PLQMZpkwXh8CeDVUzjW3WEb9wDcCSOrY9L8m5tCVnOvN 0FRZCrYdFQ/AimBMFAnZPMGiOc3bj2F9INfjx0whupEQ X-Received: by 2002:a17:902:f64e:b0:220:c067:7be0 with SMTP id d9443c01a7336-22780c50a94mr237157895ad.6.1742878777836; Mon, 24 Mar 2025 21:59:37 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:37 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 17/29] accel/kvm: move KVM_HAVE_MCE_INJECTION define to kvm-all.c Date: Mon, 24 Mar 2025 21:59:02 -0700 Message-Id: <20250325045915.994760-18-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62b.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 autolearn=unavailable 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 This define is used only in accel/kvm/kvm-all.c, so we push directly the definition there. Add more visibility to kvm_arch_on_sigbus_vcpu() to allow removing this define from any header. The architectures defining KVM_HAVE_MCE_INJECTION are i386, x86_64 and aarch64. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/system/kvm.h | 2 -- target/arm/cpu.h | 4 ---- target/i386/cpu.h | 2 -- accel/kvm/kvm-all.c | 5 +++++ 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index 716c7dcdf6b..b690dda1370 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -392,9 +392,7 @@ bool kvm_vcpu_id_is_valid(int vcpu_id); /* Returns VCPU ID to be used on KVM_CREATE_VCPU ioctl() */ unsigned long kvm_arch_vcpu_id(CPUState *cpu); -#ifdef KVM_HAVE_MCE_INJECTION void kvm_arch_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); -#endif void kvm_arch_init_irq_routing(KVMState *s); diff --git a/target/arm/cpu.h b/target/arm/cpu.h index ea9956395ca..a8a1a8faf6b 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -33,10 +33,6 @@ #include "target/arm/multiprocessing.h" #include "target/arm/gtimer.h" -#ifdef TARGET_AARCH64 -#define KVM_HAVE_MCE_INJECTION 1 -#endif - #define EXCP_UDEF 1 /* undefined instruction */ #define EXCP_SWI 2 /* software interrupt */ #define EXCP_PREFETCH_ABORT 3 diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 049bdd1a893..44ee263d8f1 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -35,8 +35,6 @@ #define XEN_NR_VIRQS 24 -#define KVM_HAVE_MCE_INJECTION 1 - /* support for self modifying code even if the modified instruction is close to the modifying instruction */ #define TARGET_HAS_PRECISE_SMC diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 0723a3933bb..7c5d1a98bc4 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -57,6 +57,11 @@ #include #endif +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) +# define KVM_HAVE_MCE_INJECTION 1 +#endif + + /* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We * need to use the real host PAGE_SIZE, as that's what KVM will use. */ From patchwork Tue Mar 25 04:59:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875967 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475264wrb; Mon, 24 Mar 2025 22:03:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUzJopyn8Ydk/7lDh7y3umRF4GSm6S/W+mkZPH75IBEE2DKlA7gy+U71O9ghO1vpjsoQZwGZw==@linaro.org X-Google-Smtp-Source: AGHT+IFxf1qpLd7z2UIG+HM98ZrDvj4Qv6B8StCpCZFbeEiuya0kTmaIrD1k55NEObYCvuU0Y7M2 X-Received: by 2002:a05:622a:17c5:b0:476:80ce:a614 with SMTP id d75a77b69052e-4771dd92415mr236232601cf.19.1742878991026; Mon, 24 Mar 2025 22:03:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878991; cv=none; d=google.com; s=arc-20240605; b=UJ242l06zqa9xGFRuOBdfSqjMPohH5fryMZGCZWQsMhfdq6+bezUaZxKHRpDqYbNOd +qt03BAiOj/rkldlhXY6K7mIeWJkL5je6bo1uNOYQxsBQjRX4iL8w+lv47MlXo3VOhz8 t4svkA1lhu6Hy9XnajWHr1B5JI+dBBjHB8Q7Mw+Z8/eRzZTEDVnlEHK8mC9goicsbWTN 2fd23ta6dC/uszZfiBLQPJc+hrtj/eMm91kfokgSiV3FJXy4xHHdktjL0vvbMSFhStp1 HKTTzvorytcb74SNoj6JhBSE7kww3ufGSxAimXCqqR2VGvunqQYBQAXQ+YeOrHF2OIwX YU/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=wVYa7fx+hqBI4AoRMYooEEzjwHkUuA977fGAq/tYFYA=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=cu1naSLxp2KWUKI6HQQTfVYb7R9EcljFGXAqr9ZUnIAVbA6jsBlYDyzVfcIytYToXs esY5QrO20J+8Vx9d3iccWCc0fzQ0rloj2k9zB+3R/6dLqti6FG6b6IiCPmBrhsxjkmqv 2HgFQGE9xwz3+OEAHVqhPAUn8uP6U4dGrS1A1HUXtPU0sUiukbSFggM62T6OvQmo8jMK F/aYxySu2igQkfwTCBjZgHS4r4klQg2Hnes5ASxVM4LIGFuT2PnsjjRgvlr42sWeh+me mwlKhp9q60ePK5ZgkbPNC7eH+H4mnN2WctTHoYLAv1qw9TatmArn1A4iCkGgHEt4y26m AO4Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fo9Jdfd2; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4771d638f9asi90837761cf.493.2025.03.24.22.03.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:03:11 -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=Fo9Jdfd2; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwOR-0004WR-9Y; Tue, 25 Mar 2025 01:00:03 -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 1twwO5-0003yx-Tm for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:42 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO4-0005vk-98 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:41 -0400 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-30155bbbed9so6729663a91.1 for ; Mon, 24 Mar 2025 21:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878779; x=1743483579; darn=nongnu.org; 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=wVYa7fx+hqBI4AoRMYooEEzjwHkUuA977fGAq/tYFYA=; b=Fo9Jdfd2HzEwy7ULS/jtJiDDnUkEyur2N4qFzQYUkGs7DNO5nJ1FZ/jEr2SZAzgfVT sCHqP14I3lUJa5wBv38mbTTAIiC7syKYOGBaJ9Y8qi4v5SlpthZbvkRbs+n7zvJUoBEu WyQsDDByOKUMP4rNZUwUothMrpTjOOsNIzw53Fu2uvDKA93WZ9MBXCW8R3nxlydy4ahy oEMRMBooseF6at3EnNrXp1+OOtELy5MR1dItV3FMtULGHec+8OFoT9e3qNUibpI8uAbk Rq5oZ9BmfMITIML6FQNTuHkv00SaQrg8N266fiAuDc0535f5ATznrJ6sy8TGgsAPmMjN TS7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878779; x=1743483579; 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=wVYa7fx+hqBI4AoRMYooEEzjwHkUuA977fGAq/tYFYA=; b=q7wEWmh3hmtdhnA1pGIwU/19MQMKOj3AcXID8N0e1lTntoUah41Bwb8pNVBiSPpOGR 0Q/lGR8V3heRjkCHZHkHxk96ctWMMvOcKEo4rGQcyPerL/Vg+obKmunzJVVxTjrTFbPo G7KC/BhN4N/rJ8iX/EcGl/3AtF1nzKy7CP3hJyqInQzEvcf7ul53ORFFlSdRbYrzQox6 aKatdqX0u+Hhy7qTpyLYyqxifhkjHzM4u0fQn/A6UNmEKgiMrjMFABg/QSa1BWd33Ahj P+2xEevJAlrvbu/p6Zpff3iuJS9VHE2wTv5DhtN2hM0bwonRgZA34S5Lel+3xYand1uo pEXg== X-Gm-Message-State: AOJu0YztuosnkY7Rur4oPhdUSzYhAE3g5J4u2yj3EppQwM+3zv4+JgZL /EAySvah42AvlGy1I8KvAmTuRBrxgWPzqS5l8o3l976IbV0pFG2ftew2tNVXXDQcY2tXtCAL0ht t X-Gm-Gg: ASbGnct6rb6V8fMUToMdygArie5q+6prSaRxKN+hoknj1zslkgx2JoW7sJlWDxU1okT FBV3LTAG4vVgotVFL41VSVszvdK2jL1n6F9CjYqOEnbJByEtKtJh8PX9mOzf9ZvqMA7ESnE5n6a ituzFSMarSYJlNtENvcmGFugoDvHQz3B2jXkVLOJTJdv87rBaf9CetepDzz7RohK6KWbbGXq72V 8BAdibHOJDxfAdGE4xwzMwumSkgnl/stqb5/We+GGzGkBivEE7bs8AfjWMQ9mkKES3ammg6AWb5 Fza9XMf3n1aqoajLjgFfR5zidkR/tAHn+oeOlSVyRhPH X-Received: by 2002:a17:90b:35c7:b0:2ee:6d08:7936 with SMTP id 98e67ed59e1d1-3030fea53b6mr23779109a91.20.1742878778703; Mon, 24 Mar 2025 21:59:38 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:38 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 18/29] exec/poison: KVM_HAVE_MCE_INJECTION can now be poisoned Date: Mon, 24 Mar 2025 21:59:03 -0700 Message-Id: <20250325045915.994760-19-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102c.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 autolearn=unavailable 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 We prevent common code to use this define by mistake. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/poison.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/exec/poison.h b/include/exec/poison.h index f267da60838..a09e0c12631 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -73,4 +73,6 @@ #pragma GCC poison CONFIG_SOFTMMU #endif +#pragma GCC poison KVM_HAVE_MCE_INJECTION + #endif From patchwork Tue Mar 25 04:59:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875981 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2476580wrb; Mon, 24 Mar 2025 22:07:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVT1x/3OgO6iNcB2MSHzYflXPZDr1+6CjWQ8C/6UaRTh8p46Pc3DePVQ1paKut+49ZRPI63lw==@linaro.org X-Google-Smtp-Source: AGHT+IFzEaTBSF2b3XYFyHZ+aZ4WXjmICYUiqEjO/Z5Hs9AMcSHtzQkr1qN1f4Kd1slErbiIxj0V X-Received: by 2002:ad4:5cad:0:b0:6d4:19a0:202 with SMTP id 6a1803df08f44-6eb3f339763mr272379026d6.33.1742879259955; Mon, 24 Mar 2025 22:07:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879259; cv=none; d=google.com; s=arc-20240605; b=WnuyGrcSKaRkE86BDS/yjEJr+vCKfQlHDuxZlk1XgGHcK6pwy7KTn8DyvDsnb5xYpn ttdE5FuWz8AJCu1LrExIr/UE7ft2dHh5dgR9hoF8nr8LnsaTJBti7Pp/RkbGNFCpD0UR hkN2D7muz3dIpsVIVkJbBDX8YOSxtAbn37xVUSYgRwH1Jkb/1Ov93vihA2SH0dl3yxAP IqNSWZhBx7QdbDOfq5+y5QRh7JcPBpTHZFXCvgVNGkU1rNWX9KSn38WoJA1qhEZj6sIT S6LSyYhTCrP8oz8axMDTNEGnplY8dWA6QyelrJhdtrERPuWXRDYbT1vWZCnYlYMGZMug oNvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=4+5iQ3rOTBSPEFMTgcjt+dky/l4beaGAM9ptuF8lc/c=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=K+XkhZdyOTUMVOJSUDT5V7vIXCOEk4Z7wGjUra8x2YEp9Y/Z56ZZ8YH1FLlJa0SNW+ iGFAhUCwgkKL2xVvz8Ar5O5gVIgVXPNRyK4uXVCwO46eM8XW9MLTqw3B6E6Pi7wpWosA NhEfAdAzw7xJ/N1Qq4sh7b6mRHLmyXzDSnZBwYPbvNLNCgMMynYH2JdTYSGyh7eOOOiX vcSHBHonmL5MZDIf9ZWNIE4Nc+Z4/tOi5Cpq650eJOH202OQWZyhVmt2aFfzrogTgf7H BPw067tlQVxAfXNgrEdWLf4hQzzzCEHyRxR3QF8Z61Dj/PMtLWDfaCeOaaKFUAKjjdQt fHBA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZcbGS3Kl; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eb3ef5ad80si90097026d6.160.2025.03.24.22.07.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:07:39 -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=ZcbGS3Kl; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwPh-0005YZ-S7; Tue, 25 Mar 2025 01:01: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 1twwO6-0003zA-Sd for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:42 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO4-0005wL-Vb for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:42 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-3014cb646ecso6658798a91.1 for ; Mon, 24 Mar 2025 21:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878780; x=1743483580; darn=nongnu.org; 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=4+5iQ3rOTBSPEFMTgcjt+dky/l4beaGAM9ptuF8lc/c=; b=ZcbGS3KlZYKbFu5SaBibthPHcGKG936Io77BbwYUpn947lQ9vOFGnXHiAzWs3JP88K A83KXfnMqWWZhD79INMrrnFxbkA6si6tRUAcZGtebk783JuW1ZmUp3Dssbu1/Tmcm+9/ x0adJ6FJqhZJqfHqOvUJBZk6dyE3qZuTpG9DEBebb+A5vuQJS9wd4byzPCABPX6xwQ/I 6bkxN+GudkIQWlSa1ciVogTc1An1rV8Q8QGPw8mCNONTyN2H8GTs6zxRbPMEdns49V5/ tH1SMWLmQ+DkigC72AbuoAaNJE1Z7v1kHQrfPLGV18nP8I+AzOYm3gAlfwQ1yusU9MME iMvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878780; x=1743483580; 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=4+5iQ3rOTBSPEFMTgcjt+dky/l4beaGAM9ptuF8lc/c=; b=BKfEEsN+W7IoAKDtuRqCk8nEHjn9qrd0YTpqrshhz7UMNJp2IG7ngKHFDXn3z9GlDk T+VAJLcbsJEMRFJ6DpwDK4vaV6azVHLE1We+QFksDdmx7SV5/MhgVfEoXeU7LOsKwODd pd9YOEJHwGqn8HE4b66ueGDlye7O8i7fgMJv3dqEV9nRhEZt6mez6ws6EcaJxE9m3Hra cC/23H+HhYAsOqHKWtjfq9MtgmoX13rlsjOSUHjUeMnm1omsyhSDLahnsyRh0LFgoNog 7+x4Co3qq1GlU/RNQzMsTOXr0vDKU5Cm+OnfplFFgUu+QPLQGXxINM68ld4AWLL0z5yf 5QJA== X-Gm-Message-State: AOJu0Yzqr2ibarGOI3AUuWX7cydVnJ+cM1FFNqJyIBEOesf8+//21BtN g/Z3vRVkZvnZ5I5uWiEfRWXLVRX/VneiH14mCQZ2ytaSFbvOTPek0bKK75DneNayfSDkK0V75FY C X-Gm-Gg: ASbGncsn8PELQQp3LBD6vVjdzG4PxWW8uvsHtNa18bAE7cSGuYWcwFXtJD0Cdrr0zEO 8iQLZ30xYH0yINCfnCdGW1eCItxBKv7LI6yvvl67FlmpkYkSgDLpK4S85lgjiclx7GuxsDdjX1g AIon/CCzu78hfkP3oFkxjy28Wj97uumrcmfBoS3C379pDgqKzHwEMV8loXpGNKrkJU6ubILaQmQ 1cSojzUUpVKu7L/91AMBKw5hQcROz2KEAEybTNrAeq0HenQjPdSICNmCOUgETLJpqDRmA5YIjl1 AnzaTjYXZsrbsBqHUOHkEGCygiyaxX79iAiSmiCrPJ43A6r51r7vXBc= X-Received: by 2002:a17:90b:2647:b0:301:c5cb:7b13 with SMTP id 98e67ed59e1d1-3030fe552f1mr22108739a91.3.1742878779554; Mon, 24 Mar 2025 21:59:39 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:39 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 19/29] target/arm/cpu: always define kvm related registers Date: Mon, 24 Mar 2025 21:59:04 -0700 Message-Id: <20250325045915.994760-20-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102e.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 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 This does not hurt, even if they are not used. Signed-off-by: Pierrick Bouvier --- target/arm/cpu.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index a8a1a8faf6b..ab7412772bc 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -971,7 +971,6 @@ struct ArchCPU { */ uint32_t kvm_target; -#ifdef CONFIG_KVM /* KVM init features for this CPU */ uint32_t kvm_init_features[7]; @@ -984,7 +983,6 @@ struct ArchCPU { /* KVM steal time */ OnOffAuto kvm_steal_time; -#endif /* CONFIG_KVM */ /* Uniprocessor system with MP extensions */ bool mp_is_up; From patchwork Tue Mar 25 04:59:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875969 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475724wrb; Mon, 24 Mar 2025 22:04:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW1s/FIXqAuxm5lDiY4H5cMh8lGzi7KE1Hy6D9XXRfWTJZnE2KGtdFm5M2rn2zGtnxKLqk0Kw==@linaro.org X-Google-Smtp-Source: AGHT+IElvd3bUe3EBpHUCA7Ppc5fLoJbrtCmD6STGbuhAgTBpOxoNvfvQx8qAjmqJ/sRvrcrCiPl X-Received: by 2002:a05:622a:568b:b0:477:4185:e7c4 with SMTP id d75a77b69052e-4774185ef12mr82788961cf.10.1742879076644; Mon, 24 Mar 2025 22:04:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879076; cv=none; d=google.com; s=arc-20240605; b=IoW6RDGUEduszFO8Z5D9Dg5gK34D16pTEZfNp9osD/R8SeuOTCt5B9xY0WBahCMInk X4G4sb895tB9LnzGVazFUsfajw6e8jSrDKJJE+lZVBaJ/4J8Pcsgmv974A/CtZXnCIeg R5v3Mi8i7HGdL4mWN6mSEqY1t9fg0vdoW3uUBN2hgr3nO82u9c5GNCCSJrcVzqaU6UfG pZ9kKAsrwW3jUyD5uvGFYCnqXi6pT4nsSBZqHvtJ4Uk5eZLXZDPr1+7NwTRE/9B+FmDb 9uM/hiB2BYc6VceIX0FslWO1eW71EQyzBu69zKGK/ZWBtZmeVqcgG/9Vjh4TvVj6NV35 MSjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=H6JY17RXIOhpi9WGu5PHvZc/K1MBVjPo3G9pvjwYgCU=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=aVtZrJGHa+oBNGKpbo/Q4tgD2dcAELCnoW8zxnDJaWYss01A6WpP3zq5dtbYbfwl2o J5Q2w7fktnisWfH2fFkIKFavtUEAbifxtQKfsN4PAM0FGQrm3Dun2wmAzFh/dpOy4SOp Si65wJyWMShyHcojL1IORvdVxZlnv+pzinjgrYGYtfkYrdVAOLofkk2fEDBmyLs3fEOF M7b1NBbjkG9RV5QsoQEgn97FTWfKpkI1y+8Uq+F30X822YpJuNBbCFtnLuwQtIStIdDw RzIUCmrKHt7Cd6sZpiPcS59NfdnD5BD6diEzFSk7u4spuuEFt66YfrGMDY0SxtHB7k1S T56w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SFXsDNbQ; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4771d4fecd2si87577951cf.226.2025.03.24.22.04.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:04:36 -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=SFXsDNbQ; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwQ4-00068L-0L; Tue, 25 Mar 2025 01:01:45 -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 1twwO7-00040W-Nb for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:44 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO6-0005wu-1b for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:43 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2ff187f027fso11093313a91.1 for ; Mon, 24 Mar 2025 21:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878781; x=1743483581; darn=nongnu.org; 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=H6JY17RXIOhpi9WGu5PHvZc/K1MBVjPo3G9pvjwYgCU=; b=SFXsDNbQ1/hrAX7kOMgj1dJTDJLDbAu09wphXxbi9QtUQO90OZEHq0cp3cEjvHSxcd K7IjzlTENXCDjpqllJgoIM9ZxZDlHIPa3tYfSlAysZH3aPYFAasUar8FayKSOsFXIXAB IbFBdjrT7QF2UkKgGr8tOuJKMJF7xPk7RIcyzXLlmhjl3o/NdTLbe6R+4fwI0lS0ZaSn v8PBBpQBBIwJ1ibkhMNWTZt+nFCS4m7o+xqrbTllLzLWGYpintg39hUfYcYFwYRszrz4 wj7jFCK54WYEcwb9XZDFvAy/0qZXCc43BTgeGgVo4+498C7M/Kj5me4H4jcfv+nkRPFk /Mmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878781; x=1743483581; 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=H6JY17RXIOhpi9WGu5PHvZc/K1MBVjPo3G9pvjwYgCU=; b=CZcDpHxzQxCJe+vMcQRCVyJJ/H2Yr865Ll3YFdZAgbtlrds+eWaad9GWO8RFXjyDsU utTl5LOy/oE6UY0SAACVgjIJ5NnJCQtiBAvkwLjPOz5elOd3UozuBpXjznfLwz4TI2Yp gvrOT+e4w5rwT43w47zEuFwIUkSqtxikkazkAc+5kv5SQmMVN9cC2fW8lTLdZWC3xYzW 41uJkXgEpUxiuSeR8ifsOG9ckBkwr7i1h6LxD0Uoa7nUAF50n7weoMk1RPRird9qRG/d W7Blb7pPjSESXU0suSUtiemFyx1DIJTYP5OfWVcPcno9R+/Afdia+OQ1MdZvfIVpawDT y0ww== X-Gm-Message-State: AOJu0YzWFLfDun8Hf+fLZrBqJCsHM30Fj6XQhMzpDWsl2ZiDln3AIu+X Fwy8NLmLrvYmxa6FoH6wObTPr0BerO6sBug2ZTEMx/ZS7B04KHv+zWG6tYwmt4EDS+hJWe9llFY p X-Gm-Gg: ASbGnctTwXYe0cCJVHpqw9Yp82WLY526klP2c04U8WPIKjFNxKZUYUcWiMtnCav103X KofBU42h76OxTobgYjkEphJyC+hNXUJWMMuBzQAIGpojp/StA9rJaQAgjJoYovXjFRScL6ghfwP NuvWHdDAnyC9QmA3mGM3AeDDuzUDNCiC0NPdJjc2EX12RYDwyXwMxnlmmAl2P3AuqzIgHI2YTRB LXaKu/dUT63GfVPUfIkF5htshJDqCDNDUSUXccaLQIv5iTX9RKB9jzZ9niMzotmozrRha6S2sYb Z0fn9orC9tnZoMOykLJjdb1ykYEXZaQqSg3ExhMk1r+m X-Received: by 2002:a17:90b:1848:b0:2ea:8aac:6ac1 with SMTP id 98e67ed59e1d1-3030f3efb95mr26168707a91.15.1742878780601; Mon, 24 Mar 2025 21:59:40 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:40 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 20/29] target/arm/cpu: flags2 is always uint64_t Date: Mon, 24 Mar 2025 21:59:05 -0700 Message-Id: <20250325045915.994760-21-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102f.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 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 Do not rely on target dependent type, but use a fixed type instead. Since the original type is unsigned, it should be safe to extend its size without any side effect. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- target/arm/cpu.h | 10 ++++------ target/arm/tcg/hflags.c | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index ab7412772bc..cc975175c61 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -194,7 +194,7 @@ typedef struct ARMPACKey { /* See the commentary above the TBFLAG field definitions. */ typedef struct CPUARMTBFlags { uint32_t flags; - target_ulong flags2; + uint64_t flags2; } CPUARMTBFlags; typedef struct ARMMMUFaultInfo ARMMMUFaultInfo; @@ -2968,11 +2968,9 @@ uint64_t arm_sctlr(CPUARMState *env, int el); * We collect these two parts in CPUARMTBFlags where they are named * flags and flags2 respectively. * - * The flags that are shared between all execution modes, TBFLAG_ANY, - * are stored in flags. The flags that are specific to a given mode - * are stores in flags2. Since cs_base is sized on the configured - * address size, flags2 always has 64-bits for A64, and a minimum of - * 32-bits for A32 and M32. + * The flags that are shared between all execution modes, TBFLAG_ANY, are stored + * in flags. The flags that are specific to a given mode are stored in flags2. + * flags2 always has 64-bits, even though only 32-bits are used for A32 and M32. * * The bits for 32-bit A-profile and M-profile partially overlap: * diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 8d79b8b7ae1..e51d9f7b159 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -506,8 +506,8 @@ void assert_hflags_rebuild_correctly(CPUARMState *env) if (unlikely(c.flags != r.flags || c.flags2 != r.flags2)) { fprintf(stderr, "TCG hflags mismatch " - "(current:(0x%08x,0x" TARGET_FMT_lx ")" - " rebuilt:(0x%08x,0x" TARGET_FMT_lx ")\n", + "(current:(0x%08x,0x%016" PRIx64 ")" + " rebuilt:(0x%08x,0x%016" PRIx64 ")\n", c.flags, c.flags2, r.flags, r.flags2); abort(); } From patchwork Tue Mar 25 04:59:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875984 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2476776wrb; Mon, 24 Mar 2025 22:08:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXgXEQp3O3rUQXkFNqNJRjDXXqNYHgG15jg+lB2l+AsQrcNTGw1R1bUuAlhM2+eRtTCbxX6Ag==@linaro.org X-Google-Smtp-Source: AGHT+IFLnPWziLaI9iix9SDl1/X5LStKjDKicndNH1vj41aWUlw1tw0B96j9PEcyl0xzlePLPRuV X-Received: by 2002:a05:6214:202c:b0:6ea:d033:2853 with SMTP id 6a1803df08f44-6eb3f2bb8f1mr230406526d6.16.1742879298278; Mon, 24 Mar 2025 22:08:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879298; cv=none; d=google.com; s=arc-20240605; b=Z4eHqL53rRgQs7VjH5NixiQERYsOh46rIf9RH43sWtxhkd61oUE0LxWzScDluvzk8W l7wGM3wAzClyDwrTsAl7XdBz2FrdsneWAmAkiARxqvFNnNOxbjEk74rqapmEcFsQ18ua xMYJzXPf2cgdWv3VG2aIYuheiq6cwW/sQEI/lLxUCwd/CkaTi1G+mTaIsiwAO+u+aBMP IF+SUL8tpR3V1A3NoKWxWt/rMIi4jij78l8wNK+BdL9ceX/crB8cz1M0sbotGxevQLl3 axv3bzy8JDvvkHN2tv9Qdgj1S9feer+FHW/RJJZgAUzx/nQ8XWL2s3pjKrRc9DeEUA8Y mDzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=9ozZ2STeyLcJfOi2HO38PmZ1SSe1ZJ6WASMV/GdeD4Q=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=A2R5OI9A1bc4yeUCVhrLq4JqQkqt0gXFhQwQjbJqiUeLX/C6WDzraEL1nHmKb9VOxW I1QCc578OrDGuxKjiDhgyS/5zvk1bnsLoTlhCdomiP/Nnhq7TRSxU2qyHy4mLESDqlbV jCCbubCGCKWhCk355j97wdNzA/wzka47T91ezbEEG2A/tTCjdeVeqB8fZ7YZAArPPvDx JmHPybLglcFS5nCEi/3up8m6tJfoVvdGiqXOGOP13c4oGPdzLjZEcGOTGdAgp0z1qA6Q tYtHiXrX2djZXeI/8ELbz7uEOHl7WX9nDpeTrLrCrZ5fRnqAKMVpDLfj+29kesPib+bO Ni7Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tnoQKmzo; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eb3eff3808si85946316d6.221.2025.03.24.22.08.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:08: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=tnoQKmzo; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwPN-0004wQ-5v; Tue, 25 Mar 2025 01:01:08 -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 1twwO8-00040b-PU for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:44 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO6-0005xO-Td for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:44 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-301cda78d48so10053161a91.0 for ; Mon, 24 Mar 2025 21:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878781; x=1743483581; darn=nongnu.org; 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=9ozZ2STeyLcJfOi2HO38PmZ1SSe1ZJ6WASMV/GdeD4Q=; b=tnoQKmzowy9/RMRutjRfPJeuEE7hjZRcMsjLFO6pSze00QCwylUT8mh/RZY1vLGILl Gbja6IjZyF3BZLvihOSyrRRktMGGmJp7BAjL/emWCzy6lAV4Df9qhrRWM9bX1yTjdTxV 0iT3gPdRXroaO9CmTutIA4vuHoB10G0IoNY2I655afuT0FGHSHwp/5ef5DaWrsRAvtnn eIWDBVPPJe7nsp/pn7gWcdUE3zWFdz+VAKR7uDrYGOK7azb8g9k0HA8W6Kwq1hcV9+Uf S7JTSwNrA3A2MAfX/BfCvt5s23oGRfxaib2lmnSMlt2iFGSo6UEf2RuW2PP0qbQjhUzT XoNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878781; x=1743483581; 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=9ozZ2STeyLcJfOi2HO38PmZ1SSe1ZJ6WASMV/GdeD4Q=; b=DOFw4QFJgHshP/7+kx9uQePjgauB0GJGiRZPYgGhMZRHfUv6o9KkHjhJJ+T3yfapoh zW+W0GACNBnMnqUmERbtBsLI+1mkZ5MI4YfSOBqoY1PN5WRzcK7JfxhXxpKgKi1oqjXo NNhIwdxBufgrRnzf874QTGX0lO6UI7eY9f0163jScA22d3hp657ergiXLJdT6HpA0+Us GbaUgdG+i4pTWLAefbYCAsLUpXzunB/VGfuYXiFX5Fs/TN7Ezaww6Wvr6xFvGkjSdLZW 1D7dt0Hra3foghbd2kqhU64sse0Y6h6XtiCo6xew9JsvXTrjAf4qyZ1CwWilTFwn9BT4 P8pA== X-Gm-Message-State: AOJu0YzbGnZBmck8pnV+dVyXjZ+MjKyOtbMGO/YKIAX0oZZ/Z2HC39Ks hYEXLp+uiRT+NqrySUIGGeGK0c93Yf3ncG1lzYeVFxtB9dLwbj+qasqUprpo4wK+4QG0sEL/jTN D X-Gm-Gg: ASbGnctxTDBu1wl+KuYLNdY92Tt5IX6ZNm/ZRjzS0n0VFmikxzr/16n8jlfBjrhPEZ4 wT/qPFFuqCCrIS6g4SNk3wIzyO0Oa4HpSKmcJl3G/LqV35kQxFy4lW/Z4i1iDCTZTS9QYNCNfor PRntO2NghY6lvm2XOhpTYL4ZZQYmFoEVTZkoVikRbWVj7qPlnbvGyvwI8QfFoILIq4UoZIl5rqU 3bsulrbscN9xWjb2GCBUGz07tVscg8o0vb91q3eyQGsBr6YgtT3O1nhguPEpIPxJw2N+0WqoxZL p6xnzkO2GSKFCQUBctZ4hfRVZU6rbBMBfIUcDEI/tZKp X-Received: by 2002:a17:90b:2551:b0:2ee:d193:f3d5 with SMTP id 98e67ed59e1d1-3030fe595c0mr27540468a91.7.1742878781525; Mon, 24 Mar 2025 21:59:41 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:41 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 21/29] target/arm/cpu: define same set of registers for aarch32 and aarch64 Date: Mon, 24 Mar 2025 21:59:06 -0700 Message-Id: <20250325045915.994760-22-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102e.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 autolearn=unavailable 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 To eliminate TARGET_AARCH64, we need to make various definitions common between 32 and 64 bit Arm targets. Added registers are used only by aarch64 code, and the only impact is on the size of CPUARMState, and added zarray (ARMVectorReg zarray[ARM_MAX_VQ * 16]) member (+64KB) It could be eventually possible to allocate this array only for aarch64 emulation, but I'm not sure it's worth the hassle to save a few KB per vcpu. Running qemu-system takes already several hundreds of MB of (resident) memory, and qemu-user takes dozens of MB of (resident) memory anyway. As part of this, we define ARM_MAX_VQ once for aarch32 and aarch64, which will affect zregs field for aarch32. This field is used for MVE and SVE implementations. MVE implementation is clipping index value to 0 or 1 for zregs[*].d[], so we should not touch the rest of data in this case anyway. This change is safe regarding migration, because aarch64 registers still have the same size, and for aarch32, only zregs is modified. Migration code explicitly specify a size of 2 for env.vfp.zregs[0].d, VMSTATE_UINT64_SUB_ARRAY(env.vfp.zregs[0].d, ARMCPU, 0, 2). So extending the storage size has no impact. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- target/arm/cpu.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index cc975175c61..b1c3e463267 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -169,17 +169,12 @@ typedef struct ARMGenericTimer { * Align the data for use with TCG host vector operations. */ -#ifdef TARGET_AARCH64 -# define ARM_MAX_VQ 16 -#else -# define ARM_MAX_VQ 1 -#endif +#define ARM_MAX_VQ 16 typedef struct ARMVectorReg { uint64_t d[2 * ARM_MAX_VQ] QEMU_ALIGNED(16); } ARMVectorReg; -#ifdef TARGET_AARCH64 /* In AArch32 mode, predicate registers do not exist at all. */ typedef struct ARMPredicateReg { uint64_t p[DIV_ROUND_UP(2 * ARM_MAX_VQ, 8)] QEMU_ALIGNED(16); @@ -189,7 +184,6 @@ typedef struct ARMPredicateReg { typedef struct ARMPACKey { uint64_t lo, hi; } ARMPACKey; -#endif /* See the commentary above the TBFLAG field definitions. */ typedef struct CPUARMTBFlags { @@ -660,13 +654,11 @@ typedef struct CPUArchState { struct { ARMVectorReg zregs[32]; -#ifdef TARGET_AARCH64 /* Store FFR as pregs[16] to make it easier to treat as any other. */ #define FFR_PRED_NUM 16 ARMPredicateReg pregs[17]; /* Scratch space for aa64 sve predicate temporary. */ ARMPredicateReg preg_tmp; -#endif /* We store these fpcsr fields separately for convenience. */ uint32_t qc[4] QEMU_ALIGNED(16); @@ -711,7 +703,6 @@ typedef struct CPUArchState { uint32_t cregs[16]; } iwmmxt; -#ifdef TARGET_AARCH64 struct { ARMPACKey apia; ARMPACKey apib; @@ -743,7 +734,6 @@ typedef struct CPUArchState { * to keep the offsets into the rest of the structure smaller. */ ARMVectorReg zarray[ARM_MAX_VQ * 16]; -#endif struct CPUBreakpoint *cpu_breakpoint[16]; struct CPUWatchpoint *cpu_watchpoint[16]; From patchwork Tue Mar 25 04:59:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875966 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475179wrb; Mon, 24 Mar 2025 22:02:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVGwe6i4EZGlqbo5CkIG+rk6rZP2397LuOyEJbChB5f1BlJo4TtfKbm+C9KBbexXadKgShzdg==@linaro.org X-Google-Smtp-Source: AGHT+IEEuea3BH3TijDU7uNPAHc1xmVN+wWpfRp8us9pTrYfQ/qOipbqTkRrsl2k6kTJuTPJq2QS X-Received: by 2002:a05:622a:230f:b0:476:ab04:e457 with SMTP id d75a77b69052e-4771de7e778mr173425851cf.51.1742878977414; Mon, 24 Mar 2025 22:02:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878977; cv=none; d=google.com; s=arc-20240605; b=eX20hA39SI/dhUQjIwhJRUwzXKUxokM20bAACXg4l5kd8X+TCNG2p32p80ADxMNLUP 0sh7mVbsGxseZ6ziMLv97NAOYz6mQ0/Rj909ucV/W11OvfjcU2lyYOymIHMlPPz41yG6 q6v8j17+FHM9B+ZLuaz10cviSYEpb5XLJHCjx41psRoJQjjnf4y6x3qNdqbPkdnVYad0 m41oAQx5SXbKvELHAy2bH+ZWE+U3UvWz0G7ayqtoQ4rqGmiSzPMkqS1jR1Qbu1+8IxWA OtC5xJBtalCk9uOOf4YW0TUEwfcBX5HeboqUVB4s+OLUCQ9OLloQsGFQFMuxWvjJKzHU k5iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=JtusWKYTrMDoHpdfg0nshB8ODIflkcfJFt+VFvekQoU=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=ao1GWvJG7v5/dElM4+156Y2ziGG0+ZoKdZ0Yib72vguly3EWtpRBJpxsCywqnkXR5A g1n6IhDCB6PLz0TEOFBNf2QHjSa8qNQ/Fk6qTmBbmrMMZKUGklFR6Jx4+iOceSwOpQFn TQPxUptBj2+p8hBa28qvO9BOeRvAZLnXQjC3ij5aXFgpuyLDR1a4JJHiut3op3VSast8 +60O9IR8QWpnXI9w/MPGGhIMxRYYznbr1rYyiAkffBdtfnZHRGN9ZSZ40KoY5xkTm8Dp pDIfhpAyKiY76dBkNGT73RxRGrXMf9flvNP+SAGIOc0u7CYYpJ52N0d/tn9tjUd63w0o HV0A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fV3eTQSL; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4771d4fe5b4si88630801cf.239.2025.03.24.22.02.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:02:57 -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=fV3eTQSL; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwQ3-00064o-BI; Tue, 25 Mar 2025 01:01:44 -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 1twwO9-000414-U3 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:48 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO8-0005y5-Bk for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:45 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-2260c91576aso86525945ad.3 for ; Mon, 24 Mar 2025 21:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878783; x=1743483583; darn=nongnu.org; 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=JtusWKYTrMDoHpdfg0nshB8ODIflkcfJFt+VFvekQoU=; b=fV3eTQSLHlCNRbuDaBE1mU+AknsXZZS2d1ywwIUvCGoaPNwGUERvQESf8XSbo2fnQt e+HDnWHlEdNWjTV+UKfiWIY6WVIM7k0Rb6WMKknZWbDNjSAgusDxw0sTxTguhQLBNnfL wFsaVxDHFKza+73/Hh0tpikZpQRyte6LnINtsV6k02Sy+nLF4ZLKqPEM8NqEP4OpjrV/ CyrxJY0DsU6hrln+g6gNyumc8OU6aT7fZdk0RkPQ9smuKtAJgMBjCR2dNLVx1BUfPsc0 mEk9yOzhug0gYwW0DQiGp8QksK+h3CP7pqekxZxKE6V1ZtXHoJR2TyBEtsjSIjKb6Dsl GdiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878783; x=1743483583; 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=JtusWKYTrMDoHpdfg0nshB8ODIflkcfJFt+VFvekQoU=; b=bCERvgWVj/BmtqYCCSNQOXed6P1UEb3YRpGsX0rlGUNJt6DsM3DPamYg/84KtxZwBY uhiH/+OIQjlljh32kLMMnuaPWBoz1AsZJwRdFhPHqNvS8RBluaN635Zu/pgLXly1KWOn EZPqL1epWcFflOAvkegwwMvGkWjPg/5zSTKeeBhQvO48xIZHgOC6b4PlkF0mocf+NOOX fFXYJPPlq2Sa0vAoQIjRXkkd6RrvTPa5UfwwOtswC+dULgDb9LPgLUQvBtOFh53GxMut aYvrM+JVv/4pfB5UTQ7kSN6ZEY4bEO1B9p6dNnZFNXkjBDw6ae6uwzQNqwGlaFWiu6lA IkEw== X-Gm-Message-State: AOJu0Yx55bnjXOf8lz2LcsyDOvxJucKE/Db6vofO0ahopeFNGoL1FRSt ynT3FDjBe7ysvVGthOtXg64pQaVJnP72KPsnXo1npLwiqmzFw6k99795+ohDDsdQSaeRAMRbUsj I X-Gm-Gg: ASbGncvq8QL2w4wyqITOE37Y6/wFC27BrusnTh2WkJJ1AbgQWiqVblbZVMda6cvFnk9 FJl3LKHc4wrETgeYpQzAUEGlqYNEfl/sM8F1U2hZXFFE41dHzq5nRnn37rnyfQ4xiG4+zb8Yg3A sLwoqDHsTU96mCJHq45U2Kp4ErFmGxH9IMSJ43OeaHCEe5uGsAobEUp1bf9SjJS5ZvulK2LQwsk Rp37uuBAoNIvWxNcSG6AM/6Q1NxuQqGtKWm44CofW2DHiDA+8ubNu0/2/VpUdZAHese8a+TTW54 /SYvWg2yFk2JZ2ysgQN4bfDra5iVZz2XgBMtF+VK+iCQWyGKOQUX9CY= X-Received: by 2002:a17:903:46c3:b0:21b:d2b6:ca7f with SMTP id d9443c01a7336-22780e07919mr289321195ad.32.1742878782353; Mon, 24 Mar 2025 21:59:42 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:41 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 22/29] target/arm/cpu: remove inline stubs for aarch32 emulation Date: Mon, 24 Mar 2025 21:59:07 -0700 Message-Id: <20250325045915.994760-23-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x629.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 autolearn=unavailable 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 Directly condition associated calls in target/arm/helper.c for now. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- target/arm/cpu.h | 8 -------- target/arm/helper.c | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index b1c3e463267..c1a0faed3ad 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1222,7 +1222,6 @@ int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, */ void arm_emulate_firmware_reset(CPUState *cpustate, int target_el); -#ifdef TARGET_AARCH64 int aarch64_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int aarch64_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void aarch64_sve_narrow_vq(CPUARMState *env, unsigned vq); @@ -1254,13 +1253,6 @@ static inline uint64_t *sve_bswap64(uint64_t *dst, uint64_t *src, int nr) #endif } -#else -static inline void aarch64_sve_narrow_vq(CPUARMState *env, unsigned vq) { } -static inline void aarch64_sve_change_el(CPUARMState *env, int o, - int n, bool a) -{ } -#endif - void aarch64_sync_32_to_64(CPUARMState *env); void aarch64_sync_64_to_32(CPUARMState *env); diff --git a/target/arm/helper.c b/target/arm/helper.c index fa23e309040..73e98532c03 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6564,7 +6564,9 @@ static void zcr_write(CPUARMState *env, const ARMCPRegInfo *ri, */ new_len = sve_vqm1_for_el(env, cur_el); if (new_len < old_len) { +#ifdef TARGET_AARCH64 aarch64_sve_narrow_vq(env, new_len + 1); +#endif } } @@ -10648,7 +10650,9 @@ static void arm_cpu_do_interrupt_aarch64(CPUState *cs) * Note that new_el can never be 0. If cur_el is 0, then * el0_a64 is is_a64(), else el0_a64 is ignored. */ +#ifdef TARGET_AARCH64 aarch64_sve_change_el(env, cur_el, new_el, is_a64(env)); +#endif } if (cur_el < new_el) { @@ -11665,7 +11669,9 @@ void aarch64_sve_change_el(CPUARMState *env, int old_el, /* When changing vector length, clear inaccessible state. */ if (new_len < old_len) { +#ifdef TARGET_AARCH64 aarch64_sve_narrow_vq(env, new_len + 1); +#endif } } #endif From patchwork Tue Mar 25 04:59:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875979 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2476442wrb; Mon, 24 Mar 2025 22:07:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWDViYOl51U8Bdc/6ja5HOn1dmH4E3GS739b6YNxMyfMhvNKVfvtBMsSEiZzxTQS3hbIlKtBA==@linaro.org X-Google-Smtp-Source: AGHT+IFoJa7UIz1glRzBy4Qhclw1Z1TsgX4O2L7QQgwhx7e5wZNYvpQXj47ZoALG+6shjLBZuLoY X-Received: by 2002:ad4:5ca1:0:b0:6e8:fb94:b9bf with SMTP id 6a1803df08f44-6eb3f279857mr207436436d6.4.1742879229142; Mon, 24 Mar 2025 22:07:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879229; cv=none; d=google.com; s=arc-20240605; b=dHf9VuCf/xHaUkG7zH3k0O0qnfns9Qh3hqtYlA/2enPEk2e1CeZDkOAaD5dMZ/tLNa U3bCfG9UeaWMk2qbkvi1TdM6Qc6ymMOECJMTjBDzTqcPLWO9DRi4LfcgefcY6LmYotqe AVpkEhA2yr95wCJGmLOdn/YwwMUwDhM3oEm3ZWwT0Mh7gcjdcv6jbMdXpuersgWfzvpB dcLGYtfVUSrNyDRGLaw8l4uRzBR76H3LPEd3sEkG7EgmRrgVBBvHyaUVJTwSt1agDkgc 2cSyfO0n9v/uq5iE6mnhDzVhPoKj7nzLU71nH5KJSGmdBIyNykzp+CN4kFZOIyWO8Gs/ n1TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=kI6HALsdQGcYyIHmM8Ppnw0EYvYwjf9AgyEFGP9MumA=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=h/sw6vbGyfLF4Zyx5e5HGhbyjrXEBm9k/ngj+aXurJORhmIO4c14sHlqHMkDVdG5SQ C53CDx5iFfFw3JhfdMlSnANYwLnn/Iuk0v8pVvjiFta3p2dZSIrr3lJeKS/XInhEPHbO yzw0/qjwEYfiYtqg1VGT88S156A5bTxGgSQxRCAKjRTH90JnOJ6/TMHU57b5dFpaJ0XL LIHe4JgBEJtVUufLYNCOQ9qU1vElimVfJmiTg7yAChQZ28bPN13CByaeUR5NJabnQ+tU P2UGQZhXkNz6sbFVbDi2WtNpLdlAAF6Qo426EWlssho5QEOlBJbiNDzL5c3V3v0iq4Hj wUoQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="jwo/0ENX"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6ed0e3bc907si6119546d6.114.2025.03.24.22.07.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:07:09 -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="jwo/0ENX"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwQW-0006gT-4I; Tue, 25 Mar 2025 01:02:12 -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 1twwOA-00041f-Tn for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:48 -0400 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO9-0005yR-56 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:46 -0400 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-2ff69365e1dso7102779a91.3 for ; Mon, 24 Mar 2025 21:59:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878784; x=1743483584; darn=nongnu.org; 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=kI6HALsdQGcYyIHmM8Ppnw0EYvYwjf9AgyEFGP9MumA=; b=jwo/0ENXfDGGU13ghgCw2kF2ba88BoXTFYY/6RZQvA/KZ1tKvcCd/hJdZ9EiqtLD55 zLOH8Yo4gP9m+1RqnBWloTNxFy1H/5l3s/RPlYRzoE/iLxW4g1+vgAqze2xMifgqqthZ PM7IcB2mREORcSVIH8PR5HVkJS4FsGvJBFS3vs1upw4kth6pn4dCTfjXdvu6V012SqRR oZgm/mpco6133EFSrJtlgpjheCXXHH5pnX0iMZ4VoqLBoJBgZcjal52Kl7wtkfpzUOIP HEfyv3V1aprjidHad6l99JfkxclfgzVvbR3A0NLb/9KBwSU2nlZWdKUVOzrRG5OP2Kku D9wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878784; x=1743483584; 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=kI6HALsdQGcYyIHmM8Ppnw0EYvYwjf9AgyEFGP9MumA=; b=A5wgpQrdoLh42EDKDxKyxIDfadQ7bH8VCJrlv7LARoBdWait4H8Q8yOaI/9l+MF2tW 5mFhZjWd2fr1DFJYamk6BoP2vdGlUHzbajkq96NKqy3iDrMMWk2Ky6GvsJZyJ/8Ico26 fkcHUJFW4B+QGHKBD3hXQTxRo2cl75eVF8eacSnRDX+7tcNk+LVOK8CZhGTFy/pL2EaY KLP6HnJ2brBDEr3vfbTNr8We+LcB3EjGqXHFe2jGkuYnSJlIbgNN1+tJFkcDEF3TU5gf 9GFCh+WcUbXrliHVq8+ptHdqmcbytFj5ElFL9Tl6v2psCZo9JbZaRtmHfvsaAj47N1tE vXQg== X-Gm-Message-State: AOJu0Ywxf7LsfxDSS0kcaSGmgfCdKC9ZZ2Lhery8k6hjmoB2wpknUzCK +jqVvmZsrW9DZgwVjEVI1tOhLxNaWATbQhGjNL9CvVJ1DWP1uOOWFQvJDggOapKYUcffe7viYJ4 R X-Gm-Gg: ASbGncuAtqWdK6uPHkOsgeO4zC34NmbCSj6mdBDSXowwvrmi5iEc2BokU0zL8oSMVP2 gKxSBda+vhyk4MeHimE0KeX6OrcnKAzUFIkBKrQepgmLj0YRgcwPVt/SvlSXpFNeBHvEhXmfObc tw/LGkZUJgiLdtkbUGLpoAbf1UNvRrAre+oOfspuuOT3HDBKJppnpJvFkqos0Mrt+ensBNXfFet 4k9HugM+67BJNsV5gCk7NapsKYIpadXp+EJwCCF7tYq752wiGJFjhemXNx2HdVnCIX3MZkYJ579 j6TNfpS0xdOx3SKjefoI3evF3F8za/qUUVaYYhuotxPW X-Received: by 2002:a17:90b:3847:b0:2ff:79ca:24b7 with SMTP id 98e67ed59e1d1-3030fe9804emr16981073a91.21.1742878783768; Mon, 24 Mar 2025 21:59:43 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:43 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 23/29] meson: add common hw files Date: Mon, 24 Mar 2025 21:59:08 -0700 Message-Id: <20250325045915.994760-24-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1034.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 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 Those files will be compiled once per base architecture ("arm" in this case), instead of being compiled for every variant/bitness of architecture. We make sure to not include target cpu definitions (exec/cpu-defs.h) by defining header guard directly. This way, a given compilation unit can access a specific cpu definition, but not access to compile time defines associated. Previous commits took care to clean up some headers to not rely on cpu-defs.h content. Acked-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- meson.build | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index c21974020dd..994d3e5d536 100644 --- a/meson.build +++ b/meson.build @@ -3691,6 +3691,7 @@ hw_arch = {} target_arch = {} target_system_arch = {} target_user_arch = {} +hw_common_arch = {} # NOTE: the trace/ subdirectory needs the qapi_trace_events variable # that is filled in by qapi/. @@ -4089,6 +4090,34 @@ common_all = static_library('common', implicit_include_directories: false, dependencies: common_ss.all_dependencies()) +# construct common libraries per base architecture +hw_common_arch_libs = {} +foreach target : target_dirs + config_target = config_target_mak[target] + target_base_arch = config_target['TARGET_BASE_ARCH'] + + # check if already generated + if target_base_arch in hw_common_arch_libs + continue + endif + + if target_base_arch in hw_common_arch + target_inc = [include_directories('target' / target_base_arch)] + src = hw_common_arch[target_base_arch] + lib = static_library( + 'hw_' + target_base_arch, + build_by_default: false, + sources: src.all_sources() + genh, + include_directories: common_user_inc + target_inc, + implicit_include_directories: false, + # prevent common code to access cpu compile time + # definition, but still allow access to cpu.h + c_args: ['-DCPU_DEFS_H', '-DCOMPILING_SYSTEM_VS_USER', '-DCONFIG_SOFTMMU'], + dependencies: src.all_dependencies()) + hw_common_arch_libs += {target_base_arch: lib} + endif +endforeach + if have_rust # We would like to use --generate-cstr, but it is only available # starting with bindgen 0.66.0. The oldest supported versions @@ -4254,8 +4283,14 @@ foreach target : target_dirs arch_deps += t.dependencies() target_common = common_ss.apply(config_target, strict: false) - objects = common_all.extract_objects(target_common.sources()) + objects = [common_all.extract_objects(target_common.sources())] arch_deps += target_common.dependencies() + if target_type == 'system' and target_base_arch in hw_common_arch_libs + src = hw_common_arch[target_base_arch].apply(config_target, strict: false) + lib = hw_common_arch_libs[target_base_arch] + objects += lib.extract_objects(src.sources()) + arch_deps += src.dependencies() + endif target_specific = specific_ss.apply(config_target, strict: false) arch_srcs += target_specific.sources() From patchwork Tue Mar 25 04:59:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875962 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475049wrb; Mon, 24 Mar 2025 22:02:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUO2DZesTc0jKXJStDcV69718GhbZsym4qIMfHgB45th4fRsLrrd8ctJSEqd0WfDFRZbhD27g==@linaro.org X-Google-Smtp-Source: AGHT+IFFmFPOCdVWN7judHVzvBudQgtmJaldof+FtioA8ckH2WP7Tnuduf3xq/T1twm3VNpofAoc X-Received: by 2002:a05:620a:d8c:b0:7c5:9993:ba7e with SMTP id af79cd13be357-7c5ba237673mr2655423685a.50.1742878952183; Mon, 24 Mar 2025 22:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742878952; cv=none; d=google.com; s=arc-20240605; b=FEUlwp09OiVenT7ygqzSFI/WmMhapng1rpE9VA+g0G3Gb+Aw35UOjbyVy/XVG1RyB8 Y1KAFvDyGksb1ITT7o+cOHr3JS/vAbm5mCkitZ/ih7BKamqBSzb7hykkLVh3Z7E33Elw 5/3R6kzZWovwDzoOSnfAeH+5efUAIb5hhbiEi2xU7gkOKKRJfunHPvUV75b4X+vA5G3G oCyobJH3zSrrktEKDnHzH8eJMmyOEI66R1moFtjI+1CfqomgjGzwu3i40lP6NSAwHwQt KocVObeVrfLgEOEGu4RDqobb4uDjCOym6slFw3bdmOfc7pqD+TfQ+jQON7odBmDxwD5N MHFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=ZFUKmZL89sYZSB0AC07VWMO1RZJQlXSAYHwQi6w+77U=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=GDLFbPvVQqUhSEprkk3M1I9DJLe6jtOINDxkfVTFaqv0Ml+JvGaCNNrCDP42tci3JT SnnCGgRKUmcewOVehLeAmAQMFgmo7spLNnto19xU3i/Ma0xSimH6r9ZzHS0VSBsR7FAi MD3/4QgIJSWNQpcTrfywl+3NPGhoNIoTJDAXEYg7HSuQdrYW5wPoeRcle6QJ/Yi/w/Ja VzxlCOBdsDelWqsoYBE0ks9h94mcHvFER8UnjMcONqbaxb3hbIsNC3o4rxPZeJTLwqBV S1e2PmQBsckelyQp2Wvu8fv0fmvH6WA7Z0J4PBXR1FCcHbFDqDe/cVm+HmGTH8DJ+F+5 Wv2A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xc2FBGEy; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b93837b7si896670185a.598.2025.03.24.22.02.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:02:32 -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=Xc2FBGEy; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwQ1-0005xK-VS; Tue, 25 Mar 2025 01:01:42 -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 1twwOC-00042C-Kk for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:50 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwO9-0005ym-VY for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:47 -0400 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-301c4850194so7515151a91.2 for ; Mon, 24 Mar 2025 21:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878785; x=1743483585; darn=nongnu.org; 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=ZFUKmZL89sYZSB0AC07VWMO1RZJQlXSAYHwQi6w+77U=; b=Xc2FBGEy0wMvdhCHdPPo1/Ozo7HvpIDHPGsmqXwlApP7gNQ572YZahdKkDUXibKYFX a3YUMkrhtkEXrW4uQnsVa8EqFB/nj5t4knAhbmFXUt17UIdyyqLkwAYmMugdnW+zz6R5 dk4IcV+rWsyVelFzAvemIOFqTZhu9Mg7K82Bh2v5rD0kfKt+XYFSF0aGL2llGjSbOJCX CpfBVWCareQC+x0oM3sRVAou13uIwAnxJzqjexLd3hAXxC2SkU0v5fCCpmGxB3Cp3EqT G9HNzMj7018S0H1hFzXtZx+pIfrDi9LzrM3lj3OIJ8eDur9dyiisheWVnbWmXqlH5lEM Bn0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878785; x=1743483585; 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=ZFUKmZL89sYZSB0AC07VWMO1RZJQlXSAYHwQi6w+77U=; b=caYsN6o1QGYIiuCqDTxDwART9s1jEmcN96VonxXajO6y1yF7kOZsMvFu2R7pY8tbTA Q7mrwzNPehKAf6c7/ED999ufNcMIk/KmR7pQJUcNa0f82mBUJ6O4SkFYD33vLwUFFKbK 1ShZl9GREBAx5B96q6OTlM0mtYhNKaLWlogT0PTTuKY6WC18VV4gEVwyuIBXLRK9VK9l f/MOXrecfCnNAbxJ1tYcUlbru97jL+DO6GKWyorNermMO9puA0vbdMICvK5/XhxG1ORp Z8sLPFxwSi6m1Gxv0LDSpLL31gcst/AYleYEdU+ZrQOlgR36thn+A4wqMjn3HrKmMNvg AqEg== X-Gm-Message-State: AOJu0YzTAlrqtyMUW6kX9KJ9dHcv0rZs9Fc38FcYwEpySkysTnVLZTv0 wAS2XcEndFjAsnbEPclqESR8sc9gGrgv9QMZhD29Ap6ftvips0GNot5LmgTw7QAMJz0JGcm9Vpt e X-Gm-Gg: ASbGnctEa26c7tjFF3y7fXXKlx3rxxyIqlbyPZ1bkX+53Wt8neaGaPAgxK4s0JkReFu fnwRfiVVCB121hB3H6wm59L9lPkU/xrMNPkRVgcbLttPtkBg18l45HmLgXvR36R9ljj+a8VhyMM 9V5JClFvfPD0puRxoDGUV9nW0WK7d1/kYJt2czqJWnft+iN1NJIVxh5qq23T0W6rfs39GHJFtKY sEbhf46O98wnQ95dWOrs6MzQXlOH1NRWxOKLj4Y3xY6hev2oS3JAcwrK/Ntt8ftGwWbvvCk9P+X w2UnVx430dkT3k9SZxaLxCuhPDB/wSJ+y72Hy9JzcIqf X-Received: by 2002:a17:90b:2747:b0:2fe:a336:fe63 with SMTP id 98e67ed59e1d1-3030ff10879mr26301744a91.24.1742878784581; Mon, 24 Mar 2025 21:59:44 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:44 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 24/29] hw/arm/boot: make compilation unit hw common Date: Mon, 24 Mar 2025 21:59:09 -0700 Message-Id: <20250325045915.994760-25-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102c.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 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 Now we eliminated poisoned identifiers from headers, this file can now be compiled once for all arm targets. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/arm/boot.c | 1 + hw/arm/meson.build | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index d3811b896fd..f94b940bc31 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -14,6 +14,7 @@ #include #include "hw/arm/boot.h" #include "hw/arm/linux-boot-if.h" +#include "cpu.h" #include "exec/target_page.h" #include "system/kvm.h" #include "system/tcg.h" diff --git a/hw/arm/meson.build b/hw/arm/meson.build index ac473ce7cda..9e8c96059eb 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -1,5 +1,5 @@ arm_ss = ss.source_set() -arm_ss.add(files('boot.c')) +arm_common_ss = ss.source_set() arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) @@ -75,4 +75,7 @@ system_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c')) system_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c')) system_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) +arm_common_ss.add(fdt, files('boot.c')) + hw_arch += {'arm': arm_ss} +hw_common_arch += {'arm': arm_common_ss} From patchwork Tue Mar 25 04:59:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875980 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2476443wrb; Mon, 24 Mar 2025 22:07:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV+4uKkRS2rnZ50bvd1KT/giG+/58StNJVamiFrs2WqyaC67nJ+HHipdzru51XQQxqWLPLN1g==@linaro.org X-Google-Smtp-Source: AGHT+IEqpR2ELZ0wUJwGYMCjJ1feDE185NsymOhgn9SaiEtRonpMG57l31QEL/3jifNJCbYiwwgd X-Received: by 2002:a05:6214:20c8:b0:6e1:6c94:b5c5 with SMTP id 6a1803df08f44-6eb3f26e984mr277172236d6.4.1742879229213; Mon, 24 Mar 2025 22:07:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879229; cv=none; d=google.com; s=arc-20240605; b=aluNXMxswNf1QNTexkZ33TRHnOaKLRYRPyf18N/0kf30M7xyxQiewvHibcgG9Lsi8V SelzMegxrGiAwajyWD0hcXeDykirUBWLMNuWbX9X/jYCd+RzZz69WbZLHEQySQI4nLmw Ab1CUVbl8fDV6LeVzEHs5LKW8W8kan68Y2U6DHn5pYzvAkUi070T3Ish7D31fB7My3de XYMpEzrOKeGoKgQQwVCA9Nwtngp912dick8dGjz4Dr2XxwI50gCIGMd/LNXLd3hB7gb8 VQeSbUuz8Qk9dRr9UDnGwvNWU7Y1v/eXgz9OgKRbKt5uKTqs0yp29D+f3fuGxQEgGcJf Scdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=pArVD1rsNNhsePjAEu6qC315uMjwLbUtwsk4rPFCwig=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=DpirqE06zWUoqWdxaeSjSxZIgu3VhNZ7ApBAZKvvGkbKbFGbfhoYfNlH+yuopT83Oz K8OMAud06mPR8k3Tgy0k7Fbr0EM6VwqjwEPCDTKwfhyDR2hg4FacZjDYxCV8Ew9t8ZF4 HuJEcEnLSfo0oR4MWv885W9fYKlH6IsAcRxZlqws7SkDFNJndlQwbkzBZ806tKCXKbJN Lcp5pdP6Ku5NDpeNavjqTCgVwKnOHk+BIUBCIvwDECoGLBK7fDrskutOGvoJRi0si1Ql MDRKdJOZ80IhKDzyzM0WDKG8+yuVAbU3ep7asbnfdnAxRGr1YFsqFp/hPepg/xQ6SsrO 2MnQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OYy0vqFo; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6eb3ef4a03dsi90518946d6.16.2025.03.24.22.07.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:07:09 -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=OYy0vqFo; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwQe-0007Rv-Sp; Tue, 25 Mar 2025 01:02:21 -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 1twwOC-00042K-Pg for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:50 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwOA-0005zA-Vm for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:48 -0400 Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-2ff784dc055so8530606a91.1 for ; Mon, 24 Mar 2025 21:59:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878786; x=1743483586; darn=nongnu.org; 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=pArVD1rsNNhsePjAEu6qC315uMjwLbUtwsk4rPFCwig=; b=OYy0vqFofkJcA9HlmudXJA+8bLkC8IV+62ewJTxv8ZDXsUdFOSLk5CHaKZi7xJAgYv Z3yN584xmQWpi8k9jvkQZmit4lhmXBIA2gqOt/Q9fSOlK62CDczj0TjdnP9okAHGoOVE ku2x4o7ntASixzsUCGzDK7grClzXEYGY+RUDSRKaf1r/ZxMZ7BL/9pR4/3JP+thx8xHw 4j/p26BCWulIiIDYsoDp6w5U5oP0XNPv0R9VVSLY6d9gFHcOxFdOu1lOieRkh3kyjT/2 uifI4e0Is4VpIygvMkvBXtP8wSVmMbbshWGd6YiayV+U9o9/4VQhzc2XQtuXTb4IXxlA knPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878786; x=1743483586; 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=pArVD1rsNNhsePjAEu6qC315uMjwLbUtwsk4rPFCwig=; b=dpP8VaAZBwpS/goZ+dd8D2b5zbBIR0XOyfVksrPq7tLTDzthqy8BJKM4nLt3/ZpDq+ xgKC7IYXELKI1R7NhH9CYKVa0jX9Fw6eQR4C+uBfqUUAifHRWUo4wotPbK/GNzfByJKi LEwTyKD6vdjd8dFNw/DJQiEzxdEN0iObOhS/LlUP9GLkeuWrM/NuPA+YEdnm7uuBla1o kkdRLpgEYzRqXH8XkATNb6a6Q7vbqAFpDldso23T4KOb38nVFHy1W5DTpU45UKfrXLU2 BAYXid39F8zyXn8XtF0c/vzGufNBISLNJiLmGTa+2v7om4EN8tz+Zc9AekJnGsry9A6R JLaw== X-Gm-Message-State: AOJu0YwSVDnhp2/lJUbr2q5SQ3xNa29uBC7wcmVpsMBIKoDuP8DSz4c3 EP/0ycqBPB2KVREBkO4X8LUQ9fOjBafGzLZW4okPGNZfXnLjXhQt151BCqtVxvx7mr1xnxza5JU 8 X-Gm-Gg: ASbGncvutYtOmElhyKNQHAhQ+Wk9dVGwiNBeNyIanQwVowHfA30+rrO59PNZIuZ6IkV cJtKb4B1uBFBvls5ZEG9XGNT8JvfjS6cFbzGHM9zpLXxeuVi2Z9/8Bp9eKWOr1dmnzhwsWw7uyH I19LlWbd147FfMpU+iFpzVLTHpeNmA/GRznIF6/Gmbo1KX9voRiY3CfyXVtzMCn9SLzHK5tjj6f 369u3lKLbxaHN0XGO/kbO/1+AV+d2+/tXMBJ2uNluiFH68ldZwPSRfpl37dyor2Nv5/x8zgQ5Ai /X4mvYthOgq/8zOxftJyqsspb/ANk+LJZZ1eHC4X8+7o X-Received: by 2002:a17:90b:2b8b:b0:2ee:f076:20fb with SMTP id 98e67ed59e1d1-3030feaa4b2mr29857443a91.17.1742878785454; Mon, 24 Mar 2025 21:59:45 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:45 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 25/29] hw/arm/armv7m: prepare compilation unit to be common Date: Mon, 24 Mar 2025 21:59:10 -0700 Message-Id: <20250325045915.994760-26-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x1036.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 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/arm/armv7m.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 98a69846119..854498ac51c 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -140,7 +140,7 @@ static MemTxResult v7m_sysreg_ns_write(void *opaque, hwaddr addr, /* S accesses to the alias act like NS accesses to the real region */ attrs.secure = 0; return memory_region_dispatch_write(mr, addr, value, - size_memop(size) | MO_TE, attrs); + size_memop(size) | MO_LE, attrs); } else { /* NS attrs are RAZ/WI for privileged, and BusFault for user */ if (attrs.user) { @@ -160,7 +160,7 @@ static MemTxResult v7m_sysreg_ns_read(void *opaque, hwaddr addr, /* S accesses to the alias act like NS accesses to the real region */ attrs.secure = 0; return memory_region_dispatch_read(mr, addr, data, - size_memop(size) | MO_TE, attrs); + size_memop(size) | MO_LE, attrs); } else { /* NS attrs are RAZ/WI for privileged, and BusFault for user */ if (attrs.user) { @@ -187,7 +187,7 @@ static MemTxResult v7m_systick_write(void *opaque, hwaddr addr, /* Direct the access to the correct systick */ mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->systick[attrs.secure]), 0); return memory_region_dispatch_write(mr, addr, value, - size_memop(size) | MO_TE, attrs); + size_memop(size) | MO_LE, attrs); } static MemTxResult v7m_systick_read(void *opaque, hwaddr addr, @@ -199,7 +199,7 @@ static MemTxResult v7m_systick_read(void *opaque, hwaddr addr, /* Direct the access to the correct systick */ mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->systick[attrs.secure]), 0); - return memory_region_dispatch_read(mr, addr, data, size_memop(size) | MO_TE, + return memory_region_dispatch_read(mr, addr, data, size_memop(size) | MO_LE, attrs); } From patchwork Tue Mar 25 04:59:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875972 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475799wrb; Mon, 24 Mar 2025 22:04:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVk3UYNXaZGRRW+zdlV88m129mkx4z1SZYePBgRCWyqkPnsjYqs2isUsRssXT4rQXyz7avEgg==@linaro.org X-Google-Smtp-Source: AGHT+IFkozzayLX2kiw9zprC94mUejPAdvHl2iJkdfRro7/kqb8MNzOpvhT6M5DZPMHn7TL/aWyI X-Received: by 2002:a05:622a:4c8f:b0:476:add4:d2b1 with SMTP id d75a77b69052e-4771dd5cee5mr276077381cf.11.1742879089333; Mon, 24 Mar 2025 22:04:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879089; cv=none; d=google.com; s=arc-20240605; b=WC8Bi0GOxBFkKg26JGu1+Mp5LX2QOpIovpwNaBbUf9hCVDSTLyo2z6N53DfexEIwbq WXd8tY5TYO/Mk/kjO/x0u85JFsBTMnDMqNRSgrnMxtsDBFAlFsLJxRPDcau6DB1d69mp fuhKSPuNY/zJNfK6jSieTUQIPUd8h53KMjXTTNGBdP0/GIS0/i8eQWIqFevXe1qSBQ4A kZ2FbW6sJd60jD0aR0XUPzcHFn9FmS/Km+0ekaiJrSvuhRjc3La/B6TEior5ZAbyRUnR 5OieszGV3RL+pmS0QV26qYMpmImAd6sdGKbTS9fVrxYbLSQw/fEMT5IB9ttUYPa2Y/xX EnBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=oMLogjQnjMTWhIeJ1ZbndYnRq86dbBuVmVnxwVyz8FM=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=L3SNOcir1aG1LTtL94q+xdeZNeD1ukK45qn2wu30XwOPJHP4AlaQYT5OT9Fcduwump g2mehOch5dRhyjiM15oWx4d1xQuPTjxM3RjYwbmpe6VR17WbDneLOdbepWCMkf2tDZTB J/s2WvzLTuhkGbi+wddq68gpGfz5E2kqMoea49cVVMf0OH4lNV6+Ida8dbwv5nwXn4Ep 38i/i/BwC/8Oj1RAsT0AORRXxSCPgh4Rb5qblrmc6CEo+Qf4EZ79gNhkRiSUt1crjXuD 6g8xw3UQnZ7zdsdT6rzHdBxkYrFgzo2BZl9YR5XZ1/f9pL8lC5nzA2a/3fdEWprEOKC6 E64Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="S/fzs4F+"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4771d52d77asi92572121cf.389.2025.03.24.22.04.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:04:49 -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="S/fzs4F+"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwQe-0007Ru-Sh; Tue, 25 Mar 2025 01:02:21 -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 1twwOE-00043r-U4 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:50 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwOC-0005zV-CW for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:49 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-2ff4a4f901fso9525668a91.2 for ; Mon, 24 Mar 2025 21:59:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878786; x=1743483586; darn=nongnu.org; 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=oMLogjQnjMTWhIeJ1ZbndYnRq86dbBuVmVnxwVyz8FM=; b=S/fzs4F+1Q0/6A4nMSBDqkx3phymsP9GwN88K7ggqx1R/bhGrcCM5V4mUU+F+5eU0B wGQqk6O4Yaqx+EON47HT5vNbMyLzAB8ZrO5JaReEev8lc9M9EDxzsagOPSppaScl4jip A9XZmpoNzyYUjzDzbG/1lI2gonyYJ3Xk8ds0ndewMjASjTNqrx2wwsyjJJXZU7uVoEMw assjZIWUm4MT87RUPZUPKDjWcP+iLskZFTJ7/MBgCJpf1LDjd3dtlxrTly1YdZWhG7tj Co+ZHtSg/WtJbH94PSrl8mS+1OGFYfBgW0n2f5VDQFpWxygMS5AUN/83JyjqpEJXrhys Wxng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878786; x=1743483586; 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=oMLogjQnjMTWhIeJ1ZbndYnRq86dbBuVmVnxwVyz8FM=; b=sRnLjOkEmzvC2YGyfTgBknJSd+kpMdc91tl4AQxbCyLO15LPWEU5RGRjlKUSMypCTp k0ZvedMuLl9LDzje5ASNzwdM7J7K7PqjMSjGd+dgVyl0MZhiKkhLec29JKt6O6WXMY23 1lrlHDlgXeb65OM+vLXOVL3kDGdk7T7ngTZD+eF7kZzAi8hnvX1jvVmnZO7iF4YvTYDk +MRBlyLwG0/vupjkYsX9rsirgXrzhtwn4SW0MAbGW7y3OpumbePg/v6LBiJPLiae3GWt mCGOvIUTCBRkzfc399i3QSPGpf8KkqQ0I7EMC04H0/2lV4J9NzgwYeAfTq9UbiLpMyMb gTVA== X-Gm-Message-State: AOJu0YzDwGHYMg22KSF61z9yh6ePdUq43fDLnkKprG+ABsv2/WlWzLRm XlNdsQ1bGdLqoUjSV4G69L4dyXOEreVi2hpDSZZ/SL5v7dCpGpYKBdBIg3OrQaEbyrNtlYqAZXk P X-Gm-Gg: ASbGnculA0FYwHgVrou6sLA0u3Y1gluiKt6OdtWfyWeKza3EbKcu8QCUWJZWzXZjc2V O3j7v7WeDJpVQSpAxWLLI9r6zo1imGYaWWSFSefjz6fu+n1e6bzI6ztwyMLn42rTgxO2yeydFzA VNgN6DvcNlz5tuoO0E/y0fTu82qJl6p5FfDH8toO4TW/gbulKbC8Kk3NRhpqRSCzd4yPeytj1/5 2wtNMxycfXziN/j/JGPxw/agORByVLJ/UB3p6taWfhPTCzJIfSe3XOTEGh86v+qX257MtZdL9R6 ZVU89dZxZgk12uMEXs3Mxwu1ucVDMA3baS+9h8XuVk0I X-Received: by 2002:a17:90b:2647:b0:2fe:8902:9ecd with SMTP id 98e67ed59e1d1-3030fe7223bmr23232830a91.1.1742878786330; Mon, 24 Mar 2025 21:59:46 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:45 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 26/29] hw/arm/digic_boards: prepare compilation unit to be common Date: Mon, 24 Mar 2025 21:59:11 -0700 Message-Id: <20250325045915.994760-27-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102e.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 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/arm/digic_boards.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 2492fafeb85..466b8b84c0e 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -80,7 +80,7 @@ static void digic4_board_init(MachineState *machine, DigicBoard *board) static void digic_load_rom(DigicState *s, hwaddr addr, hwaddr max_size, const char *filename) { - target_long rom_size; + ssize_t rom_size; if (qtest_enabled()) { /* qtest runs no code so don't attempt a ROM load which From patchwork Tue Mar 25 04:59:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875977 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2476438wrb; Mon, 24 Mar 2025 22:07:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWTy2I/VEGDQJxWekjal5aJdMk2655r3T7m0o1wuVz+Piq9fe49S3HozSMK7aKvNdZGfhYXgw==@linaro.org X-Google-Smtp-Source: AGHT+IHGEylPGeZ8ZSJdILBNNGmFZ5Du/0y0jSe9XOjkHZvGTHOOXoyTh1VucuxQW2NAk50ldORn X-Received: by 2002:a05:622a:90e:b0:476:980c:109f with SMTP id d75a77b69052e-4771dd8eee9mr258178071cf.19.1742879228952; Mon, 24 Mar 2025 22:07:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879228; cv=none; d=google.com; s=arc-20240605; b=YVpN1tJCh31nfJK6GfUyRMIQfvs+RY6BRPgIaGg64KeVyY95JOJ6z5QQ96inGcIK5I EFrm9QyT9/pQGAJRbsI4prDLyhvllDHXbXQEsbYRqyu5MgOwENInaqe5u/ujYEZkIODe 7c9kwP9011bVlXnV3trX5z/tZa5Vn5hjLDOgkwkdQQOkIAfWq+Caj55oYViutPhbgDO7 9/x6lUlH88aBpxI/wWf1Uzq+9AFMLbkzWSrxeS98c3n/gtobwBJdvophXW3ft3I0FWkV m4oQbGnxs2pzP7LyCfiT4uqE1OhtXVYftRZU/NPEwSAtJUZB4UN9WhXJi/IeqA2/Yw8Y bRvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=CSiomrkJehve/L+8sWorbqlbLNaYCEo3w/Nkej8WFsU=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=NG5dbICqavWPObp4yzeJOVwge+7Aylp704sGnP+HAPf4CGGyN5Iq1T2YjtyZM9QjWb lFaQgHCVj/mhuewWJmw604wsaYPm5Edx54mF04GWKFhgKEAqlO4Q0R7KHEQXsA5NdaoS xvGePZibcDsiQHRTr9+34fnyM5uTL0ImmDB7gwoFFbahqQnpNVLDKcFsRBbo7WRbWIRY ajp/wGjWThqG4HIE+XX37lb66lCsX4wL+of5iHYwpPUzXcZ1eKPXDiCU4vb9FRB7ZAY1 L703i0+mhfe0yhE1HiClVWmF2RYg7fGaU6tqB6LgM/D863shFFni7HQ6z3Bf49NptkAh 9Ciw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Cw+E+607; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4771d50bf0asi89481041cf.323.2025.03.24.22.07.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:07:08 -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=Cw+E+607; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwQe-0007Ra-RF; Tue, 25 Mar 2025 01:02:21 -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 1twwOE-00043s-U5 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:50 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwOC-0005zo-W2 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:50 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-22398e09e39so103657585ad.3 for ; Mon, 24 Mar 2025 21:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878787; x=1743483587; darn=nongnu.org; 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=CSiomrkJehve/L+8sWorbqlbLNaYCEo3w/Nkej8WFsU=; b=Cw+E+607MIzPDPX+py2OuemTddAf88SPktnBytia09ew8OFGG0mwzi6XEOz2Q0h+Jt yyaQZHtREx+egFa9JmKy84c58TcHr2KjUiKa2B3X9kDspebYc7jfslF3RI5SHcc7dVrP 7OdEJPJ3QbVaIsZbCeTIWliaCCWKmbPy/SRIIXo87GtaxQvFM8oisVIhwIaXhmR3LmW6 YbslbLceU6mt4cDpHrsDQBEndmlwuzot83gxnPElNi8+rl5h6grBj/ixZgpDmCKgOo37 66MaEtyBoIy9M6MtlZsT1Rq8EI1OldGR72ixAUSMKZXQIAFdUWgu11A+KO1U9qaeDM0w LHLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878787; x=1743483587; 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=CSiomrkJehve/L+8sWorbqlbLNaYCEo3w/Nkej8WFsU=; b=UTjr+gvjKnkuujOa8+VSe6C80LkzAZtfdVAYHBKTlsg5BrxgRoDvtst3zsRYkTXVF/ EHdRvxgYooNCbKxGhFdLZ+hwbP2ejRJwdWda0Hlvcj+bTbq+a5TEpuvYQ0syk2/wCtJ5 6aO7ZI1mltiyMluQQqSJ29Iedji03/7tPX1Zm0zGTpuh8Y4R93g0EcUS6pJW56LqD05M y0ytjZq2pgR2DoPsJUa1w0BQhpn0pofOeQQHTEHsMn4SAFbGleWH/pPd04cBKjCxAIC9 W4Ez/dDwnQd3iTfAzJWRUchnXJvaXMfWDoj5jgByIKUUJ1co1k7GGGAkzQoOYQVxbXgn qmig== X-Gm-Message-State: AOJu0YzJ1o2tnF/DtBgLTtK8iB3t0dvtJtpI5OGiEQYN23GWmU9U5NFE RUlsShJg8vVq8FMlZ+jTEN45vQzvWIC+WAauVhqpV4is3Uo3NyKIGHIn6XuZvrYCg3gL986SBWV w X-Gm-Gg: ASbGncsswgxsCtG9wZz5vEMq3u+uNw5DKF/q9is0sdEcg+Y0argMg87imE6ZuGtndV8 vUY19DBh48aYjc9dZgu+mj1RR32pN2M2G92XoQh/SgwdKTURMxTPmZ0VZns4qRJOozPUCk+A7n3 RIZ18hcNpnTmhPaExQ7VDooJ6tGore+UAn7K/uqi5IfJvvg9BCbFHKYGmJE6SvYaQZtda4aIkKU 95ecxowYrvfx1APTpkXE+wkuucEv7YtsX2B8b8KFXKkqeHqITFGTMTOFVb0sj7PQHL06JVCMI11 wN02EQ7M6sqfifx2im2cHtJVPHUmTMyMJga/IOryMYad X-Received: by 2002:a17:902:e846:b0:223:5c33:56a2 with SMTP id d9443c01a7336-22780da6237mr279448325ad.28.1742878787203; Mon, 24 Mar 2025 21:59:47 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:46 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 27/29] hw/arm/xlnx-zynqmp: prepare compilation unit to be common Date: Mon, 24 Mar 2025 21:59:12 -0700 Message-Id: <20250325045915.994760-28-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x636.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 autolearn=unavailable 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 Remove kvm unused headers. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/arm/xlnx-zynqmp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index d6022ff2d3d..ec2b3a41eda 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -22,9 +22,7 @@ #include "hw/intc/arm_gic_common.h" #include "hw/misc/unimp.h" #include "hw/boards.h" -#include "system/kvm.h" #include "system/system.h" -#include "kvm_arm.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h" From patchwork Tue Mar 25 04:59:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875973 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2475926wrb; Mon, 24 Mar 2025 22:05:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVDU1Yj0WnoLFjM0d82EtBfIT9aue45W/5LHz6NiX0tpTvV0EFBSZW1LBcLZq75cNrpC8/yUA==@linaro.org X-Google-Smtp-Source: AGHT+IGwhKfO7dhIrMQGSZ7xsSqS6Ego8doDIkYywxe5+GLiY2ryC2W2sz+6XVuxSdC+ojHYSN/U X-Received: by 2002:a05:620a:269b:b0:7c5:96b4:f5e5 with SMTP id af79cd13be357-7c5ba16239fmr2057946385a.13.1742879112404; Mon, 24 Mar 2025 22:05:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879112; cv=none; d=google.com; s=arc-20240605; b=RHanyXqsPsLtKg87+vDC2ZDYLyZVSt8+DFHzDMjo7sx8bLGjGJ/GZcb7b5JMnHAvX8 NFU5IJAwLnl58KPeawjMPxd9Y/2XsQmeVpGc6jyjH3cA1+TtmIfiQeS5LHGNuZaartp6 pTGYSfF5yyK6PyaI4K/WbyfHL4sgb8Q9311y0qQlaN5o0y5SQ1muO70vBfrpN2JvMfGP cu1JOXPpYNdkHX0VW655Rw3l9lqbPJWRh2oHkLdvkNleKPx12sDx63Hyt2FahKRSPaN2 IllJovaYls3iYydo0uVpEbfQ5yzEjznjT4R2lfvfoX/Nm4TiN8yb1SSTOW5OuLufYw7T B3Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=7C1awJz84K192Xls/S9mWSPpF8Y3H6ZCzb0fk03waGc=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=Pjne+5wc1y20t8eZb57yvucdGo/GGO3iGDhKzt0IMx8sfdFnB1NtJk0yNEy87Roais atkxPywoywvO8EbKAoXknD4V+DxtjEmcafAQDT0YQe/zso7+Kazymb4MpPFPIk77jrNb 9VMYFFrvkC2pqvgk0tl1yBsZcirdfec9g7yjEoq/pvLV32yUl19nRigv5KG+l7AGZFvi EEsjoIYjIoUHLzEB8oO61s2p3DiONW8QQbSFd07tfCFKJz1/7oKtnWd8+xrpMbMUZw2O lk9kP/CdVIYES0YbCECN5xHcxhirVN7nY9MpK+p6cQqYvIdqxCQXwauMGLKKxbNa4jqR QQwA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="cVm/wR0G"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5b9347f2csi914010385a.236.2025.03.24.22.05.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:05:12 -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="cVm/wR0G"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwQk-0007oa-3i; Tue, 25 Mar 2025 01:02:26 -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 1twwOH-0004Bq-EP for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:53 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twwOE-00060K-IK for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:53 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2ff6cf448b8so11961506a91.3 for ; Mon, 24 Mar 2025 21:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878788; x=1743483588; darn=nongnu.org; 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=7C1awJz84K192Xls/S9mWSPpF8Y3H6ZCzb0fk03waGc=; b=cVm/wR0GrjU4GUzX/UJby62C+2nyYYvQcDkn4Fc0I8FrsMBclN9xbCVihFbEKxikzh 3EFlB/SXvHHZ9kW7ESwT7SEJmxoR1u06nBreh1mERKbbzZ5Y2JoiF506OuS79cjT+ubN SYqc2jikCzOBHvWEKJovjHCUqtB8BnwJ/uTbcpivfCp9LcpmmpITZVZeo0yra6k3lJa5 z60DpdYIqvwixdcLxcE50WDBVrj1eln5UGjt0LwkmpSBnFMCl+311M3A25eFbpQpyAhW rzmC5Ikh1LgaUYuXguYBaGndgRVbV7MhUR4bKeGXiKTl0jcN1xHBJEeoRv7UNJevsRKH CfqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878788; x=1743483588; 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=7C1awJz84K192Xls/S9mWSPpF8Y3H6ZCzb0fk03waGc=; b=bPQWgQWL9dRlGNo9Zl2e6zFzmS7Xia51tZ/UqOgpCMZiqfna0bvNfiymn7cNIknMdh yUKazwb574SNYMZKHP39O7oFUtTnQi9V7y0hLp+m2Rb67gLG4CxXxMRA2SsCLvpI+z2S mHeP0AuyS3NyDFRitne9/H2o56UdKwwAaQDXKPmksgYlBjg7vQ/Hl7i66IlA4GzXtTox GhgbitRLXkhQ3jgomJX+d3bhoHSN/kMmsbcB4Igd/PWAF8GpPvPVCWfc9jCuVRvjNXiH 0eta7sWLpDeTxFPcjkuaX6wbC0HIeQWXPcBG/Gt3tA3Fzlerr9wCqU++84oR67Fg3pw6 5cZA== X-Gm-Message-State: AOJu0YzYAqJ1NsDV2cvbcixSpnWdBCU7iGR8D75xNMPO/22iaI6pDBBM JnMEOQb2Q5+JD9x3zsbqMoeKiPk6LcM9ND1y3OQbs17NkpRH2+P3faqTVKe99EGNID16Uk/FKna G X-Gm-Gg: ASbGncsUF7Ac/cYGNSBBhltly4dbWdu7eRCEnjdyaDARVMo/uKtXnZ4NiezemnFou1B zBVlcwG+oq6yIy2wVL1RoesMPLa9vg4ypKF++79NwJ31GWBN3iOLTEiPJhd1g/TK469sNhJZjD2 YtHVUJC+q3TB05+o1eLPc0L+ons5SDgwaIY72FcS0NwlDkQJ/u5Cd1FNAa5QJByruilCgpxwBxB SVozKN/8hf+mSRIex4XUuijtHbghM5jlX0DeXP5RZgB7u+vHCBY2YKWWb5R9p9XkT4w+TRZsaGr F4TBv/JtO/StxRisO9wQYF4IT3RdB59bEHAWH4KtnLsK X-Received: by 2002:a17:90b:2cc6:b0:2fe:a79e:f56f with SMTP id 98e67ed59e1d1-3030fe9e9c3mr24748768a91.13.1742878788216; Mon, 24 Mar 2025 21:59:48 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:47 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 28/29] hw/arm/xlnx-versal: prepare compilation unit to be common Date: Mon, 24 Mar 2025 21:59:13 -0700 Message-Id: <20250325045915.994760-29-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pj1-x102f.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 autolearn=unavailable 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 Remove kvm unused headers. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/arm/xlnx-versal.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 278545a3f7b..f0b383b29ee 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -17,9 +17,7 @@ #include "hw/sysbus.h" #include "net/net.h" #include "system/system.h" -#include "system/kvm.h" #include "hw/arm/boot.h" -#include "kvm_arm.h" #include "hw/misc/unimp.h" #include "hw/arm/xlnx-versal.h" #include "qemu/log.h" From patchwork Tue Mar 25 04:59:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 875976 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f4c:0:b0:38f:210b:807b with SMTP id cm12csp2476432wrb; Mon, 24 Mar 2025 22:07:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/MvZVxuYFHx5Zm5SP7PbZOyUDcRkZCP7TP93nb3JSp2m02seg9I1oNCvAWft4v/XXELXLPA==@linaro.org X-Google-Smtp-Source: AGHT+IFIzTY5yIjLRDW7YRwDCke3DI2uF/Id/wlyRbnHbA45+mXvZKhr0J76hyo/gqS1rAfa6vI5 X-Received: by 2002:a05:620a:4086:b0:7c5:5edb:f4d5 with SMTP id af79cd13be357-7c5ba15aa1dmr1907320085a.2.1742879228535; Mon, 24 Mar 2025 22:07:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742879228; cv=none; d=google.com; s=arc-20240605; b=RJ8idkSGFuHhKCWrqvuNTC4F6Do0En3gZpL64GIYnDoNBQf07CVdt0ixMMiQ57tqgA vE1lbzi5PFZr0cAN4cfdxNV4o1+iKlWYVv4ZdLIrLJznlv6YhbjFqK9TY2d90E5pNIWb awMwfDhfhNNAf4KNGDyEjuIXifLqTRJBNWalr+TRxXgvZgV/o2abz2O6SPKBsNMkbLUW fKVf15ononOnT6+fh+xqx+NudQ42EVgmmE0f7yXmFdyzmPAq8Dr+9EPHMD8F+NXhZdfM DweWaBDdUXTSR9C4+b5GqVW4R7AGIxQvA7ZwESFZ5q2ba/55VZUi4A7vM0+aPAkYmnQg lUQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=E5iaiuFfQwHaUV+YhyGFcKHMq0HGbFMqwt0CSvqtQT8=; fh=4u/c2NXRKQFGmORD9593hqU0qV4lyoIHSldniogVCFE=; b=k+WNcBCLVII+P4dDylDaBbg3NLjhjbX9k3uUWrQFYV8OCMBirSeLNUh/Fe0wQEtn4o jHg1Szt5Q6jqZp/aWvHhV96rtg/gWvAl43D7cRa5+oUI8Pxn9zVjTCf0JighZgNkOGrD WK66IkshkRMCZbwQ/z4Kj28FCs9sOZyqzbN87QSJOUe9SDUU4cqYCkgD0tM0dkvVEBtO fOHMN+pmFKvMc/upAhZWtjnnAqSb1LtkzLj4xC9f8Z3I8oDgj8VFSzx9xJxEfJB/Snuj YRQPpt66p1ZZoBKN8YcZzbwO6qep7EfthFrYrFl92ftunJTZU6aK9E+kNwrhWkuYekmP 65yg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fjhXNS26; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c5c81214d1si511665285a.520.2025.03.24.22.07.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Mar 2025 22:07:08 -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=fjhXNS26; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twwQk-0007oR-3p; Tue, 25 Mar 2025 01:02:26 -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 1twwOI-0004DW-51 for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:54 -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 1twwOE-00060e-KW for qemu-devel@nongnu.org; Tue, 25 Mar 2025 00:59:53 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2ff784dc055so8530652a91.1 for ; Mon, 24 Mar 2025 21:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742878789; x=1743483589; darn=nongnu.org; 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=E5iaiuFfQwHaUV+YhyGFcKHMq0HGbFMqwt0CSvqtQT8=; b=fjhXNS26EugQwHsohACAoLklNQ4a/5HpExirrleFsyFk5PKsQvtq63zavBq/OfFDoD w6f7tmB3R0PzXchAvm7a0FUkL9HSVeaXSeiIMY+6KG6POnDdkSVOpwE31gHKTFAcW517 OmLAsfrvqNP2D7h2rAlQE5ofuOfBFeoZtNAnY6u+jybCdxNrZNm/0j0P46pccwviVflH 825bIeGJUlYozh12Yig0Y5rNJgcAOvGowlq88pQzS04fop3NMTGOCwY2ToJDvt9NDJFV FgdB0VsRXs1m+SAALyRBodscQSXoJ6GHv/2Gh0F7h5jyHVBNGXjgtMcZdL+IYKho/5gO T+Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742878789; x=1743483589; 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=E5iaiuFfQwHaUV+YhyGFcKHMq0HGbFMqwt0CSvqtQT8=; b=QilomCOzhc8tytnp9dYsdiG07nu4mHNzDbnEEHvBEOF9bHaQLI1gfG560xH3jN1KaM kyA7HKk0dNeNkb3hUrFxSMIHmWWq9nNzPKlwAMwYk35zTTnLZPjLVTkoslzIkXe6MDZj udiqylFolDdqRcaQ6cMJyAhYOdpnIpWYpBAeisa3Q25sKF6XCZOng+E1MzgoiLitTKFB 42EtxMP2wOlkf2ul8fgT1iHUg7VmvWayZZ51x/eOGzQOOk2OwWOMkkRzJ8Bv9mCP+X+a ITzVUseQVJ3PWLWPDvoaud1UAlpJQy26nvcv3bsQJggdZyO+in9XuZ0+RVG95Shh66Kl HZhA== X-Gm-Message-State: AOJu0Yyfk3l6FWFR71FdfYXpFuxdtyNMaipc2d/5dNk/pTwTvu8RyGJI TtTWX05IWcg+6EVcYDGxvn/Z2VTItmSTIkUK9lStV3ne9/K6xx6oB+G/kHgfIdI9pwUYT7i6R1f S X-Gm-Gg: ASbGncvGtM9vZA/wntZGHcXOfsKQcg9nzkDmxmbppVLbtQ03B3kYr/CpYw3lhUrbGia qQMyhscbM/9lzNSCxeQ/t02RhzqI2XnNH1a0VDa9vdzqrCWkYXEUz+cf1B4uSEpKRl/6XuAjXj8 LsJ9d1w5BAL7H3HBjPDOh0yO3GjuuCHXGvoOlgnk7PQENN4C3KjsECb0/xqTMScn0kpTJsXECqr tdq1dkQouRr5r6oZNCkyyt5ebBfLhXjkDehfbpe/2bi5FsurexDbgRD49UEzCbMiuteL0UVwV+M 3UH28TVoSVJjpf/fLwuHXjO0JyRFMzkZBetqbxfPfYtT X-Received: by 2002:a17:90b:28cc:b0:2ea:a9ac:eee1 with SMTP id 98e67ed59e1d1-3030fe93e6emr27765660a91.10.1742878789061; Mon, 24 Mar 2025 21:59:49 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-301bf58b413sm14595120a91.13.2025.03.24.21.59.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Mar 2025 21:59:48 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , qemu-arm@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , kvm@vger.kernel.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier Subject: [PATCH v3 29/29] hw/arm: make most of the compilation units common Date: Mon, 24 Mar 2025 21:59:14 -0700 Message-Id: <20250325045915.994760-30-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325045915.994760-1-pierrick.bouvier@linaro.org> References: <20250325045915.994760-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=pierrick.bouvier@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 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 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/arm/meson.build | 112 ++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 9e8c96059eb..09b1cfe5b57 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -2,43 +2,43 @@ arm_ss = ss.source_set() arm_common_ss = ss.source_set() arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) -arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) -arm_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) -arm_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) -arm_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c')) -arm_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c')) -arm_ss.add(when: 'CONFIG_MPS3R', if_true: files('mps3r.c')) -arm_ss.add(when: 'CONFIG_MUSICPAL', if_true: files('musicpal.c')) -arm_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.c')) -arm_ss.add(when: 'CONFIG_OLIMEX_STM32_H405', if_true: files('olimex-stm32-h405.c')) -arm_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npcm7xx_boards.c')) -arm_ss.add(when: 'CONFIG_NPCM8XX', if_true: files('npcm8xx.c', 'npcm8xx_boards.c')) -arm_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c')) +arm_common_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) +arm_common_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) +arm_common_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) +arm_common_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c')) +arm_common_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c')) +arm_common_ss.add(when: 'CONFIG_MPS3R', if_true: files('mps3r.c')) +arm_common_ss.add(when: 'CONFIG_MUSICPAL', if_true: [pixman, files('musicpal.c')]) +arm_common_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.c')) +arm_common_ss.add(when: 'CONFIG_OLIMEX_STM32_H405', if_true: files('olimex-stm32-h405.c')) +arm_common_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npcm7xx_boards.c')) +arm_common_ss.add(when: 'CONFIG_NPCM8XX', if_true: files('npcm8xx.c', 'npcm8xx_boards.c')) +arm_common_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c')) arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) -arm_ss.add(when: 'CONFIG_STELLARIS', if_true: files('stellaris.c')) -arm_ss.add(when: 'CONFIG_STM32VLDISCOVERY', if_true: files('stm32vldiscovery.c')) -arm_ss.add(when: 'CONFIG_ZYNQ', if_true: files('xilinx_zynq.c')) -arm_ss.add(when: 'CONFIG_SABRELITE', if_true: files('sabrelite.c')) +arm_common_ss.add(when: 'CONFIG_STELLARIS', if_true: files('stellaris.c')) +arm_common_ss.add(when: 'CONFIG_STM32VLDISCOVERY', if_true: files('stm32vldiscovery.c')) +arm_common_ss.add(when: 'CONFIG_ZYNQ', if_true: files('xilinx_zynq.c')) +arm_common_ss.add(when: 'CONFIG_SABRELITE', if_true: files('sabrelite.c')) -arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m.c')) -arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210.c')) -arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic.c')) -arm_ss.add(when: 'CONFIG_OMAP', if_true: files('omap1.c')) -arm_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c', 'cubieboard.c')) -arm_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c', 'orangepi.c')) -arm_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40.c', 'bananapi_m2u.c')) +arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m.c')) +arm_common_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210.c')) +arm_common_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic.c')) +arm_common_ss.add(when: 'CONFIG_OMAP', if_true: files('omap1.c')) +arm_common_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c', 'cubieboard.c')) +arm_common_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c', 'orangepi.c')) +arm_common_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40.c', 'bananapi_m2u.c')) arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.c')) -arm_ss.add(when: ['CONFIG_RASPI', 'TARGET_AARCH64'], if_true: files('bcm2838.c', 'raspi4b.c')) -arm_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_soc.c')) -arm_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c')) -arm_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c')) -arm_ss.add(when: 'CONFIG_B_L475E_IOT01A', if_true: files('b-l475e-iot01a.c')) -arm_ss.add(when: 'CONFIG_STM32L4X5_SOC', if_true: files('stm32l4x5_soc.c')) -arm_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp.c', 'xlnx-zcu102.c')) -arm_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal.c', 'xlnx-versal-virt.c')) -arm_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', 'imx25_pdk.c')) -arm_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c')) -arm_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) +arm_common_ss.add(when: ['CONFIG_RASPI', 'TARGET_AARCH64'], if_true: files('bcm2838.c', 'raspi4b.c')) +arm_common_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_soc.c')) +arm_common_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c')) +arm_common_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c')) +arm_common_ss.add(when: 'CONFIG_B_L475E_IOT01A', if_true: files('b-l475e-iot01a.c')) +arm_common_ss.add(when: 'CONFIG_STM32L4X5_SOC', if_true: files('stm32l4x5_soc.c')) +arm_common_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp.c', 'xlnx-zcu102.c')) +arm_common_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal.c', 'xlnx-versal-virt.c')) +arm_common_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', 'imx25_pdk.c')) +arm_common_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c')) +arm_common_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed.c', 'aspeed_soc_common.c', @@ -47,33 +47,33 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_ast10x0.c', 'aspeed_eeprom.c', 'fby35.c')) -arm_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: files('aspeed_ast27x0.c')) -arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c')) -arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c')) -arm_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c')) -arm_ss.add(when: 'CONFIG_MUSCA', if_true: files('musca.c')) -arm_ss.add(when: 'CONFIG_ARMSSE', if_true: files('armsse.c')) -arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre.c')) -arm_ss.add(when: 'CONFIG_FSL_IMX8MP', if_true: files('fsl-imx8mp.c')) -arm_ss.add(when: 'CONFIG_FSL_IMX8MP_EVK', if_true: files('imx8mp-evk.c')) -arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) -arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) -arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) +arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: files('aspeed_ast27x0.c')) +arm_common_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c')) +arm_common_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c')) +arm_common_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c')) +arm_common_ss.add(when: 'CONFIG_MUSCA', if_true: files('musca.c')) +arm_common_ss.add(when: 'CONFIG_ARMSSE', if_true: files('armsse.c')) +arm_common_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre.c')) +arm_common_ss.add(when: 'CONFIG_FSL_IMX8MP', if_true: files('fsl-imx8mp.c')) +arm_common_ss.add(when: 'CONFIG_FSL_IMX8MP_EVK', if_true: files('imx8mp-evk.c')) +arm_common_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) +arm_common_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) +arm_common_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) arm_ss.add(when: 'CONFIG_XEN', if_true: files( 'xen-stubs.c', 'xen-pvh.c', )) -system_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c')) -system_ss.add(when: 'CONFIG_COLLIE', if_true: files('collie.c')) -system_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c')) -system_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.c')) -system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c')) -system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2838_peripherals.c')) -system_ss.add(when: 'CONFIG_STRONGARM', if_true: files('strongarm.c')) -system_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c')) -system_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c')) -system_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) +arm_common_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c')) +arm_common_ss.add(when: 'CONFIG_COLLIE', if_true: files('collie.c')) +arm_common_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c')) +arm_common_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.c')) +arm_common_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c')) +arm_common_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2838_peripherals.c')) +arm_common_ss.add(when: 'CONFIG_STRONGARM', if_true: files('strongarm.c')) +arm_common_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c')) +arm_common_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c')) +arm_common_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) arm_common_ss.add(fdt, files('boot.c'))