From patchwork Tue Mar 11 19:57: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: 14012668 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E87E8C2BA1B for ; Tue, 11 Mar 2025 20:04:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5kL-0000zW-A4; Tue, 11 Mar 2025 15:58: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 1ts5k1-0000uA-LJ for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:20 -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 1ts5jx-0008UW-GO for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:15 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-22403cbb47fso115148255ad.0 for ; Tue, 11 Mar 2025 12:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723092; x=1742327892; 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=949DeBQijWmgHqYCdDdupcSTn3rDdND8nLqwkILEwEI=; b=w1mlVKH4kEhNempyiiXq96ZE2QOzsOnrItzWRdZwSZ79IRZl/h/qyDHVUpRctSM9ct wqPVKDAOGYZFxdzh3zGSKxN5pPD9IriWWhcFH5x/dfULOYYgE+DQ8A3v/M9tMyqokb0K Lq1SmPCUey4wxvLTziidBM2OR1EQYQNey52iAlpaq1BrApyt9DP5rt2AriqFGFDfxCei Z3BvoidHsSLtalP+nQjSIsfIUWgJT1G76CTE9IdRXYd/GUtWDsmt8uvj9npI3rli+oaZ NNUpnLiFYoU5u4qZTg6G2EGX9/YBrOBoSKp0vKiH0V1glIZ6lMxOVMPagWLuGicow83B h6Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723092; x=1742327892; 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=949DeBQijWmgHqYCdDdupcSTn3rDdND8nLqwkILEwEI=; b=SW7jb0O3UsiMZ73f0Y3tGxbBt2smvCKFYfYc+9C0u1L451yykyKbbFZI0C6UgxI0OV PtUldGgZJARabfz+2g9FXfV7gAU1Qrj+fuSXQKCddCdHkRNaU1DxabS3sqc2wMX4A+Y5 LYAQaKLhEArfpQSi1lbzLDJN1FpNxohjm6jdXLT2b7ECP6ZF/bRqn7UdzKmwMr3ET4E7 E9Ar+xwgCoLQ7az+ppZ9EWZZJ9VKPZETMcw83KSTwz+xQVro6wejrsSbyy11CGc7WCI8 BVaUpHTt6BK9GRtfsLXZjm3cBdg2HqoUd92PpugK4vla5AOknX7QiIpojC6gf40qG/Bp G9RA== X-Gm-Message-State: AOJu0YykMG8SbGNI3tjAlwI2Fz3HCeAv4o6COOUmjfpDEly4cb4jnE37 6z6iEnIJbLVOqkBjgIfQ/w64axN/Kht8Yu9PQh6pkT6r3JplO8kXzTIwXrPvzCrGDC+PlIKrvyu I+u8= X-Gm-Gg: ASbGnctOq933IEFAW7vrdaE7sMuBym5hcA5zhI8LWmeIcnClORpaN94gGlrlXd+EPSn oIMD7SGrzxac+vIxtHxIIFrX5d66lry4TepflLVAUwM2iNwE5AJZGLccWOv7IR/n3W/sk+JY8CE gx7l0O2F9ix3aHFNKUJ5H00hiWHQOrASBznNbIpObPGEybxxBRbVxOdfuC0AgHxgF5QrJvzPgjW YP5lX8P9M9m1PAJ8/Q2S+/SEyspO7XCj3fCzQ4vmfuNWbKdwVFY3S0aXS86V6ig54CJ2y4sSzZV zVp2cfHi704594yK+fwtWu1pz22aUBvbgAdlxa2f6EeeD5LI0wIntW4= X-Google-Smtp-Source: AGHT+IEdn0vUjdqWf+0ft6dtNABWq7WqhDB4TNeuQtg0nIMIUQeKA5OeniZU9oewAupJBz+i092ynA== X-Received: by 2002:aa7:9e43:0:b0:736:d297:164 with SMTP id d2e1a72fcca58-736d29703d5mr9263457b3a.1.1741723091837; Tue, 11 Mar 2025 12:58:11 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:11 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 01/17] exec/tswap: target code can use TARGET_BIG_ENDIAN instead of target_words_bigendian() Date: Tue, 11 Mar 2025 12:57:47 -0700 Message-Id: <20250311195803.4115788-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/tswap.h | 11 ++++++----- cpu-target.c | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index ecd4faef015..2683da0adb7 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -13,13 +13,14 @@ /** * target_words_bigendian: * Returns true if the (default) endianness of the target is big endian, - * false otherwise. Note that in target-specific code, you can use - * TARGET_BIG_ENDIAN directly instead. On the other hand, common - * code should normally never need to know about the endianness of the - * target, so please do *not* use this function unless you know very well - * what you are doing! + * false otherwise. Common code should normally never need to know about the + * endianness of the target, so please do *not* use this function unless you + * know very well what you are doing! */ bool target_words_bigendian(void); +#ifdef COMPILING_PER_TARGET +#define target_words_bigendian() TARGET_BIG_ENDIAN +#endif /* * If we're in target-specific code, we can hard-code the swapping diff --git a/cpu-target.c b/cpu-target.c index cae77374b38..519b0f89005 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -155,6 +155,7 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) abort(); } +#undef target_words_bigendian bool target_words_bigendian(void) { return TARGET_BIG_ENDIAN; From patchwork Tue Mar 11 19:57: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: 14012625 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C5256C282EC for ; Tue, 11 Mar 2025 19:59:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5kT-00019R-5X; Tue, 11 Mar 2025 15:58:46 -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 1ts5k4-0000ui-2C for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:21 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ts5jz-0008Uo-9A for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:18 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-224341bbc1dso80068155ad.3 for ; Tue, 11 Mar 2025 12:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723093; x=1742327893; 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=fjQjYNlvDIsMbe7+veFF5h4s6vvln32m8yANkT1fS5Y=; b=qXSvW74TXMHWe5B3u8k2K5gnNH+47FieHotfR58ZnpPOPtCgKqsGqSI20DsruirDjB UlQBFusiwI0xGs8Hq1WsXfQJHBTVZGxL4VuIMKLm70IMAzuYHSpEmhTanyBFWg1IoPRM Q3TAn7Dlzgz0zhvv+2thepyhQBjTRCHvbZD5X9eIgvfMxrc9XJfGnfN/0DgYu3ufiPGo 32JHrv58Qz2MfPe72nM9REO+yMzIvpyzBNIQJaQzknyB4PJHFKLPo+mPHgmn9fTDQ/Hd JBTpw0pnKPe9caXaNklNw5MzSyqN+FMA9gRuTHjC2Bbn/AApJ1+NX+vw+ZyZyaULUvtX yQ5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723093; x=1742327893; 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=fjQjYNlvDIsMbe7+veFF5h4s6vvln32m8yANkT1fS5Y=; b=eZcJpiD5iZ9mKUsj0nH+LZSP3Ny6wBChhM7eN9bE1tNazhQ2XLNPS9d6f43lr2HDM8 gGAIb1Mly7ozZrBlZyybXYYMSY49gKq+bvmscXLqGYxXH5y95vjM/DGhxU0CRN5znRcw Cg6MUQ6FLrrnJ6k5HMswqeKIwCUk+53kxMpsM1vHY7EZOR9ljrm9615sQqV12dXpP1Yw 5K7jCkwgG1OYcmrzgOxlKvWLzLbVcXawaVXjqmR3L92sAem27SoDvjKxU9L4y/0nb8NL ToYXJ1A0zoGUjMAk1PyHKOaBIy9ICiZF5hRlAnJ04iJlgclMXYX7cfQMoTvrNODuajkc 8ovw== X-Gm-Message-State: AOJu0Yz1SpkAGnD6Y/NBMyZ/n225B4vQ6SpjNVNFT70AnVOsvLfH53wL 6NGqlZjYb+h3C2npmLW64QHnc2kJfvZgXadQ48EAKDkg8+LaMMDRrkwzdCiJXHlmhHDlpAuEnHw LcyM= X-Gm-Gg: ASbGncumpXkKnXzhMZa/oXKFz+aHQzpL356kfiq8tmpVno/3VywyCky0t7Yl4GtSjhk Hp6o76Hin6QO9nGjMnU4Fu2gb9iwmvnLX8fyUV9URd27ERkXhA30piVnsaN7l8tuxCLedzCi+Z/ LlntbRCVboqzQUCbWTfud5JzMkNMkV+cby2iGMkFL7TCfDEgnXmiR9FninAXAtz8/yzLA3Iy85W 6uugE7urSMKSJ3IvbISvgNTj0lgabd+Kwotqj+qn+1hOcByMq56VmQkyzMgz3ic5GvQiWi9ViwE Et0RHWXfzLo1ZzHfa1cgS6QSXqjdxBJmgwfduOI36cJL X-Google-Smtp-Source: AGHT+IF/o3Z1voLQASAUjPWBawCvXOSnOMhb8Nk2igLOMO9aCbEfuSVrBfikbaQLM80fsMV5kN5HDw== X-Received: by 2002:aa7:8892:0:b0:736:a540:c9ad with SMTP id d2e1a72fcca58-736eb8a17b5mr7090307b3a.20.1741723093074; Tue, 11 Mar 2025 12:58:13 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:12 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 02/17] exec/tswap: implement {ld, st}.*_p as functions instead of macros Date: Tue, 11 Mar 2025 12:57:48 -0700 Message-Id: <20250311195803.4115788-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x631.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Defining functions allows to use them from common code, by not depending on TARGET_BIG_ENDIAN. Remove previous macros from exec/cpu-all.h. By moving them out of cpu-all.h, we'll be able to break dependency on cpu.h for memory related functions coming in next commits. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 25 --------------- include/exec/tswap.h | 70 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 8cd6c00cf89..e56c064d46f 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,31 +38,6 @@ #define BSWAP_NEEDED #endif -/* Target-endianness CPU memory access functions. These fit into the - * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. - */ -#if TARGET_BIG_ENDIAN -#define lduw_p(p) lduw_be_p(p) -#define ldsw_p(p) ldsw_be_p(p) -#define ldl_p(p) ldl_be_p(p) -#define ldq_p(p) ldq_be_p(p) -#define stw_p(p, v) stw_be_p(p, v) -#define stl_p(p, v) stl_be_p(p, v) -#define stq_p(p, v) stq_be_p(p, v) -#define ldn_p(p, sz) ldn_be_p(p, sz) -#define stn_p(p, sz, v) stn_be_p(p, sz, v) -#else -#define lduw_p(p) lduw_le_p(p) -#define ldsw_p(p) ldsw_le_p(p) -#define ldl_p(p) ldl_le_p(p) -#define ldq_p(p) ldq_le_p(p) -#define stw_p(p, v) stw_le_p(p, v) -#define stl_p(p, v) stl_le_p(p, v) -#define stq_p(p, v) stq_le_p(p, v) -#define ldn_p(p, sz) ldn_le_p(p, sz) -#define stn_p(p, sz, v) stn_le_p(p, sz, v) -#endif - /* MMU memory access macros */ #if !defined(CONFIG_USER_ONLY) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index 2683da0adb7..84060a49994 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -80,4 +80,74 @@ static inline void tswap64s(uint64_t *s) } } +/* Return ld{word}_{le,be}_p following target endianness. */ +#define LOAD_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + return glue(glue(ld, word), _be_p)(args); \ + } else { \ + return glue(glue(ld, word), _le_p)(args); \ + } \ +} while (0) + +static inline int lduw_p(const void *ptr) +{ + LOAD_IMPL(uw, ptr); +} + +static inline int ldsw_p(const void *ptr) +{ + LOAD_IMPL(sw, ptr); +} + +static inline int ldl_p(const void *ptr) +{ + LOAD_IMPL(l, ptr); +} + +static inline uint64_t ldq_p(const void *ptr) +{ + LOAD_IMPL(q, ptr); +} + +static inline uint64_t ldn_p(const void *ptr, int sz) +{ + LOAD_IMPL(n, ptr, sz); +} + +#undef LOAD_IMPL + +/* Call st{word}_{le,be}_p following target endianness. */ +#define STORE_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + glue(glue(st, word), _be_p)(args); \ + } else { \ + glue(glue(st, word), _le_p)(args); \ + } \ +} while (0) + + +static inline void stw_p(void *ptr, uint16_t v) +{ + STORE_IMPL(w, ptr, v); +} + +static inline void stl_p(void *ptr, uint32_t v) +{ + STORE_IMPL(l, ptr, v); +} + +static inline void stq_p(void *ptr, uint64_t v) +{ + STORE_IMPL(q, ptr, v); +} + +static inline void stn_p(void *ptr, int sz, uint64_t v) +{ + STORE_IMPL(n, ptr, sz, v); +} + +#undef STORE_IMPL + #endif /* TSWAP_H */ From patchwork Tue Mar 11 19:57: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: 14012630 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 19791C282EC for ; Tue, 11 Mar 2025 20:00:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5kb-0001cb-Hu; Tue, 11 Mar 2025 15:58: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 1ts5k5-0000x0-V5 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:22 -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 1ts5k1-0008V9-IO for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:21 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-219f8263ae0so113519875ad.0 for ; Tue, 11 Mar 2025 12:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723094; x=1742327894; 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=fcP4MFj0H7Fu3AxOxTbJlPG2KgbdJwiBtz5sSPdKZDU=; b=iws8qo3UagKBsqqcvBdMZILd8sTU8/0hPnSqw57kQtJ+HwyOIqKs68fcbPusKltir/ iCT5gmNEriSOgmopllPjTpBIXw2GRaHNp3le5USWZgIpJXLrjOV0CP6jeOmRaBIqPdQM PniY74PQRvq3E5pVv0Pduf56D4iNYqSb0ynshPiSRmNxyyGdIlQyce3nMVHSIbSS2i58 k+FnFyx0jbgWYuhuLMv7QUPvSKKyIKiIBFT6drPwiDZYLhwolj42rnTv5rRILdCaUchT iEELVMtRYjzvrwzU4Uo9FKNEtBM/imuHGMniiaW14m+AtU/ve3TlcIorPxooZS7Qy1vv zJgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723094; x=1742327894; 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=fcP4MFj0H7Fu3AxOxTbJlPG2KgbdJwiBtz5sSPdKZDU=; b=C75L3l/9hapBrzMOlVRk2skWjivcLXIpV77nizHLzREjvbQf7FeBagvjE5asUxNLxr geCn3Xi1sZiJvMXcZgNvV+6HGF7bzwDjKQ46EhNNND2m5l4S3O+ANyFf3sryYn3Osry5 pGi4pGf4RhSd4STHmDTaiHQiNHLSgpgkXGwfeOHDssGGQPxkV5AwIArU93TSbrDMbcqj 5DMdWf7sSQYUUn/c8HYUnrT9SU4XcXF+W9v3zV9ofK6MvNrNDJQs90hZ+8VVjIweUwtd 7lvT891anQPaZihqB9wGOgada9517MNmnI98J9iNV8BB9DXKvImf68TegEHTWLMBG4sA yI7w== X-Gm-Message-State: AOJu0YxOWqIa6Z3ovMUI7YY0bVRrOz7UaBsn0MK5017bVwpCfRDzWg7L upGHy6ywz7Un8FTripcx8ab6qRxDeY4MxkTcwZ4QLT74IiWi5oHcZZyD9v4AuRRR4EA9OdXQAbj c3SQ= X-Gm-Gg: ASbGncsrAhwCTvOdiJcrazueQIJx6V2bouZMf5MHoAvTA220P0D+uwFA+ktYJyI5HFc o0by8fSS1xMs08uE84i4h4KyAzJhNWczsZkki/4hmmzTAXEOY7isijnvuIv/P41QtB1hrLTHwcG lMziYDCMuYnvx7QF8ns9hr/BFLw6PeGFApvYE50BJ9SrtisvsJeJoWaQL42lhPUC01MwBBjHdfp n+WKzQDwPbnNYdEFQreQz1h4YT/EgHarCh1RGIoSScp39c7Sq1zJRJg2z5humP6VkM9gg+9X3y1 Mzod6Ot5CGxUD7czCeTEPPUMCNxWoICQ4ag+9oln03oq X-Google-Smtp-Source: AGHT+IHtn3wjueX80hXlhR3WWJLzlWQ/GjOadBaAC9ISUpU84/t/abdjw/+6bEkcmiHY0rapbw+ALA== X-Received: by 2002:a05:6a00:189b:b0:736:755b:8317 with SMTP id d2e1a72fcca58-736eb8a15femr7017121b3a.21.1741723094173; Tue, 11 Mar 2025 12:58:14 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:13 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 03/17] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Tue, 11 Mar 2025 12:57:49 -0700 Message-Id: <20250311195803.4115788-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 12 ------------ include/exec/memory_ldst.h.inc | 4 ---- 2 files changed, 16 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e56c064d46f..0e8205818a4 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -44,18 +44,6 @@ #include "exec/hwaddr.h" -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - -#define SUFFIX _cached_slow -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) { address_space_stl_notdirty(as, addr, val, diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 92ad74e9560..7270235c600 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, @@ -34,7 +33,6 @@ void glue(address_space_stl, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#else uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, @@ -63,9 +61,7 @@ void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Tue Mar 11 19:57: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: 14012626 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 597C0C28B2F for ; Tue, 11 Mar 2025 19:59:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5kY-0001Tf-RH; Tue, 11 Mar 2025 15:58:50 -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 1ts5k5-0000x1-V7 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:22 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ts5k1-0008Vn-Gi for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:21 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-2241053582dso20460545ad.1 for ; Tue, 11 Mar 2025 12:58:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723095; x=1742327895; 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=G6OuFeXnonCJBRRaCKlE2hD3nLeAbwsquVgoLJADjfc=; b=k2hoOdPB+OKNBgM7+tTzlE0zETqfSmJ2wsl+6YMnwIQEa6yZ7MxH9PG4znReJOma38 qymgAUS4aLBEbIG6m8tlQYqVMs0gNO8WkmHhGNrLwLaCc6U6Tc+eGIlZ+69+rXrJl0ju VxA6mXziALiotvIIs5M7EcTvd0hUVCa6GN+zIFrsG2UodXkyko/a6ETNQ4ifRJlxQBJz 1/JwDO9k8jQ3DVuFp8ApzP0mqC3H/xpF8VgC6n4uFaAsQvuMy3wHowASw2+LHZRc4x/l /Pkg6+Sf3AGpLb9Yt4TAgojwbiZJXQ9irRlzpULmCXNe0BZ/fWMbZworHOHTdg40SZyA eJQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723095; x=1742327895; 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=G6OuFeXnonCJBRRaCKlE2hD3nLeAbwsquVgoLJADjfc=; b=E5saFZcodqGS15t2VsKbco2fHWmL8/HH2Iak8rXe6CDgi45R3NQwVbT0k82sElHuOl I+OHp3skWEJuHV21JV6JV3gIooqqCHCvBTAr/f0sl4h0SqBneISrEtcXMvmefsHA2LUp sM0boKzOAvf2TnBW1FAIBAvSorJKvd4ynkJ7yNuXZNETN6Eb9g9JQbFVDu1Ep0E8Ljmd De5GUvdVJrWorjPwW+zwmtMKhby91pEz/RR2M7WFgKcQexP+7Gu5X6LMe/UAjik2DSSV Yw3HhzmBUDxThKhJziDqvlHimrWUPDUDkFHQgm8ywfr9L61JliPy2u4epfq2B4FjGviY g7VQ== X-Gm-Message-State: AOJu0YyByqzRfhwTcTk63dAZzpjZQ8YTPOBokel5NYcTIX62Jesp4GQk lE9yVg6ZXl+Vh2tfQZVEbcxB6BJAkuLqu8rGpKSsKHrB6VV4h9E6pHLTlpLlZhFICzZMdDbJUdY 23E0= X-Gm-Gg: ASbGncu2xtn6l5SxSL9daFGTq/3vjIILdABk5vMHEmHMkkw5QqPZCqTC1suBe/qeidG QpyA59G9aEfOBL6h32j4yDQwTvER18C7ApD40Ale7REgJiJ6CGSrPfl6e08nKuiqOezwuA4B9MV LaaTtZUwPKR9hJPir9c82UR2WT8cku52id+YO6Cd4iNwf5EmtHkkyze0Syb1D9Mx+Skeo5jr85w pfJBgq1CXFOXFfdvRGQztcE5BcCZYx4qQZKCYvHwt840dtz3iv/BG6bLQRSW9ffiBmB8TgaXZ+Z 3nnxoOLQWde1Z51btLbOo1HilV4xIhE2MDIG1TAAS66H X-Google-Smtp-Source: AGHT+IGNWEO4mZBHpAmOvbPEdLBPlFyMCMG4ZRJsA2UNTnkEr6ujtHjiyajOo8ag/l99JEaYOKJfOg== X-Received: by 2002:a05:6a00:190a:b0:736:31cf:2590 with SMTP id d2e1a72fcca58-736aaaad27fmr26132051b3a.16.1741723095319; Tue, 11 Mar 2025 12:58:15 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:14 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 04/17] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Tue, 11 Mar 2025 12:57:50 -0700 Message-Id: <20250311195803.4115788-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x633.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Move stl_phys_notdirty function as well. Cached endianness agnostic version rely on st/ld*_p, which is available through tswap.h. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 29 ----------------------------- include/exec/memory.h | 10 ++++++++++ include/exec/memory_ldst_phys.h.inc | 5 +---- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 0e8205818a4..902ca1f3c7b 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,35 +38,6 @@ #define BSWAP_NEEDED #endif -/* MMU memory access macros */ - -#if !defined(CONFIG_USER_ONLY) - -#include "exec/hwaddr.h" - -static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) -{ - address_space_stl_notdirty(as, addr, val, - MEMTXATTRS_UNSPECIFIED, NULL); -} - -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" - -/* Inline fast path for direct RAM access. */ -#define ENDIANNESS -#include "exec/memory_ldst_cached.h.inc" - -#define SUFFIX _cached -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" -#endif - /* page related stuff */ #include "exec/cpu-defs.h" #include "exec/target_page.h" diff --git a/include/exec/memory.h b/include/exec/memory.h index d09af58c971..da21e9150b5 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -21,6 +21,7 @@ #include "exec/memattrs.h" #include "exec/memop.h" #include "exec/ramlist.h" +#include "exec/tswap.h" #include "qemu/bswap.h" #include "qemu/queue.h" #include "qemu/int128.h" @@ -2732,6 +2733,12 @@ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, #define ARG1_DECL AddressSpace *as #include "exec/memory_ldst.h.inc" +static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) +{ + address_space_stl_notdirty(as, addr, val, + MEMTXATTRS_UNSPECIFIED, NULL); +} + #define SUFFIX #define ARG1 as #define ARG1_DECL AddressSpace *as @@ -2798,6 +2805,9 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache, } } +#define ENDIANNESS +#include "exec/memory_ldst_cached.h.inc" + #define ENDIANNESS _le #include "exec/memory_ldst_cached.h.inc" diff --git a/include/exec/memory_ldst_phys.h.inc b/include/exec/memory_ldst_phys.h.inc index ecd678610d1..db67de75251 100644 --- a/include/exec/memory_ldst_phys.h.inc +++ b/include/exec/memory_ldst_phys.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS static inline uint16_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw, SUFFIX)(ARG1, addr, @@ -55,7 +54,7 @@ static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val) glue(address_space_stq, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#else + static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldub, SUFFIX)(ARG1, addr, @@ -139,9 +138,7 @@ static inline void glue(stq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t va glue(address_space_stq_be, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Tue Mar 11 19:57: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: 14012660 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CD09BC28B2F for ; Tue, 11 Mar 2025 20:02:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5kb-0001cs-HR; Tue, 11 Mar 2025 15:58: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 1ts5k6-0000x2-0P for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:22 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ts5k1-0008W3-Ur for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:21 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22337bc9ac3so114172175ad.1 for ; Tue, 11 Mar 2025 12:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723096; x=1742327896; 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=wT5ohu0Ui7xrH+jgYqMJMpKemGPcZNvy7jzdyuAyzEs=; b=qTrUqQrS5E6Jv2aS6Ixv11BuNRh1KnTuP9xXCEbRmLMIzL5njoGUaI7fop0B9UtGAH aN8QuyoKOWX3UhC5CmYrseXou5miV4e/fn8VJyygiAGdea5EKO66DJXbo15volDfrHCL b+OYP5y59gXfSHzwXk7viPGxs9YTN17lfAnoCTVc0UBvyCBDl5i7CdWO4RzImr760CiE IuIwMcLORxbdrNh0mHI3I2NwlXf3BtmKpVgG71EWX1ZhE3wx5tThEZBpmeEyvYDsaujj EhUvaH4zvmwF844V6SDf58oonTSPckANgGGaxI12oyUuzmB8Te/tCpN89wVnCIgqlJeV C9vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723096; x=1742327896; 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=wT5ohu0Ui7xrH+jgYqMJMpKemGPcZNvy7jzdyuAyzEs=; b=nsSE1imopcge8zlAlRMzxtVRHS7VRdY8Y8VhGvLxV2eoCvxCiP0L8OkAzHeqzSMZXJ 24/rQKNrCiJ0YWxXQa3L01zPR9vozOJOY56nFq9yTpYhD043+poDKx7ifDfJ5XSdDYrn IrfV02WigGUiZSyW6b4nyeWVCP6OHGUJOyDwHvcBLOl0B8t5Y9wLw3J2IbJLAkzO4Ni3 VQjyLLz4s41M9/AqwVh3xGuUaypkeeDLAg8AHN1kTWbsLMUAw+/EZ/D3WG7Bp1sT7XRd HM4IEBLW9Nxz7QkVta0pUj1l+rRVp1WYE9DHheE+aHav7Gv3S4Lljc3vCguRyJTMdRQo pqcg== X-Gm-Message-State: AOJu0YyKkIgSSCfDMKxMwITDxVKTRrPzH14Bmlrp0Hle7iQLrMTg0aOR wpC13pGgL2d9/SO0mr/XS4PTzxqyQxuhUw5QI02mT8cGNW1ico+5mK3bbjkwm++Ff/iJSpf34rL xpJc= X-Gm-Gg: ASbGncvuesW6QJ10rwAcQL8XZWgtxOEj9DGir/p6jM2kMBYBx2qQaVVn0A+Pv/aOIda KJ/4fq5BPYcRmt+QCDKdtaIhq+33DzdNnzkHyRM2Fpl9+dGzxk8X3jMNZY2Sp7MeGGNoVkzUeKb ZOi3J6g48eRGdwkVu+iwZwMNRnvIJxfRpAAC2KYZ9OiniYOQM93hk+uIil+ISsevt3TXnoXWJJF 341cLe85Hf08c8OVUgRgIjWupTkNjppJrFXUy5CM9g8O6XaVCPot7sx83n0PnbJtAcqwmpg16qN x2pQ49iPNvs9+ptT4uubq1xEzby9OLD3F+Q1ZcqFpF7u X-Google-Smtp-Source: AGHT+IFol9xcK9Mza8BcbJc/CzML1UZwkH32uaLlj+5vumcl06S67T5kaVFtBRtM8pv/UzBlFhWjBg== X-Received: by 2002:a17:902:f691:b0:215:bc30:c952 with SMTP id d9443c01a7336-22592e2009cmr58302965ad.6.1741723096508; Tue, 11 Mar 2025 12:58:16 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:16 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 05/17] exec/memory.h: make devend_memop "target defines" agnostic Date: Tue, 11 Mar 2025 12:57:51 -0700 Message-Id: <20250311195803.4115788-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62c.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Will allow to make system/memory.c common later. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index da21e9150b5..069021ac3ff 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,25 +3138,17 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -#ifdef COMPILING_PER_TARGET /* enum device_endian to MemOp. */ static inline MemOp devend_memop(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); -#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN - /* Swap if non-host endianness or native (target) endianness */ - return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP; -#else - const int non_host_endianness = - DEVICE_LITTLE_ENDIAN ^ DEVICE_BIG_ENDIAN ^ DEVICE_HOST_ENDIAN; - - /* In this case, native (target) endianness needs no swap. */ - return (end == non_host_endianness) ? MO_BSWAP : 0; -#endif + bool big_endian = (end == DEVICE_NATIVE_ENDIAN + ? target_words_bigendian() + : end == DEVICE_BIG_ENDIAN); + return big_endian ? MO_BE : MO_LE; } -#endif /* COMPILING_PER_TARGET */ /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., From patchwork Tue Mar 11 19:57: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: 14012661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D98A8C28B2F for ; Tue, 11 Mar 2025 20:03:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5kZ-0001Wl-5f; Tue, 11 Mar 2025 15:58: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 1ts5k7-0000yZ-OS for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:24 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ts5k3-0008WL-Kw for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:23 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-224019ad9edso133830315ad.1 for ; Tue, 11 Mar 2025 12:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723097; x=1742327897; 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=wYUY7egDw13yHwOIShpp+yHE9Lg9eeptR3FMaPhbw5Y=; b=JVJ3CMgTY8suqTjFtP913JK/GMzb2RIMG0MXaW4AOW5tFjTDaLCDUHc08vpefuL/vC 3ISBYwjP/8SVh5xouEay0hjqF2UTwaTBnbm9GaQLAa5gMFkwIm+69KtFWMPsDXrpBxPT D1f/QrZrY36kKQU5IqX5m5mNU3qV3sncALubNKcvkVQBnGXLJGO6epD57VzZIdjTNkfv EzYswwsqZsyFiNd5RLGrYwAciLXts93IbpY4V05uHetpqChZAInLr1IWOYyUKQ8Hi5wp X7AwM3VEtiSALuYz/ep7fHaW3z8yjL3fPn5wDiyp7ZgRd8JElq8UAcBUR/zt39QK0NjH fJVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723097; x=1742327897; 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=wYUY7egDw13yHwOIShpp+yHE9Lg9eeptR3FMaPhbw5Y=; b=XU0z0T37YtUiptkoYQPaOpycWeZTWtakre8qujusZH1/tubqQ11p1p1IGgAv2lr14u iIjyLKybtituktHqjp3Qx8CnwEmug9SJPT3Zi4An18zpmp3tQ2K2zXtK1x4AdauVl2au xUVV3ZrEIG2kvZEttzo3Bt4z5ZW8MYCuDasDSrTYHPKY+TfU+zl9ggZq4CJ4KAdrQ+sa zBSLM3Nl9ZydFnSYzBxz4c4jKdWfZ8qLMOw3U/iJtqGhzlhEiBRTDDRKyDNEMmww/AsD zKBX840gORMKJP6cGKjp7Nu5kSCsaYwzAepbNoXWYZcECWuLdfBRg8OMoVY++Se9nu/w dnbw== X-Gm-Message-State: AOJu0YyGuDR2otKVOLq3SdFZeyYGA2GJh0PilDIDOd45GhycsarNEFPO JXUF1VCmetmN9+nEDlesEFodILu0MzYKfS+Nf+CTR8zTyFa6XCn2r3ihK6crHj2M5ebPaWHwDc4 mQxo= X-Gm-Gg: ASbGncvxMxMionN+5HHniMTE8/SPka/Q4hCpawuK5KTBCeT4jW+2UaFKoag4crgBNaY VYNN4kVhHnsnNowvtg6NMdrTMQG3zNAjFZiS3Wv8bhphx0RXQytAukIFR19f0vGswB5iDHzdJht At8v+XRhZkLKcySt0xxVYlIQWVjobKN2RHzqnu6S6fN2qOcfbsMa7rJYB9oYHzhEezdHObXR5wy 28O9eh+BJ7YWZS1aiiJdQMcben27U7usIJALxfpTb0okymiuQHjWXwqZet/GR+AvwuAhQLdpyrc ko0DFfadZfCMhscQIUUF8uHHPrn0HqbbrI/csPGixqLf X-Google-Smtp-Source: AGHT+IHUxq5bEYzFkU8q2EMgwzHdCRPdTyU3cSt/scNg1CwBg3gT9IGXS4Ltng7xzXvu5gfwiPtTEg== X-Received: by 2002:a05:6a00:7218:b0:736:ab48:18f0 with SMTP id d2e1a72fcca58-736ab481a99mr17386794b3a.1.1741723097629; Tue, 11 Mar 2025 12:58:17 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:17 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 06/17] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Tue, 11 Mar 2025 12:57:52 -0700 Message-Id: <20250311195803.4115788-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x630.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/tcg/tcg-op.h | 1 + target/ppc/helper_regs.h | 2 ++ hw/ppc/spapr_nested.c | 1 + hw/sh4/sh7750.c | 1 + page-vary-target.c | 2 +- target/riscv/bitmanip_helper.c | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index a02850583bd..bc46b5570c4 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -9,6 +9,7 @@ #define TCG_TCG_OP_H #include "tcg/tcg-op-common.h" +#include "exec/target_long.h" #ifndef TARGET_LONG_BITS #error must include QEMU headers diff --git a/target/ppc/helper_regs.h b/target/ppc/helper_regs.h index 8196c1346dc..b928c2c452d 100644 --- a/target/ppc/helper_regs.h +++ b/target/ppc/helper_regs.h @@ -20,6 +20,8 @@ #ifndef HELPER_REGS_H #define HELPER_REGS_H +#include "target/ppc/cpu.h" + void hreg_swap_gpr_tgpr(CPUPPCState *env); void hreg_compute_hflags(CPUPPCState *env); void hreg_update_pmu_hflags(CPUPPCState *env); diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c index 23958c6383a..18bbb1403c6 100644 --- a/hw/ppc/spapr_nested.c +++ b/hw/ppc/spapr_nested.c @@ -2,6 +2,7 @@ #include "qemu/cutils.h" #include "exec/exec-all.h" #include "exec/cputlb.h" +#include "exec/target_long.h" #include "helper_regs.h" #include "hw/ppc/ppc.h" #include "hw/ppc/spapr.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 6faf0e3ca8b..41306fb6008 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -29,6 +29,7 @@ #include "hw/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" +#include "target/sh4/cpu.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sh7750_regs.h" diff --git a/page-vary-target.c b/page-vary-target.c index 3f81144cda8..84ddeb7c26a 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "exec/page-vary.h" -#include "exec/exec-all.h" +#include "exec/target_page.h" bool set_preferred_target_page_bits(int bits) { diff --git a/target/riscv/bitmanip_helper.c b/target/riscv/bitmanip_helper.c index b99c4a39a1f..e9c8d7f7780 100644 --- a/target/riscv/bitmanip_helper.c +++ b/target/riscv/bitmanip_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" +#include "exec/target_long.h" #include "exec/helper-proto.h" #include "tcg/tcg.h" From patchwork Tue Mar 11 19:57: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: 14012628 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 46514C28B2F for ; Tue, 11 Mar 2025 19:59:47 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5lB-0002HS-2a; Tue, 11 Mar 2025 15:59:29 -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 1ts5k7-0000ya-OU for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:24 -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 1ts5k4-00004w-GN for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:23 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-22359001f1aso140554325ad.3 for ; Tue, 11 Mar 2025 12:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723099; x=1742327899; 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=bYYGOsy+zcSjxVOnigwMonGaAhWbZB7W76ZyOX5Jlgc=; b=aw/aQ+jpPy2luIZYXTFo5tY/KJYB+/jY9ET4myaJoAMSxyzNVBizMum3OOhDAzU8qu qv8k478ouBY6Uh5l2gqMW1jSZu4xVM7zkaYxmA5Z6OQj4SFuV+KKMGPblopXp+oLnfxR EtTEzVC6e7+ODUyea+NX4rd0vYE9VSV9x/XA3ZN2CTnDsBecKDnOa+gPj6YzE7ujzp9P qrQqIR5av7A5xICug4gPqILjkhNq/3/QTzXUNKu+DGfeDtM6F7tRrebo130rBRJwq/M3 2mePmOM0VMoFe2JligtDOsOzuUaPq5zNbkkmqpSuJ6d3n/Jkpezw5VM52NX+AVtijm3i VWYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723099; x=1742327899; 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=bYYGOsy+zcSjxVOnigwMonGaAhWbZB7W76ZyOX5Jlgc=; b=fBuSgycDHXg8CGM6ZU8RtV67bVga4KTM9a6Z4qAorM8LwHSPfS9b/B6BuGOdChNEw8 12GCr5RM6lGDK8kvjWN+reZQW/HOK0drLtnXlLhj+LEj2Rw9Etq5G1n1ex67PH1YDgij LsPxc6cZOp7rYR2e8X3RUL6Zq9kk0tLtDPFBZROK1QdMDmfb1GauK5OKBzk7PEimjibK s/uRzVpBIl3tf1vbtHDSTXzsSWLDIkICgtw2ccAh9ApkP0jzrjqLAnz7zBWyOaNkYbLy GI/xZaeXCHa07xsyM0PH2S3UftlClvZn/BBGLCFcviNlBaNylyTYPSYI3397yOEh9ftr RHEg== X-Gm-Message-State: AOJu0YzAeINIj6FzN6qdD9h7s6Cf0jo9dw7RJobqHzy2u8VFzLUailUk Nlluy3yVy45d7DdaQge7gdgV8i/SQlfYkWqhTFleRu58ZLyE+HlPeNncY5NjP59l7cocDk3HJxh a/ac= X-Gm-Gg: ASbGncsmvlE8rzzqy3SzIZxJlzak7vLY+s+r7R1eneMEV9oLKlLPDqxwKrFkI1sQ52l 9Gwf4yCcugtT0z0yhkamcORZPohM95669H2+no7mzkshys7YKqJOXz78huzyarl/AUs0HSClFu6 E9sGmds8EYLQb3FTAlJ4jXBedEnhg+hZfx1sQ8qzENHXBMZgxaNtut8sUSo03Wn56N7KbjrBhwD 7VZh39KUL+tcZMtIaGUWExWy3KFJ4uYiysKZb2LslsrxdfvNvZdqoBAvuqvx8BicRpclRigZwc2 f74VZQE+ar1RLXpLosaojBQwj8M1yxvNL/dgTw4/59ntDzyBagjNhu4= X-Google-Smtp-Source: AGHT+IFbL/EikEqHmQH7/+hOB9jflYFjv2fXkewmYVpLTsSrUYTiBJ9zTgGhdqBywi26rV+yUM0nVQ== X-Received: by 2002:a05:6a00:1708:b0:736:43d6:f008 with SMTP id d2e1a72fcca58-736aa9f0b0cmr27815913b3a.12.1741723098739; Tue, 11 Mar 2025 12:58:18 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:18 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 07/17] exec/exec-all: remove dependency on cpu.h Date: Tue, 11 Mar 2025 12:57:53 -0700 Message-Id: <20250311195803.4115788-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Previous commit changed files relying transitively on it. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/exec-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index dd5c40f2233..19b0eda44a7 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,7 +20,6 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H -#include "cpu.h" #if defined(CONFIG_USER_ONLY) #include "exec/cpu_ldst.h" #endif From patchwork Tue Mar 11 19:57: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: 14012664 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 65904C28B2F for ; Tue, 11 Mar 2025 20:04:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5lD-0002WD-LG; Tue, 11 Mar 2025 15:59:31 -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 1ts5k9-0000zZ-Ax for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:29 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ts5k5-00005U-G4 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:24 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22398e09e39so111119735ad.3 for ; Tue, 11 Mar 2025 12:58:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723100; x=1742327900; 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=Rp8GQC6vA5rTxSSazblnkjuLZPjrJAYUOFg9uGM493s=; b=YMk6V4mAzrEE/ZKMLkAUwNWcE2naemKzoo8ci0wTZJR4qzOja326LLcYK92e+gpDEg BWmJmyn5QJ5GCF0xzIM8pVH4B9Rk6yUBzZvYIWDtl65IIDp0XBMZwFo7c9SHGQFnws/5 rIhV4HMa0WVJZ85Tj0GE3ulBZOPfvv33dHrBzG+ZPh2uAZvng6Y3qyxXCtmuXR+Bf3xQ TcjBuYl7mPUQ7VLvajwlovg/8WVHzbG+Z3aDqfn+7sm3Uu8IqjyQqNVWDtVrxLVWjtq9 f5QdkpFo4HP61OmF6W7KldHLPbMofFHqv4pXJsedfpGBeGkVQ3L8vJ0gAHbQkDW4USy8 +Rdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723100; x=1742327900; 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=Rp8GQC6vA5rTxSSazblnkjuLZPjrJAYUOFg9uGM493s=; b=Q/PM9+jb4i78B97O44W70AtHyvY3gyuxyrO7HICyf7tZG73T95C8eqLvZyhIGtShWd FMMpp4TUo08ViPEng+4PVnOlfL94Lz8YjVbG+BhX9arEJ1NvVVdW5s3bSr51FEqUTrpD Uz3tkAwMeO3y0V/NM8xsiE/Z7mm/2Vv1iC0q55z9WDn8x0xQMQ8oAoFWzR3hzB8AVmAu NdEaqfRkgQ5+Brgs2FvbTFUabmYOmaVk6AniP5DqozGGzmeKV6/ed8ozcnAk2esVr4FC 9EQH0eovn3o57IwnZSYQVitG6hsCwO3bVXWX+ZKdubUjXa4y0VlRH0zq7ovIcNfyZptS /5iA== X-Gm-Message-State: AOJu0YxGjEv83AEa/Gpcvo2RHckgPMf+Hs4bTfYthaNVXUYl3EQNN2C3 wozkLJ+NhGRvIgAJwm99ZabKvdRCuv1Qu2zYXZydSgFNzzMXJWcPNUEpSir6HZeajWioMZBIm/2 0Ooo= X-Gm-Gg: ASbGncsH2EfXekCBSBTkgRHjT0e7qRMv6Z1U6bX0Oz8GoWKvEv5if/VoKB7F2AFY1rS WTHueSeRD3x4Kx+asAvy15WrccqoDzOATZElPG+iCidFmZEL+vE8jm/GU0xTEuhPXeIpsefrcHg zfQafIgVoTH383Lz3TRRnHHAfmC7mfOgu16AGg6qNwqEFwbRqQowMGaQdNPUeaflY12BGtOqiJC 45qzA2aQglu36EUdZHw4Q5xxBiKV/xG5hfHRd4rR4dBKM7D4LNF7GjWuB2XxxTSua4T1qYEkc2C 3StAvK/6OfC48XgsgfiUmN9aTtyWmR6j3M23L4/u0JfKfs6jGhsLSzc= X-Google-Smtp-Source: AGHT+IEBCxz8tAPvpmfBsP3Ukq6OIHQbs/5ODtSLSGAs7fop1NjSulQH4pEJZaQn/aXi1ghSaJLALA== X-Received: by 2002:a17:902:cccd:b0:224:256e:5e4e with SMTP id d9443c01a7336-2242889d3a7mr298318035ad.16.1741723099862; Tue, 11 Mar 2025 12:58:19 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:19 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 08/17] exec/memory-internal: remove dependency on cpu.h Date: Tue, 11 Mar 2025 12:57:54 -0700 Message-Id: <20250311195803.4115788-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62c.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Needed so compilation units including it can be common. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 100c1237ac2..b729f3b25ad 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -20,8 +20,6 @@ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H -#include "cpu.h" - #ifndef CONFIG_USER_ONLY static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) { From patchwork Tue Mar 11 19:57: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: 14012627 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 479C4C282EC for ; Tue, 11 Mar 2025 19:59:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5l8-00029X-Hf; Tue, 11 Mar 2025 15:59:27 -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 1ts5kA-000102-Df for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:29 -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 1ts5k6-00006U-Qq for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:25 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-22438c356c8so78188175ad.1 for ; Tue, 11 Mar 2025 12:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723101; x=1742327901; 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=s8l5XLcA1+OCzVWAzWmOGo6RbdXUAYo+RpTNM4YWpKg=; b=jCZOuqjDyeG6b/7Cfe9xwtPZdgpXh1oekmFRQeZKDvTzMjmmO2sSdHkZVl/rxzjFOO MEAFG7R6Im6LpUVFZ7L38M4/tX6t1NAcYmEyW2gzfmLuhQT0mLhXIxNRTe5wF2Ow86GR /26uXB5esJ++aah0uvEGd6j0K0sIBnVAQt7jQu+VI7mQ9W6m+1b5W/bKz1aUw/QHpWTi b7k1JvcT4mdX+cvXD+6H2skS+BYRtRDH/3H4mXe6M5IthRi3JmHPveaEBvw8IaRS+PzV 94JrAUSG7bD6z3CRUnq7rtFm2Kfa6uiehDBwydEenr21AiK2hRErRpDbQ8AxOzLvz4+J 4VlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723101; x=1742327901; 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=s8l5XLcA1+OCzVWAzWmOGo6RbdXUAYo+RpTNM4YWpKg=; b=sqPufRgqkbiNzxFWTgMM4TmFXxvmk6OCi/ej1APgwtYEd5T6N4ZObsNgZhskuUPmwA er1XWiqnTmGqWObzSlOyuyV92l737dINkcABx3K2kXbrH+j5dnw+yTATSMs3KuTqc4Vo dZU7m92oEwP5MiQEdcnZZrGnEJceORF9LaFs0bptGK6OC125XcADT8To/4Iv8trMG4vP n9KO2QAlLR47gXerOHRLshUtuGubUHPY+D6iJTR1YmnKGhbNbp2P/csOxma7x+ostg05 eiws4qv4uKDLH0NGYNhAcQ/Ep8OKFAfBTExpzXjbpHyq+9mFazFIztYqu7DJ0hnexaA4 UIiA== X-Gm-Message-State: AOJu0Yz3QXMtGEJMuwwxdJujWSwKSq14GDlaWKCQv+/+RKYu2sLDOhmJ x/soDKvv1EPDgqwYmwtwVHUumaR7cBRHImA7c0kcJg7QqUNeLnW3u4sqqjDLCfAbOo536rKR2kL Y9Yo= X-Gm-Gg: ASbGncs2TqMyjH0XlOjhQdOxi6uT/t01HNa6cGgSAm16l+Dgrq5d5lZB6wdYb+FvjTs shf7oBV5BWLAPO3AWO+6Ah+DG8CAxjj9pokQPRo/AvOwivWUAEfCMHVqw0YCTjqruF0sjyEeJ+O l1H5FX/dILjofjHXkZ9RtF0i4HQN3trY2ret0UphldCt3j7Csq2QuVu2bz8FPNKeYk4W988Q1yI yhk2i/a25FOh4G5trYp2MvIInptV7PObSDiOIq6Mj8qcFCiFMPMmeGCPxI+7FN76qjPbxVFibPa F1zp7IZSc8GBUmVSQWmcXS8bXt1pvvZNy4aKwzxPJsAm X-Google-Smtp-Source: AGHT+IEgYvc9dMvCeCMS1wOBfk7GI8sssnnWj2guiDlIPD98ekjEveZX8r3rPhR4gVsvHIzZwJ8+qw== X-Received: by 2002:a17:903:1a05:b0:224:1294:1d26 with SMTP id d9443c01a7336-2242888bf0fmr253744785ad.13.1741723100980; Tue, 11 Mar 2025 12:58:20 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:20 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 09/17] exec/ram_addr: remove dependency on cpu.h Date: Tue, 11 Mar 2025 12:57:55 -0700 Message-Id: <20250311195803.4115788-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Needed so compilation units including it can be common. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 3d8df4edf15..7c011fadd11 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -20,13 +20,14 @@ #define RAM_ADDR_H #ifndef CONFIG_USER_ONLY -#include "cpu.h" #include "system/xen.h" #include "system/tcg.h" #include "exec/cputlb.h" #include "exec/ramlist.h" #include "exec/ramblock.h" #include "exec/exec-all.h" +#include "exec/memory.h" +#include "exec/target_page.h" #include "qemu/rcu.h" #include "exec/hwaddr.h" From patchwork Tue Mar 11 19:57: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: 14012629 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A398AC282EC for ; Tue, 11 Mar 2025 19:59:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5lH-0002o3-7r; Tue, 11 Mar 2025 15:59:35 -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 1ts5kD-00011C-Dn for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:32 -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 1ts5k7-00007H-Qs for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:26 -0400 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-2fef5c978ccso8948213a91.1 for ; Tue, 11 Mar 2025 12:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723102; x=1742327902; 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=BsftdeZcZ0LsVJ43Vlgc1kB7SrUHDvnjwuIeYSteybs=; b=DLq9LjIUfvl1UuuHb1ssLHfev3HctsXHAQzKRGfwZgnqgB87YQUjvT9EPbn8eWRu4r /2r0R+znQejaeOsiEb0DTIUjv7AS1wYYkBl8Emcr3pznhG00I7/w2qQn7aD5TupJn3Jv lz82X+C9rw9ihF/+CpvnudfqzhxnpN5yZxE/S4W0E7Mu4oyQoqNCNxKku6RjYhcz5/JZ L3/erjpw9D4EeMzsGpdU5wTHQGEpH0fMdYZaBZ7vIm5e0Oz8HHCQFjjHJl6m5jPmUPj2 tFRxDsulfK3gkXcfABepEtr2Ebny0cfTSbRKbfsE7SMin5AlrP72PDPA8DnhLK5rMsXG DPMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723102; x=1742327902; 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=BsftdeZcZ0LsVJ43Vlgc1kB7SrUHDvnjwuIeYSteybs=; b=fezpa4ogbyBEa55gXH95oJNhCTYPem5P3DvtZV+Fm39Dpgp0ORedcCo86VlqKi7jPq j+nbO6V3921UePEexsrPqXN/nqZmD3LCRT33LpaKAfQTIBDRDBjWCkOBp+xutx/A2+wJ HumOOETOyWCC9jAlkC/MQuwwNQ86URzNV/SO+7aMikP17j83ZNW+ZH+SeiWybuTnstZ8 Ngo5nW5VxR0mv6d749CdY5Zcnkdkq02K60vqo4ReFoD+FwBBnvaiMJfG4uH9mWLwKw97 m4BJ1C8rF4gIyTkMRTjacHxvqDpbYR2iGK4KnAb2H0DTC0GuzuVsYhUj0nxsKaUl8Va2 w1ow== X-Gm-Message-State: AOJu0YwRsoTDlFs+3JawzptX6CbDkPs8U5vi6xlYOWAes4guHnCJIXjO jEHgnfYPMQIlY6Nr5UHAsaYNjhDS9UOOftBBvI2fxAY1Wh+GuHMLhhFNkcBe+Geh35CLhKA1OIA cqiQ= X-Gm-Gg: ASbGncsmgC05iqT715X6+sjo7sk8/g0brTJy29HR2q7rrSv+TNwG/50iy19Qx7C3un3 wIaq1DNZRDms5fyIb4T5gxH2H/es3Nt7QD+a87gdQZA0x8OXiSlmXMa0a+BGm/PF7QYKp1eeBdJ VMpLxd/NVRI7AUDLVjNz1w9INKD6NKZ/nicwPSNx4DDmW0FrV0M9EPVeWXYpN2ZiyZYqLs3R3cU 1DrUd4lEUVOyN+AQ1zlZ7Qp8esOJXpxsejR0F1KDjY4CD78Zvp7Bxvlrv2uh7z6V49B/Xn0W3v8 8U+8e5cup570PO9g7ZpOYFzcT82PxTFz+wmQh7oIdKDo X-Google-Smtp-Source: AGHT+IFuSUSQsgKDn+cb31pnjdNEblE2NjRflSuEeU68kg8s8JFfsQQJsGkDTEhj0ycbJp3/pjIRHA== X-Received: by 2002:a05:6a20:6f90:b0:1f3:397d:86f1 with SMTP id adf61e73a8af0-1f544afa185mr29488018637.16.1741723102158; Tue, 11 Mar 2025 12:58:22 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:21 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 10/17] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Tue, 11 Mar 2025 12:57:56 -0700 Message-Id: <20250311195803.4115788-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This function is used by system/physmem.c will be turn into common code in next commit. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/system/kvm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index ab17c09a551..21da3b8b052 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -210,11 +210,11 @@ bool kvm_arm_supports_user_irq(void); int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); int kvm_on_sigbus(int code, void *addr); -#ifdef COMPILING_PER_TARGET -#include "cpu.h" - void kvm_flush_coalesced_mmio_buffer(void); +#ifdef COMPILING_PER_TARGET +#include "cpu.h" + /** * kvm_update_guest_debug(): ensure KVM debug structures updated * @cs: the CPUState for this cpu From patchwork Tue Mar 11 19:57: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: 14012665 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32143C28B2F for ; Tue, 11 Mar 2025 20:04:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5lE-0002a0-B2; Tue, 11 Mar 2025 15:59:32 -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 1ts5kE-00011h-P1 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:37 -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 1ts5k8-00007z-Sc for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:26 -0400 Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-2fa8ac56891so8939948a91.2 for ; Tue, 11 Mar 2025 12:58:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723103; x=1742327903; 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=d9PU2mUUZXceFgFF8NURkIZqXSTxuLUTW3yG3F37dHQ=; b=rN6w0DfLjrshpW89JkD4TPYYWnfDEOo3+DaPlXUBnl3VdyHwWrogHjDZmADqBibNXl rWFQbUycfBsmKuSYynxnlnxw1BGEVUzAJZaMRzo9Dxfdw72P/QR+b232LpYxH5tNx4HQ zdZSTrwEzfWt/0KM5+NsAWlvQUVdOW0PLhXTZ9X+6tI9W11qjSLOlcQ7T0NArEJ3imcM XstAeJwjDOcpS95eJsfeLVSyMNtpo6uVc7LYEa06VPfGpdsvFQ2mq2qZXDkroKIKbofb QV+TUXMFyoD9dx5IecGow+3bpzAvKMroK+FD3J0ATCVsio1E9ZUWIa5rL1Qt4wCi6g7f wm8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723103; x=1742327903; 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=d9PU2mUUZXceFgFF8NURkIZqXSTxuLUTW3yG3F37dHQ=; b=Hpz2gluRv/tfr3w39OTJ3m3FU1gzpZY7ZSMPKzhreXhhXC4gfurhTuoZtDEKVhrG25 ViRjyPdvsDcCXfBFNRtvOrDrJUxPwi9GGO7zTX8/mAINUKfwOVMNe8PSFnr1uad6WZgA otsRC25QsPPbYAuirE8aYozab/a9koW5/LcABY/qfoZdr+/6ccgYUT/ez7EflHmKXjZI yR+x2roInwvbd1PPj5hlUdoH1c6P6RgA6Ers+rg+/1c1uo243A3GUmZGdyMU0Ypn6H0+ 6Q5YN8+oHX/UgW+qe4DpkLnHXJEmV72aoCEp8lC80FkDchmJj43RMrKzpi1hRyQKV41L rA7w== X-Gm-Message-State: AOJu0YwkUP/lc58atdAiRHyw813hCte6IHBMiDOGPrW8UiBlliIT8BFf ZK4KLCOUtJHp5nRnu+ixs/P50qyfxvx0dKlTQrKRtW4LDBzLPOQ5FQC5su2Nqj4WhX/mMo6M2ps 9GJA= X-Gm-Gg: ASbGncuVa/FjEk5ljTyjG7udep4g7PU3i6mGgaTCCHENMN4/N3bzGaEzwchiZBfpVwb xP1Qt4avrhHPFQHcQxikNtK04Ja8MJ+tjz/NBt4p3DCVU+4dShyNKhWYlMuJauozRSeyQLyhgU4 vFgVcppTGq0d6gvChdG0kaOahyJ6NgjQEbmcwTGAHEjRsumHJYwFQGiV0u+HlxsUPHPFx1NgWV+ /EbtMUpZVASI4TnR/duYLtLpXBk77LwEd4OYPEn5D2yxbuxD1umazLS9F5GqU5I1uFSr7/6m8eA mLhEGwFnXhQ7lyMWxM6m4E7AddSDjDO8yBpJK3lBUdZI1DM7Yr62e6Q= X-Google-Smtp-Source: AGHT+IGg+aQTZ2xq9SQi3eRnsIeXjPhQ74pTHWyL4E+moWnFDewPnn2zGKzm8djm9QcS5fi3hNfHgA== X-Received: by 2002:a05:6a00:c8f:b0:736:34ff:bfc with SMTP id d2e1a72fcca58-736aaab7d8fmr24949384b3a.19.1741723103280; Tue, 11 Mar 2025 12:58:23 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:22 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 11/17] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Tue, 11 Mar 2025 12:57:57 -0700 Message-Id: <20250311195803.4115788-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 7c011fadd11..098fccb5835 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -342,7 +342,9 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, } } - xen_hvm_modified_memory(start, length); + if (xen_enabled()) { + xen_hvm_modified_memory(start, length); + } } #if !defined(_WIN32) @@ -418,7 +420,9 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, } } - xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + if (xen_enabled()) { + xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + } } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; From patchwork Tue Mar 11 19:57: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: 14012662 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A66FFC2BA1B for ; Tue, 11 Mar 2025 20:03:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5lR-0003fb-H5; Tue, 11 Mar 2025 15:59: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 1ts5kE-00011k-Pi for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:37 -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 1ts5kA-00008V-4f for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:28 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-223f4c06e9fso3135395ad.1 for ; Tue, 11 Mar 2025 12:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723104; x=1742327904; 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=YZcwoIie6BtZ5Bqo8BYW0CKBTK95znA0iA8YHmiy7v4=; b=sE3Sv2PmuDHH2NJUPQHB+DnObIB0L7z5fqcP4ko5dAS+3AvSH/mHBm0gWKOOmHz5VW cHQlTLbQMpq2zSSQS1ZOiKerjFllkI7a0zncwAmdTnL57U689B8E679W7I6Yt0//Wbfl yMyWG6Je0tzMCFIVIFffPEvuoL/tjla0QGmn8/mR/IOldQlBKHjzMLONc0T6IPwjkt1V 0s8+ldtdA9kFpDIuJVWduBPrhcLbBN+5/WlTzwIc+dOHmcy3CNdce3mUp9ftkOFPNjXP EaNZjuizq+SQ59lqNU2dNP/Ej7rde5F12xIm8ApB02QUcqXDFiTONYNUJL48SW7jr5Id ja7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723104; x=1742327904; 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=YZcwoIie6BtZ5Bqo8BYW0CKBTK95znA0iA8YHmiy7v4=; b=MMZdZr02QvAZ4wkITA1+/Iz2JKm8OUocvRAOSY6vAg7wA76YOEci6S/lLvcLdWuX+q /+REnBi6TBq4mC4F89P6acd7nVDkb7PNeWjpy1tod9Lpc33MGvDNIz7YSlBPgypqRuL+ JI5dNr9SCL1Cd5npZhvVn1KTGKy6Uyc9a8IbYZkAAcW89+VTAZCiyBMnh5fw8vlHnAge +RNWZ0woFlk2kaJI7aHUQeAWwK+KQ2zNknvr5Ewubsq6Z9UPMdD5HmMW/zGosG/6Ni0v kYPgXM/H/owHqbwrPeap4BYAn4UVtezaw8yGJIWLqexkPDeIwU8GkyCCquMORdQm37En P9Ig== X-Gm-Message-State: AOJu0Yydh5CgaLeBfTiVjew+vh9fRTnxyoq96TkNw7vVIB7ZKrNEJLO3 iQAjO9CCp9ryZ2Qe4SWSyjvAEt+wTYyiOEY+GEk2XhDHHnk6b9gMia0enIiqduVfhbnCGtC+nl8 tntI= X-Gm-Gg: ASbGncsOWLPydQ0aaR0s8/9ViwV8t3rzBoo/jtbJRu2xeG5/7F3sNYUIYkkPCHK/mkQ ZfXDibQtm2wS0prxGkvKyunwn5lEpZlqkX3L3ZpSlpHsYuygmjrvoYbBhdcwUX8HpS+RJyY5fAJ NK845Xn37cyFyCU4mvTdjLckLTX5enkzDrlgbFdXb914c87LrOFGsliZ4/T+GT1kvcIROWC8tfP wmRaP2znmXNspRx3fP1auY1GH1K0TfBKMehIzb5VA8rfZTHVy4mTP6kSBnz8wFq0JeO1qsKBOGf fkhCoHmnFtTUWDqlkPRKUf36P71VzYK05lhmxNILVC4H X-Google-Smtp-Source: AGHT+IEToni6mHy+/TOd0EQfFDFUNLQyZb+aNmkKXcJNYvCuHB4nuxbuNFqkwEKNu7S4yPPDELKJzQ== X-Received: by 2002:a17:902:eccd:b0:21f:5063:d3ca with SMTP id d9443c01a7336-22593dc5076mr68139055ad.16.1741723104414; Tue, 11 Mar 2025 12:58:24 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:24 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 12/17] hw/xen: add stubs for various functions Date: Tue, 11 Mar 2025 12:57:58 -0700 Message-Id: <20250311195803.4115788-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Those functions are used by system/physmem.c, and are called only if xen is enabled (which happens only if CONFIG_XEN is not set). So we can crash in case those are called. Acked-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/xen/xen_stubs.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ hw/xen/meson.build | 3 +++ 2 files changed, 59 insertions(+) create mode 100644 hw/xen/xen_stubs.c diff --git a/hw/xen/xen_stubs.c b/hw/xen/xen_stubs.c new file mode 100644 index 00000000000..19cee84bbb4 --- /dev/null +++ b/hw/xen/xen_stubs.c @@ -0,0 +1,56 @@ +/* + * Various stubs for xen functions + * + * Those functions are used only if xen_enabled(). This file is linked only if + * CONFIG_XEN is not set, so they should never be called. + * + * Copyright (c) 2025 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "system/xen.h" +#include "system/xen-mapcache.h" + +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) +{ + g_assert_not_reached(); +} + +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + struct MemoryRegion *mr, Error **errp) +{ + g_assert_not_reached(); +} + +bool xen_mr_is_memory(MemoryRegion *mr) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache_entry(uint8_t *buffer) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache(void) +{ + g_assert_not_reached(); +} + +ram_addr_t xen_ram_addr_from_mapcache(void *ptr) +{ + g_assert_not_reached(); +} + +uint8_t *xen_map_cache(MemoryRegion *mr, + hwaddr phys_addr, + hwaddr size, + ram_addr_t ram_addr_offset, + uint8_t lock, + bool dma, + bool is_write) +{ + g_assert_not_reached(); +} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 4a486e36738..a1850e76988 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -9,6 +9,9 @@ system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files( system_ss.add(when: ['CONFIG_XEN', xen], if_true: files( 'xen-operations.c', +), +if_false: files( + 'xen_stubs.c', )) xen_specific_ss = ss.source_set() From patchwork Tue Mar 11 19:57: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: 14012663 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 91E29C282EC for ; Tue, 11 Mar 2025 20:04:08 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5lL-0003BU-Kh; Tue, 11 Mar 2025 15:59:39 -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 1ts5kH-00012C-MG for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:39 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ts5kE-00009J-En for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:33 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-224171d6826so18622755ad.3 for ; Tue, 11 Mar 2025 12:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723105; x=1742327905; 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=Q89mBu4b5JYOE58WB93/V2zR/jXmfpOvKMtRO3aXK0o=; b=lf3qCzTH2MlGFP7nyvD2Mqga8jLUjWq8MXtIF0mxdFdhlDqxKCTKzwyLwSzoNQRYzO Yw6YPSIiFXul+9X4WV0AOTeY8m5U0qN+YyDWriNm1QVwmgC99Iuph8YkPRdaWupF5IZb spucxO6ZFaB40Ss+ft7ny2XRnHj5l886VgWOYS5GGm8gl8BJ6qwDRMtMg88gpPNn83O4 2NZK/503bRiZxybEFqtmQMtDqN3x40V35bg7Rid37VjNv5YmCvBXsgmc7NeeFJzgM3Pa sSpIFjh8sFJCrgav0S9H8VOuw4tisyqZOyq8OHXNZCNi14iDxj72L/QYBimT0GzZs6UX NM7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723105; x=1742327905; 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=Q89mBu4b5JYOE58WB93/V2zR/jXmfpOvKMtRO3aXK0o=; b=mMq8nCo1Iu/f+Dvk8xA9eKXaWLgUFxUYxX2Lvu8THoM917zFGM66bUzzREg4JQlsp3 yXdNiCOv/C8Y7xRnHJEQf8Um5VLG9LL5/PovCvN0qWMufNcSVs8EbtWw/XaGR8ZiSgI4 s+qeRa1IllEECzuvH+KH2bgdUAlq84TZ/01Nspx6Jp93k0Mls1/gKT2/XP7zlJT1EWQh DzzTwSq3r2oYhQEe8ZWYcjKHRW6+PaAqpF7u4v/PAKi9XoabT0cidaH4l2Tj+MoZCIVo 5cmcvjDYNgRCgRYNSZ844VXZMIrl0anaqbF+SM9xrKOI7928V4jMMhMQ7gfUlsRVYqNy 5oZQ== X-Gm-Message-State: AOJu0YxvVc29IePvqCxlDYZkaGO8uJ83WE6YT+JvERf/n1gvi2H5Jssf n7Lak3gqeXyRS6z3UmkZ4NmxrFxLEWUwbfEUOIpzxvzzjRxy5RElKlt00XEKrWyOObVvABbm4AZ CpcM= X-Gm-Gg: ASbGncuRHrs/lTkjRpgo/Xb3wI7OxpIrRvwdmlhKfUUFYXQmWPLLG/iBb1G/42ipvHc J+nejQfiIA14NEXFzacyAyTT0zBcrVTKUehkkGwc+Yh6MsYJJ3HVOcW7i1ho3D3h5RwUGB/5aLK AHMgRkzHWRSt7NzHIhMUQxH7+NvAsHddyyKuN+pvrLifiYNI5RRLvR7fD6BsJog5k0v6nVHtGTY GPwcJLIWX9BHY60fY8zHpzbjXNEBrDtLp01Ux+Ku9Lmm8Fm4wQrNynQ0CBxh5MMzM6QulZlxPAP kkvLoovudEXmE14cEe4n8BKopORvh3i23vGE0ST6COfS X-Google-Smtp-Source: AGHT+IGPxcxao/HSElseyaTLTAghrvJ2csxsBfbQ4Udwa0eEZtZIt5xFFqgWZBrC6WgJmJp7FceqHA== X-Received: by 2002:a05:6a00:4b4a:b0:736:5c8e:baaa with SMTP id d2e1a72fcca58-736aa9bc0e9mr26082176b3a.2.1741723105679; Tue, 11 Mar 2025 12:58:25 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:25 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 13/17] system/physmem: compilation unit is now common to all targets Date: Tue, 11 Mar 2025 12:57:59 -0700 Message-Id: <20250311195803.4115788-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x631.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/meson.build b/system/meson.build index c83d80fa248..9d0b0122e54 100644 --- a/system/meson.build +++ b/system/meson.build @@ -2,7 +2,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'memory.c', - 'physmem.c', )]) system_ss.add(files( @@ -15,6 +14,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'physmem.c', 'qdev-monitor.c', 'qtest.c', 'rtc.c', From patchwork Tue Mar 11 19:58: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: 14012631 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E10DAC282EC for ; Tue, 11 Mar 2025 20:00:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5lH-0002mi-0Q; Tue, 11 Mar 2025 15:59:35 -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 1ts5kK-00012N-Mi for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:39 -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 1ts5kE-00009n-KU for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:34 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2feae794508so8962834a91.0 for ; Tue, 11 Mar 2025 12:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723107; x=1742327907; 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=0vI16NHb2tKWbIxjnq/SoVUTdY/Lep770BkCc47k0Rc=; b=Crv3UZaW/GimI91WYuRikjJuiPd3ufM4fJRv3G1tj7YLRkwf5JGMzm4ynzquaLvueN MnsFFEVw8oBFKzNi22RuqyLxHcrCPRbkmRBXf2ZWYWeipyt+Wn5oh+xNdp236KTnADxj v9s/sDyojhI/ig1P84V3zLCjjWrDwZbeD7g/CiP37KqGTpDPdf2eMbvgXzlQgA9Hknjt BJh+HdOjeW9Nbh5Y8JylQvoKhgnXIYap//4rVuXm3fb1QEPo7JuHM8poCA/Rr/3YzctE 6IqlSl6lLEIHBC3G8NbJnf29F8MdVtGula/zgHmdfYVqEPpDkGv3wcu+f5vEXs8ir9aT jsIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723107; x=1742327907; 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=0vI16NHb2tKWbIxjnq/SoVUTdY/Lep770BkCc47k0Rc=; b=ISKJ6hYhAgsc/lBUlfcEZ0oIXl51hKJegBARVySXGhfxMxbBu4Z76aMraOIuFRjT7D +P+PPNNaoNnpYr471qGDlV+NpKIT/GjKEMClBFYHugCB09MenVf4YZgQ/FjJFeZgkj6a 3+0r8RCQH38Eov7wN/v9TIUBUC2zsT1GIJVDP2EObCm6GPHeABCyOVgPWSAbTlLgbCR4 IuKKuHE7ltw8w+/WHpiL5wIRjHbKVlattgGpL4IgY83QSYog2Go5GiWaHbtwz1mUTegF y9O/2DjXI1hE6dillup2Sjb2IOIz06jRXobZPSawjq+Ca/WJ1u1U9DgseORAqt00JdV3 dfjg== X-Gm-Message-State: AOJu0YwXvhmQb8ZIOyaniMNAY3WFhlKNeBzOaIDbGdRqtVU6Dup6lltj GD79mKOUR2K44KgB8SoAQ99zwknomMBhopo/dnhEOmrQoFN5iDKh8MjxQjID7OFownDcvv474i1 PSdU= X-Gm-Gg: ASbGncvdwSsfdoJ4PM4NJueKMrRSyj1M1/nIuk/OXIsDAC532RZAaq9r2bW+qXwFQJO jAwxGgxQzfL9ZyKusbVPMRs1tpZvNvDaSQxK3cvYu6Ce7cOub9mcZ1SZUHQIDFyzH/uP2raX/Fj Qcic8zHJi2qQSCKboh7av08LJnckuL19s2Yi+djMrdUjvz7fzhyhhOb/hwXym3ztlJa/YO7fhCb WRQKyB9uaGEnbrYfq2hd1TfFmvZqFadrV2/7JFlE22JDh0y8NYIbKZGXg1qOxYn7j7H+D5DZN7U geWKNUXtQaN2M5nZoF4FYcHEwJ/37fJeEYw59dhfws9y X-Google-Smtp-Source: AGHT+IH4DZQtwoxJlYICmsHBrM9aJbv4mOOcZipSBsnLFw41tHWuGL9LYWyAZtn5lP/0QysRh7Mo8Q== X-Received: by 2002:a05:6a00:928b:b0:736:5dc6:a14b with SMTP id d2e1a72fcca58-736aaa1ace3mr27769096b3a.13.1741723106807; Tue, 11 Mar 2025 12:58:26 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:26 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 14/17] include/exec/memory: extract devend_big_endian from devend_memop Date: Tue, 11 Mar 2025 12:58:00 -0700 Message-Id: <20250311195803.4115788-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org we'll use it in system/memory.c. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 069021ac3ff..70177304a92 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,16 +3138,22 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - bool big_endian = (end == DEVICE_NATIVE_ENDIAN - ? target_words_bigendian() - : end == DEVICE_BIG_ENDIAN); - return big_endian ? MO_BE : MO_LE; + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; } /* From patchwork Tue Mar 11 19:58: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: 14012669 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9AB0FC282EC for ; Tue, 11 Mar 2025 20:05:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5lV-000487-Lp; Tue, 11 Mar 2025 15:59:50 -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 1ts5kO-00014I-5U for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:41 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ts5kF-0000A5-EF for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:36 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-22185cddbffso3407015ad.1 for ; Tue, 11 Mar 2025 12:58:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723108; x=1742327908; 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=/B5foK4Qy0OvFQVWNYpVAAsAF+tVTKpBxl4Jl8CdPFE=; b=fKUIl7sdE0EUMvdS4qpkgpG/tORRIIDbtwWqSt3ScaCVPUgLkZyIIAIjzoxgbFuY7O KFR/r0LpRJPoFYW9S+xTHbYLBkZVQFbio/BzmXej2kylrieUiVactUFgl6Fc7zr074YS UaTMSHG3irEUzmtrsCcZqrIlwwWVLPkMCM+dDV04CuYte2Tpz/6r9XmvG3FtGoikCGPR Y78g68GXBuQxKdLAVhBn4dIH4W4mZodV7Ap+iGCMlXj/aVJYJE+MKND6isBCv2FbU8ST ycb3Q49SIKQEIVCe85DPwiwQ0V5OHBtNZFocp+ALRrMyspsSIORgX27qDhpTgSCKUe6F gYKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723108; x=1742327908; 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=/B5foK4Qy0OvFQVWNYpVAAsAF+tVTKpBxl4Jl8CdPFE=; b=qkfTcL7BAbxYbDAsxonD/15psOaY+uA1I7sHboxFrkxsaekungdIlLwAsWRBzQvVkU dmumj/vWjv4haboxR1fu7BH/IcR8NdPV8u5RWKdn+DpivA92GWPoXkKwUSFWJyJLCge2 B15TQfeAbA8ZWOiOLEH9/c7/PLZ0XMHTOstDxj5d6Jo4B9m4UppcKuHkZZdVnuLE2RFk go725n90a0QX0Jb2RVLV8TzQL77TfH2B57DZG0Xs5IbTw0FE9HgisA8E9PRpZyN/5iyw JVC8VC9qOtBUxXDnLXIPRdOyOBDWnK9z0DMullNfSGBWIFaaVHV7A5ehEQTMAGugUcZH 4Xig== X-Gm-Message-State: AOJu0Yxb7mFvP6XD1byIghoL24z3iAKMXEbTCOWcrOB58u0BIGAcjZcj t+XzuFH8fhfQ0C2pBx0QF2tW2+wmmV1mwoBIasenQsqPR3C3jDrItEk6CeJ8+fN/ZtmODP+tSxH T/Sc= X-Gm-Gg: ASbGnctL5ZULAXS8hB1T9Wc37Ko/8GZcSZHmuolcDzdvgTGsva35EYrmrmoWncFSnyZ Z66x2MkhhFlnQfbpK2gqa4uE2sXUYflKUYI3JJi9s3rgQ18tOwLcjazHM1FrOdBKpXsFjeViwml h3hnJUM36ehRvMkDKDcwP0Q6H/oe67Q5TKCabLwyoTvsbJMC/41TcxqZGuRyiVqQKxNTs0Wmjmy DzlxdZqDs/dJryBCc+J7Hoo9wfTpQysP0XHMWv3BuRMDbf0fRsMNn1ZL66brVjgcZSs1C4Jhf82 IekF/0nVwEGrIO8s9LW7mTYSHt0yYx6hYx4iilFfZb7Q X-Google-Smtp-Source: AGHT+IEFWhkhOunU64h5Vgyk432uXoYWcCQsdf3Qo3RWjfxu/zqVxr3PiSl8C3ffFvP7C/aGeequIA== X-Received: by 2002:a05:6a00:638b:b0:732:57d3:f004 with SMTP id d2e1a72fcca58-736ec5f1748mr5532672b3a.6.1741723107984; Tue, 11 Mar 2025 12:58:27 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:27 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 15/17] include/exec/memory: move devend functions to memory-internal.h Date: Tue, 11 Mar 2025 12:58:01 -0700 Message-Id: <20250311195803.4115788-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::633; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x633.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Only system/physmem.c and system/memory.c use those functions, so we can move then to internal header. Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 19 +++++++++++++++++++ include/exec/memory.h | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index b729f3b25ad..c75178a3d6b 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -43,5 +43,24 @@ void address_space_dispatch_free(AddressSpaceDispatch *d); void mtree_print_dispatch(struct AddressSpaceDispatch *d, MemoryRegion *root); + +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) +{ + QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && + DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); + + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; +} + #endif #endif diff --git a/include/exec/memory.h b/include/exec/memory.h index 70177304a92..a3bb0542bf6 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,24 +3138,6 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* returns true if end is big endian. */ -static inline bool devend_big_endian(enum device_endian end) -{ - QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && - DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - - if (end == DEVICE_NATIVE_ENDIAN) { - return target_words_bigendian(); - } - return end == DEVICE_BIG_ENDIAN; -} - -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) -{ - return devend_big_endian(end) ? MO_BE : MO_LE; -} - /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., * to manage the actual amount of memory consumed by the VM (then, the memory From patchwork Tue Mar 11 19:58: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: 14012667 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4CE9EC35FF1 for ; Tue, 11 Mar 2025 20:04:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5lV-000493-O5; Tue, 11 Mar 2025 15:59:50 -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 1ts5kL-00013V-LH for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:41 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ts5kF-0000AJ-E8 for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:34 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-2232aead377so19364765ad.0 for ; Tue, 11 Mar 2025 12:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723109; x=1742327909; 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=Z06CcN5pABW+zUVUk9wuBNFYUJo3O9KfWdv+N0a9H8A=; b=BbUrARlt2IlKJEHDELgitzUJv4RQY7JNGf8AGHO52F+/IXXP32Uy3VZRJaC7ouSMbq U/Gstdp+wakdmygK+kKg8KFYvm+MrrWL2mId52JkBbiEnn6X+jD6WKuv49kK5QVM/n+O NXLwEaztbj11CE3UEkrOk+aLbNlzuiObn5ZCx4VGVvzgyfO7SLydciGeF447/3Ro6EXt 0qR9VTxlH8mnXXqVuDV10rYV3DbfNu6WRGiFFwblyqw58xqHjASbf+KVLnL0O1aCJtYZ V1E3F7ahgj3DKzmQBtk+d/kNU9CjmcxTC+R3rwMeXRSaQ3iYtRVcmiZImcQSbV5K8Td+ etDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723109; x=1742327909; 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=Z06CcN5pABW+zUVUk9wuBNFYUJo3O9KfWdv+N0a9H8A=; b=GLyrowR/wkQDHRaoavcPh+2XACJdAFMY6i2BN/JwBFopKtOmDIJnLdQNrdQj9WMP0H 03zFZltzMJIKmfD1ChYExKyaCxI0l1gKBFxnpXUEGpxVdqoX52Sk/vyxhT6WbO1OM6II ZL4272ErFSntF8SXh3EtTpmrzE3ahW+aIcFUrMyabxSrxvzaMXB4Pd1LN+5hK31QvAwJ j33+dBDL5LuD7W4ktt+lc1OA8lTSk4O/9m9j3LYntwsOSdQDtKyWOc0osecQjWxNDQjK 9o0Rax6uwMQ9wepr7oe5SFNaCK34AB9JYfo4+yWUjYXVzHOHOdRHxGxrK5AL5sjwzPi+ IUFQ== X-Gm-Message-State: AOJu0YyBegvpjutNnhDO07kwXwvn8ioN3to+AATfrx8dwVwTHobriyDL d2BpwyzPan3BVqVA4OtodN3Gk1LfJldN6Is4bBYe7OvqGOBov99qfzpXEM6oCC6l8QD7gdc0tf2 tjtI= X-Gm-Gg: ASbGnctoH5oDTcX1+zwZ5uKw59URqK6zzQ5Lw3U3rbXUUgErfcrBBJMYft6k7T4ejXv olbhcwVhxK47csyayPlxlQfru641Wo4UdsNvj4NxcUIMrRtT0O2LrkkdoHo9K4neuI2FjPNXCLZ KlrMa596I/wCBSWbCZbjEVAiPFnafBOD19HHDnTdOkifXFHXaGRzBiuulikwguHGE02SHOrCYcw uaCHtTk5aDrD2ZM2U73a2dNSifNRo/BNUYsI1Wf9MV01ga004yBqzFNw+SM9MdyRURARCLP/pst +hdcoqfhsskFwRgih55NSeDz/nOmTaGKxhySfQdb/Z9+ X-Google-Smtp-Source: AGHT+IFWZfAhxvvEDgAAce92ETlma5STi2t3r8z3LElksShqNyxmTswS//w9tvWqHBQDxaqLnsB1Kg== X-Received: by 2002:a05:6a00:2e17:b0:730:95a6:3761 with SMTP id d2e1a72fcca58-736aa9e745amr30276190b3a.3.1741723109168; Tue, 11 Mar 2025 12:58:29 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:28 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 16/17] system/memory: make compilation unit common Date: Tue, 11 Mar 2025 12:58:02 -0700 Message-Id: <20250311195803.4115788-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x631.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/memory.c | 17 +++++------------ system/meson.build | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/system/memory.c b/system/memory.c index 4c829793a0a..eddd21a6cdb 100644 --- a/system/memory.c +++ b/system/memory.c @@ -353,15 +353,6 @@ static void flatview_simplify(FlatView *view) } } -static bool memory_region_big_endian(MemoryRegion *mr) -{ -#if TARGET_BIG_ENDIAN - return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; -#else - return mr->ops->endianness == DEVICE_BIG_ENDIAN; -#endif -} - static void adjust_endianness(MemoryRegion *mr, uint64_t *data, MemOp op) { if ((op & MO_BSWAP) != devend_memop(mr->ops->endianness)) { @@ -563,7 +554,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr, /* FIXME: support unaligned access? */ access_size = MAX(MIN(size, access_size_max), access_size_min); access_mask = MAKE_64BIT_MASK(0, access_size * 8); - if (memory_region_big_endian(mr)) { + if (devend_big_endian(mr->ops->endianness)) { for (i = 0; i < size; i += access_size) { r |= access_fn(mr, addr + i, value, access_size, (size - access_size - i) * 8, access_mask, attrs); @@ -2584,7 +2575,8 @@ void memory_region_add_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { @@ -2619,7 +2611,8 @@ void memory_region_del_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { diff --git a/system/meson.build b/system/meson.build index 9d0b0122e54..881cb2736fe 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,7 +1,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', - 'memory.c', )]) system_ss.add(files( @@ -14,6 +13,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'memory.c', 'physmem.c', 'qdev-monitor.c', 'qtest.c', From patchwork Tue Mar 11 19:58: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: 14012666 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6D59CC35FF2 for ; Tue, 11 Mar 2025 20:04:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ts5lL-000388-2l; Tue, 11 Mar 2025 15:59:39 -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 1ts5kO-00014H-5P for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:41 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ts5kH-0000B3-FE for qemu-devel@nongnu.org; Tue, 11 Mar 2025 15:58:36 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22398e09e39so111122425ad.3 for ; Tue, 11 Mar 2025 12:58:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723110; x=1742327910; 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=/jGKe5PComzh06JRRSjyC3R7ujh2oauOlO5efOCu+zg=; b=PgouqsR8viTpWlGxTGmzHQ3VC0Vq9uBIaFthQVLiMVgOLqSB5MhQnJu2C8EIFEQoFT UAhaVlBhOpd7ywUmCCrkRnaUaJ+egwgj8bFoJMHqvcscZFloxwtfiqtVSkG5jPvoMeUT 1HU3/D3ZY4pRCprmsWN1a+L7o137Rl8YUKYa0SueMYFUFGzBEKgu4CcfOHyBxVYmADZW nygSX/cb3JvuOJjeFdCIF53xPNMatyUW39hj+jqh476dac3OWD0w+ZJXUuhC/rne17sZ uQlNkdJ240gZ9oosJAdpoRtripHqohm+0XGuruYOsF3KfHy3ugGXcf2ZVGnTE44jEHSl 5Gag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723110; x=1742327910; 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=/jGKe5PComzh06JRRSjyC3R7ujh2oauOlO5efOCu+zg=; b=q0NOBx9/88M88fqiA1WhVg9QjepxwZIqIhgYza9DiajTU3lUx2QEzbhu9z2yupTgoh 5eYOfDwa/iopNwEOOBIZAX+vNE2sIS/PtCfULjDIUeVC6UQq2hLUWRYZUgRNJHJw0djz PdKtJecWuhuzdW2hXknUGdnP4Gf/tQBUifGXqeg+H8MvkSWaD0mXDcDz8PrqXGaCvwNz S04tFzGjAETIR1nlIDBWt9PGpfV59xXDRCClqhcsqMF7PiV1kLNwtmL4+3ibQzkeV7BJ scrTqmngpb7RlNVu9zHgC12QnV6PhzGvRn/79L5JgtW+FrCtZXTrkVoU6+PG5tyWOrRJ H4zg== X-Gm-Message-State: AOJu0Yy6vFM4F/MtEF7CubSF2Wlu2aWGwfI/xSUfxU0AsZBawJvi31Ok oRr+XmbBhUB42UgJ92T9DD+V5bZSyZZ+BiQ02vZSMKu/tNNAg5uV1/fbE+NViuEoiBL0b6AepIx 4ukM= X-Gm-Gg: ASbGncu5TXL7hGkk393MxNsnfwUXtjAeSD9lhP38pyH8XCsD12ZkogXuR8t2iD+BHVR uw5U+r3L6WDO7uhFgNoQVIkbuqiV5O91D0UJAKZmQ2z9FzAAcVBqSallNTCm6AlH65SQajHGyRn MDnSWs4IOZueV0pHFhMdfCcG3RT9ef/zrol+2rsk5fmnT2zUjkcZ7RawQsg1xhlgEe8tPwGleWJ LoGxRs4Iq/gIrcTvo+76RhlTLQ3LhTfcGQDGu5DNDOG9VQSv6KwFKrvghkFhXX0EqpgJ+j1U46z wLFrbW1+IghheT48knxMLONiZ9qEXrTf9EfhmwaX0Ek5 X-Google-Smtp-Source: AGHT+IFWRSSWAAZ74eVr+KcVmFNEyBuYNdoBJPeRpIUKcbNy7sibb5A9vNOWSCrzmBmp9nxRDwlIAw== X-Received: by 2002:a05:6a00:b86:b0:736:50c4:3e0f with SMTP id d2e1a72fcca58-736aaa373b8mr22374606b3a.10.1741723110296; Tue, 11 Mar 2025 12:58:30 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:29 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 17/17] system/ioport: make compilation unit common Date: Tue, 11 Mar 2025 12:58:03 -0700 Message-Id: <20250311195803.4115788-18-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62f.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/ioport.c | 1 - system/meson.build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/system/ioport.c b/system/ioport.c index 55c2a752396..89daae9d602 100644 --- a/system/ioport.c +++ b/system/ioport.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "cpu.h" #include "exec/ioport.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/system/meson.build b/system/meson.build index 881cb2736fe..3faec7e4dfb 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,6 +1,5 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', - 'ioport.c', )]) system_ss.add(files( @@ -12,6 +11,7 @@ system_ss.add(files( 'dirtylimit.c', 'dma-helpers.c', 'globals.c', + 'ioport.c', 'memory_mapping.c', 'memory.c', 'physmem.c',