From patchwork Thu Mar 13 16:38: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: 14015420 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 CADA0C35FF3 for ; Thu, 13 Mar 2025 16:39:27 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912881.1319053 (Exim 4.92) (envelope-from ) id 1tslaV-0000XD-Ra; Thu, 13 Mar 2025 16:39:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912881.1319053; Thu, 13 Mar 2025 16:39:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaV-0000X6-OP; Thu, 13 Mar 2025 16:39:15 +0000 Received: by outflank-mailman (input) for mailman id 912881; Thu, 13 Mar 2025 16:39:15 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaV-0000Wy-4P for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:15 +0000 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [2607:f8b0:4864:20::1031]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b23bbf4a-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:14 +0100 (CET) Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-2fec3176ef3so2136572a91.1 for ; Thu, 13 Mar 2025 09:39:14 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:12 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b23bbf4a-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883952; x=1742488752; darn=lists.xenproject.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=YH5rqFqnX49zqTEf4vVezPYhQybdK54XEaraA65SFuGPPbrTPuEc3RXiTZn9I9hlcG GGD47vu5vYqFu8F7P/98fd2gwT0IXYODklAc9Axi1clCTufRFVo4aQZeekFYAtbF0etv snVB1ydsuNnzypl1B3cxe+fjFutkj5a5vhJNcCfPhnq0UYitGW/pY+55+Zed7QmGv2Eg 1mjozC151IH/zg7A7Gkfuc8mGSKNy7mzKb4IZeZJD9hZ2StrLjt982paE/essqrQCcAd jYK55SR7fcyYEkNCQO7Q4iaFwbAGvKJd4nmTUTEUKHXePP/Di7YGQpit8vTh7KvNOFB7 8YoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883952; x=1742488752; 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=J+WZ6Re5WU2/WTigBXwIh3hJag/vPqrAx+Wwuetw0Q16Y9t6+7z/RujlSYaJBO30FM D0e/b5n0TH9da+u+MQyACTJcg/aXq/CYQ+2whIpSZSh6T7TbERpYOGunduHoUZQP/lkj z97AmSaCTT70Ub8kNMNu4zQk6Uv5yPcRgNTOHcApiff46QuBeD2bkZ2LITbdDawtP+kJ PZAcU6iohxy78sQmaGX+oZd1bsbAx1YTBA28X67ijVbxtrn2osu3o/Edm7E6/wUSNZ4I pWLVLdiAEZJeoKEf8MnbqyJ0NOArrGZeCrZFNEo4P84j7c/CwI+pWTEwT9h1bwTSgL5m Q9EA== X-Forwarded-Encrypted: i=1; AJvYcCWGpLwva4OdSrykQY7Q5+2Rv/zCCWNU3u7+Y8hpFftIvxFGkWhxANysmA/iN3GRu1zjVz+iNtxjcYQ=@lists.xenproject.org X-Gm-Message-State: AOJu0Yy7gTXOUGg/gMQEKMYM0i7dhDe3oEtcnosgP9i8lUPSrHtfPH8Y CbXJ+sNEob6tRtEaeyvEsw9/c+2q1xlw1JUXJUh7eb+tbC94g/NkUoYubnwyITE= X-Gm-Gg: ASbGncuFBdP3SVF68FVAIaj/hfE04lOCG54ucbXLSmxOUyrefYAAQeSkVXDUuLbGGmw saI2vePViW7VuRD6YEfTgvVJPCl0qYp433PUPgW0KvDi9BGV6zdeLBHIqCankq5QLjJh3ZOd8t3 b7X6wJn0311z4NHAzARp1TSwcayPILX2ikvFy4LLR75KRu+zzhwdGVDcKL/IjPxSQ2xYYsqMIL8 seSLeUwwGHUGkGJarUQTfNX9bRu7VzmhL/muCQX+5mpBKX6tD+Q6U/Y6R7Vm6xLZLJRi0VPj+Sj +oJNoTmurF14xgCaZ4gF8Fd5wyRqaiXmS/39Lg+p2Rya X-Google-Smtp-Source: AGHT+IGev37PyaCRPVTSAXm6sa8QmcuQfkCR4AEqF/Tkfr+Zh7Bhff2KfoPULWlCloRr8rbLF7MLgw== X-Received: by 2002:a17:90b:3850:b0:2ff:7b15:813b with SMTP id 98e67ed59e1d1-3014e855f52mr302864a91.17.1741883952691; Thu, 13 Mar 2025 09:39:12 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 01/17] exec/tswap: target code can use TARGET_BIG_ENDIAN instead of target_words_bigendian() Date: Thu, 13 Mar 2025 09:38:47 -0700 Message-Id: <20250313163903.1738581-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 Thu Mar 13 16:38: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: 14015419 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 824DBC282DE for ; Thu, 13 Mar 2025 16:39:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912882.1319062 (Exim 4.92) (envelope-from ) id 1tslaX-0000lD-1Y; Thu, 13 Mar 2025 16:39:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912882.1319062; Thu, 13 Mar 2025 16:39:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaW-0000kz-Uq; Thu, 13 Mar 2025 16:39:16 +0000 Received: by outflank-mailman (input) for mailman id 912882; Thu, 13 Mar 2025 16:39:15 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaV-0000Wy-Ru for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:15 +0000 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [2607:f8b0:4864:20::102c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b2ef7577-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:15 +0100 (CET) Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-2fee05829edso2501371a91.3 for ; Thu, 13 Mar 2025 09:39:15 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:13 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b2ef7577-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883954; x=1742488754; darn=lists.xenproject.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=q+TIxJJPFQpJ80hjqKuu01SX5jj4bMVSKl8AIGqJR+uufkpGZJfomwHzeh9rhl0zfh x+KBPurnJpt7AwbCU8L5k995dU69/OOFSwN+ce/4XtCSoSorot6dyNf+h1rYQklO+QhE neLfOPXNsKiTxnvl/Mp0ncrz/97hrZZfyAGenE5tuUfcGfRU2SzcIQOlyX8+Cjdjp/Yr 24h6BiSF+oajyj0BC8VnZrXcFL6mYaZjya23TC2VauBXalfjgOAGmpgAFLcpLNKrrPrk 3XPcdpyBBAAT/RLUMtdax3JJBU+ut32gCDrnBRehxpgLKxFJv5OdDSmrgunb/EqK6QSo TuZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883954; x=1742488754; 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=H7P/tzqZMmfctHCKNJN2bFTNzmk7GBMHj8ixYL0x/F7QSxnAmKJpyJwXluVXRqV0HQ tjMCZvYk1tmz7DrzKEvjzpIZ2sp63f03xzINEEC/IsNDabJNN6pup5F2ILTQYz3X/GSC KiLJNbodwvxeuG+4LdVMiWahccTOmHoJtFqvtWQeOjCGEzMFlv4dcadlyKsQvNI4qI71 GOvxSLBQsoSIwDtusLjuKfOTs2/qWw1Hf9Xs2v10yc83dCIYAFx2aFsOHCpeAN9Yf2O/ Cg6UVcBtYBAkUzVPYVhJ24j99uawJPKhwIHQMw6Sj5ONp+jBcaelGQnYHn9N5LQrwuh8 MTzA== X-Forwarded-Encrypted: i=1; AJvYcCW6KwUQmK1RsN2KCV/K6P8oVkQOhJEKuyH9yiKw425NFbupoa8sEhUKaKjZMPmF9npbvuXC08m9ZkE=@lists.xenproject.org X-Gm-Message-State: AOJu0YyiD8mSIFHeSkJHHmYqwFTDIdrzqfs0y3NPlQf3G8+L5eA2GU4b cmNenAMVuMMhOxD8DVCTxeGD2KIqRGDmhi2D3TmDKARNkjEuv+7B863p0cU4sv8= X-Gm-Gg: ASbGnctrieV/8PnQ7Ha9zNj7qm9yB5gMT7FQ74c0JLNQObvt08qWysrDuyVHb9maINF 1dwjiJY47AjtShujsJR/+/UxnviHG69cf0PVuwe0vAQ3bSG9D1bgEdej6BViho3bJp/yYWdh2rS 4qLqIp1xSYccGJJta0WUeIV2IDJpeK/n7a4DQC9KN14St7Io6eiBrB0+eUPE+TnnEjIpq3fpuSV Fi6U1uhM4qZ8bfU9Uej4i/0cxt3rxqRe+NFbyr1Zf1adbI1lV0I3HU/Lm6h1w/J/WXLLwRv1cXI cK45bld2swSZhDm6jSp7+etTCC01eKa4ByCOxIVuyqnp X-Google-Smtp-Source: AGHT+IGAE0wRrFnOgUSptf/ZCGVy3gy2ROtBxgIz+VJH5KWtqtjx8oj2KP2h7DP6p39QjbuO2M6/IQ== X-Received: by 2002:a17:90b:264c:b0:2fe:6942:3710 with SMTP id 98e67ed59e1d1-3014e821305mr250112a91.3.1741883953849; Thu, 13 Mar 2025 09:39:13 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 02/17] exec/tswap: implement {ld,st}.*_p as functions instead of macros Date: Thu, 13 Mar 2025 09:38:48 -0700 Message-Id: <20250313163903.1738581-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 Thu Mar 13 16:38: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: 14015425 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 DB721C35FF8 for ; Thu, 13 Mar 2025 16:39:28 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912883.1319073 (Exim 4.92) (envelope-from ) id 1tslaY-000101-BE; Thu, 13 Mar 2025 16:39:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912883.1319073; Thu, 13 Mar 2025 16:39:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaY-0000zm-7K; Thu, 13 Mar 2025 16:39:18 +0000 Received: by outflank-mailman (input) for mailman id 912883; Thu, 13 Mar 2025 16:39:16 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaW-0000Wy-Tx for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:16 +0000 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [2607:f8b0:4864:20::1034]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b3930728-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:16 +0100 (CET) Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-2fe9759e5c1so2145238a91.0 for ; Thu, 13 Mar 2025 09:39:16 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:14 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b3930728-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883955; x=1742488755; darn=lists.xenproject.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=xkQjl35VPy+F23VkPda0ZPTwoNxj3meH5FNAFxRt48hqtUJZQVHP05dF5k9GeIwYo5 n5HGhYyqdbdcsXlw35tq2fpC2+slatJZoC0pd9q2POwgtFKYlERmC2y3nV8XdzIR4Mn9 h8uLVi8JOb4L8JpOr0QjATh1YuDzlsBjKRFkcw6rVlaQ60GQn24w3hroD9m/Zh1/kVkV BJn8k7CnQcIOrbX2PI2T1UVFi2IEI6BufkYVQWqv9FlX59BjPsFfQJb/npG4rwZFwNz6 a/FBAjSNBEriHtl9Wvd+7mSF4R7aHPQIkGl3UQCqtBwFhFgu6DMzw9SzrkWtVBXRLDBN UgAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883955; x=1742488755; 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=g3qHqucFIyciBW5E5s/1uitMk4OZQd3TTuih0zXU2qGF9JDIePmz7VMIOZKBwd50Hy F1DiKCi3ZcS2SdLVT1+QM8tuG6KZYBaAD7+caU3cX9Xdmi97vlgbooMd84kauGMmOCy+ yGBWbDx1dJX+EvQrMXKMETIkJoWIAzRPO7iX27qjHg3oRh+Z8ZPjFOvlqiK0dXBKe14E xzsDo4YpOvd1il5p+UmT/NrCQrFba+vDzmRFmQH6dcOcquiyUihqnQjc8siEQh25LcnU vYzcWIBeEQGXeWOaZXOkeOI3TMNGrzhhbkxgFaaSW3XWpnkDNr6tdcZgMPkbs/4ICE3w w8Iw== X-Forwarded-Encrypted: i=1; AJvYcCXqj7bE1y7lMnzwsbqkn7zzJRqZGV0ukK3J+Qr3mKhWQh6PKBPmoo8eznKlx3cqSCT7vzbn77+H37M=@lists.xenproject.org X-Gm-Message-State: AOJu0YyRy+EmloFsfrGK/ZOSGWgBlms5FSEueBAti93PRPCwELeQ2OJ0 iLu24Fk4bb7qRDJEvZkpTda5CWJKC1BWeITooLukWH73BQCvJAjE2DCG1sAp8h4= X-Gm-Gg: ASbGnctEK7N4RK/+KB6APzKZzFZO36l5znIdXh9WFSlzbvgovzzxyKvd/i83nq4CNVy DQcdo5gsaT6E8Q004HVD9rl7bRJ8c0Mgu546fnFhZ+3ctjKziB8yv/bEfTOZrV3AxP/XStfHAKi 1+/6SrfC+Dv3V19mGUrrecTwEln/DGO3BH0w3mUfw+HJb+5sSuA801/iNNFXRJ0Ly7V+lY3R8f3 zvcIFOijjvVL0TDUN1GwW87AQe3ZQoipNEBYghXDM3b6x+WmjpiTcmPDtKT/RN5k0rmEaN5K2Yj NYE0QtIqZdSVDakwhg0OGaIPYS7SUTLXJblEN8Ejl7CD X-Google-Smtp-Source: AGHT+IHnwSLAPNKXU3gMx+5tsTTteDKv4SHyK4UxOMNd4PXKbxpy7VaCfSFX9w53V0ZmsOD5PjeQ6g== X-Received: by 2002:a17:90b:2f4c:b0:2f9:bcd8:da33 with SMTP id 98e67ed59e1d1-300ff10d6d1mr14553930a91.21.1741883954948; Thu, 13 Mar 2025 09:39:14 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 03/17] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Thu, 13 Mar 2025 09:38:49 -0700 Message-Id: <20250313163903.1738581-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 Thu Mar 13 16:38: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: 14015423 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 DB633C35FF7 for ; Thu, 13 Mar 2025 16:39:28 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912886.1319096 (Exim 4.92) (envelope-from ) id 1tslaa-0001Rd-Mc; Thu, 13 Mar 2025 16:39:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912886.1319096; Thu, 13 Mar 2025 16:39:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaa-0001Pf-9g; Thu, 13 Mar 2025 16:39:20 +0000 Received: by outflank-mailman (input) for mailman id 912886; Thu, 13 Mar 2025 16:39:19 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaZ-0000Wn-9p for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:19 +0000 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [2607:f8b0:4864:20::62f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b30244ab-0029-11f0-9898-31a8f345e629; Thu, 13 Mar 2025 17:39:15 +0100 (CET) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-225b5448519so23154885ad.0 for ; Thu, 13 Mar 2025 09:39:17 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:15 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b30244ab-0029-11f0-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883956; x=1742488756; darn=lists.xenproject.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=nlDlFNaXPwUQ9bca5ZtTmmM2Mr+TvmcY5rjkpAoAddd/HwM8TEAcpSKHFcC49mC3Wq msks4lSIcPxqkZdRmacAI8ABSlbP7UfM0cGv80sAsNuhaiS7i3McgFBXPbn8LnSydUg9 Sl1rsN7gviAbh2ol2QN2lJbHOsnir8Ox3o6flbjauV5g4GDeRdNWwpBVkm1qBizZU+PH F1FGlCuEdY/KNp8v5dSQzDz5bpZdZeHH1d6mj+tqKPN+uRU/3PSVomIyeVQaRJHICjEw Q3SGIMaji0wnVwDNpUJ2HtDD3KdL7PzBggtHEhmMboE1ObAY7tMrCzM6X5zXc1tIYZUM CWUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883956; x=1742488756; 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=lwK1DLY8Ezrfm8gklX8RtQuHWOva43MBwIzNwnEHeExt1GLCTAXDR8BMbuBejvN8Jl 6/ZVIUoSw676MMqmYsLFVFtPmMUWFdCiRT4z0cp/NytrwvXHmcqwXTRRWd1svv3yyYON 48vgMEYi+slWtHHyc2i2C48RjcikesshZHZ60cRbwlyh/TzcMqLjRV/alL9H2k/l9aQM LongZAs6xP105Lh5J20tcU20xz1r3cM/DTYO7qRiLGDI+UN/gZ6grtJlRAZObyAshIdE /HatGNmLSPeaNRw6nLmgPu+vwKH3H+skXz98xx2qrecVe47ccpsVMJM5yVm00s8rAQSY 0SuA== X-Forwarded-Encrypted: i=1; AJvYcCVZR2CTAkSvRa+hjAmrghpjX4VC1NnXiaRtMmtHACKjTuQzpCG40qiFHVqsMf3JK44TQ3HOasZzA8s=@lists.xenproject.org X-Gm-Message-State: AOJu0YyxQOV5d1CBoSrUI5TTT/g5//QkotwIc6e51S/JSZTzYlVp1NAP O4MKH37QEXkI7cU4tA+T0z0BcPG077g6AbczzLSUatxRfg1q5F8N2hsOktKgdSc= X-Gm-Gg: ASbGncujfYIju3Z+FBQXFYvvdSAU5Yr1lpAQWipS26LJ4BWGrlr0p9PUfIu6wI0sAeX ItEM/tjNT4T0W8Lci4JAGzwoFLgCmc1TO2DzI3Zw6F9XmW06nrLkP8mjjgzcKgtSBPKpE6piuWW E8QBxRo8IJtnN9jmMFlcVg43Y1PLHU0ZkZ8jtNp3B3G2BppNMHJ+UYZTWI06DGutUf/+HdGfAnU x0+td1Zisltr3fXf6ReBAOKLnjdOYv+sTM6W7xJA6qzPPwGD6awMfySjKMXu1pD/bT2pvX1q6FV lEVUE6UW8bOHpKGcykx3zwO/YPEEkWYjE9nqra+SZrS1 X-Google-Smtp-Source: AGHT+IFAP0qoR6ylfmeu0A0f1WgQyrtvhvjwp1bL3Fn8cTt6DHZC87LNZvbpID5iZRw0pqfiPur+Vg== X-Received: by 2002:a17:90b:5688:b0:2ee:e113:815d with SMTP id 98e67ed59e1d1-3014e842f8emr264471a91.8.1741883956066; Thu, 13 Mar 2025 09:39:16 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 04/17] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Thu, 13 Mar 2025 09:38:50 -0700 Message-Id: <20250313163903.1738581-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 Thu Mar 13 16:38: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: 14015421 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 F0A72C282EC for ; Thu, 13 Mar 2025 16:39:27 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912885.1319087 (Exim 4.92) (envelope-from ) id 1tslaa-0001MN-2M; Thu, 13 Mar 2025 16:39:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912885.1319087; Thu, 13 Mar 2025 16:39:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaZ-0001Li-VF; Thu, 13 Mar 2025 16:39:19 +0000 Received: by outflank-mailman (input) for mailman id 912885; Thu, 13 Mar 2025 16:39:19 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaZ-0000Wy-8h for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:19 +0000 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [2607:f8b0:4864:20::1036]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b4f573a2-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:18 +0100 (CET) Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-2ff799d99dcso2532000a91.1 for ; Thu, 13 Mar 2025 09:39:18 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:16 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b4f573a2-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883957; x=1742488757; darn=lists.xenproject.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=cI0QjfoHLLNNzGPcxeGESaVdGZrSaLwwu/74qBl6ZQ/AQhcFSoUBqdiDbTiojDy2wl XQaILVtHLtALVTihX4kzUXaBFWGwcFwEo3K5hpONDd1sC2U70xQWKC3LmFxAeV3FUE7h rpn14LnHoEdXS6nap8Aavb6+6d/fE6r7UJH5RwUwEn3P0CLINcGRV8Zp3dj8egd0vo0D duzy913qZPeWprSCYZSUQfkmkDcNJsEFRJHkMSw9VGI/SVRVBMsQKPLen2Km2hv7NlGg EJ14YiPFpJCupgU8RWGYZCpg4QGMla4XPNaFAUqnQbMmzW0sA24nkIgqttKwjVYayOzh /rZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883957; x=1742488757; 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=VqPu4b3nAPQ27TtVKzeS9rR7hf/HzlFntVMmWDfZ4HwbXSp5mBQTEZxiWdSst/PUCB M7OVKyhUqMOj2hGAVf+25q37OCUmzoQ7Fixp8APE53z8B0gxVu93BAYqmPEk4ExF9xws vgR4o/yW5tz09Otn92QfU/aKSs3kGo5o6tV44LP4Z5WAmISBVm157x4ffsKzknQW+rei ICQm7sapxijoy7wxDlmOk06lcrnoiDeNL5RzKTn0p7QuqNvJAVylbq/6yUzFmhul4FnF 4Q//4rgENx5/vJ6+2xPyd/uGMYbL37n5yg5Y+iOwAxu9IzsJ43Dh6BSd6PY2cPziHxt7 B+DA== X-Forwarded-Encrypted: i=1; AJvYcCW33ugIQcJvPtZTKCk2lrDpZ6WYEdjc1Sx6qvPGUK54ZN5ae9RLPSRY1bIppDMNCaAUGk+SckCWwaM=@lists.xenproject.org X-Gm-Message-State: AOJu0YxLF/+8SdGtj8+tqTSvuYe5x/fVKEZhLvPMv7cxhDJgN3U4c5nv RItd+D15KXSSBzyLeFmxcDwxi4JJLdQbB6+58jlEVWnSyBdG/auzAxrTu67gpZI= X-Gm-Gg: ASbGncv2J94Gl45mznovyUA/rP4G7SylsQLPUKm7u6WFny3VTBwh69/D6hZk9643p3+ gHfO8CV0wzo2/Oozw1NmEQvb7VP3VR6NjYtNxBwjtcSJnza3vUpX5ssetuOndx1UVZGb09/6EeG qFAWLYm4ddSRhESEZVuQK2bFjziHrOKZE4q/DsGeWH7G5RaHTz61PMfdw9ohVHM6CGWCLybyDkC F/aZ9gzB58JV/3d/hY5qqvaBfG49Uxx0sii5oefqxE421ESRRaTIA085MT0fpsOm9uZ1clZSzhQ D1njUQ5bi/BXh/udpLE+HM7Cy95ad5m0WjQRvio19imC X-Google-Smtp-Source: AGHT+IGT0TQa6IzxQKmV0c+iT9Ap/Go2mov47rFQ/lft0hbXJmOXflaiO0g7vmiNGPWVgJAiRn5xgQ== X-Received: by 2002:a17:90b:2710:b0:2ff:6fc3:79c3 with SMTP id 98e67ed59e1d1-3014e8435admr275040a91.9.1741883957269; Thu, 13 Mar 2025 09:39:17 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 05/17] exec/memory.h: make devend_memop "target defines" agnostic Date: Thu, 13 Mar 2025 09:38:51 -0700 Message-Id: <20250313163903.1738581-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 Thu Mar 13 16:38: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: 14015428 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 17361C282DE for ; Thu, 13 Mar 2025 16:39:34 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912887.1319113 (Exim 4.92) (envelope-from ) id 1tslac-00023J-QQ; Thu, 13 Mar 2025 16:39:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912887.1319113; Thu, 13 Mar 2025 16:39:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslac-000232-Kr; Thu, 13 Mar 2025 16:39:22 +0000 Received: by outflank-mailman (input) for mailman id 912887; Thu, 13 Mar 2025 16:39:20 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaa-0000Wy-Gt for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:20 +0000 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [2607:f8b0:4864:20::1032]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b5b2c604-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:19 +0100 (CET) Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-2ff799d99dcso2532041a91.1 for ; Thu, 13 Mar 2025 09:39:19 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:18 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b5b2c604-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883958; x=1742488758; darn=lists.xenproject.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=mZcjdDtX1Z7JVvsuWgguTldfqVr7ZBWkV3i9i17ooa8=; b=QVmlzocMSuBV+lgRH+JPWIMOSeSQ8SZybQDvXi7tWV3JBlUzIoDckDWeTLw3W+PQhR WPQ3ytRgODRKgF8+OHseyQeYLlBO76spmDZkc+T/1Xu0wIG8gnwCPItVJPDoL0UzEe2n MdG6R+NN/iY6ECypGbK5p1RJ1/1SRWUDGLHLYEIBBqtg43Djy6AP2MVsCiP5/H30Q4xr IzeOP/PdTQkCWpN6aTpf3S/jKt4DB7t2hFz9xDXFKwo5tTtxjFHR82MxoUTj1pgKHBod YKdcE79BmVy82JthIqeZlwtztgzniR5HofNqJyS/7GUjn5vItgBOZuJFsZ0rE9ULjxzW giOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883958; x=1742488758; 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=mZcjdDtX1Z7JVvsuWgguTldfqVr7ZBWkV3i9i17ooa8=; b=sxXWRmVsBizsW0vJb2Ej2FHdMn5jKNvkutqWKNaqXCPBDikrsBVNk/HQT/xFK4oEq/ hDQZ8ck4N89qXVmQJ+xn/RJUPtYmynu/+CvFOwqVPYxYabJfN28TafMiFsDcTb4Dxovj 7EVqgELkl1GK+Sk4zzsb25rVdM3tbS1yJBjv2jsoYHBPtdIaiHQkD1HZWIVeAmSQgsDl Ry3dQGy1QswAVeVH9xVfh3sHKeWWY3XJuSB3iltIrWEhGM2oa64UmEPA3PUF0gbENUzD opU51y7rUkdWvR282sRNoN9K17jv8F1frQIvDePm5lzVmISeBlONqfn0Q2f2Gsl/VUJZ HxcA== X-Forwarded-Encrypted: i=1; AJvYcCXOo/BJosfafDS4WAQ0V3nAaffrVynfd51zjZi/K7K1DfqDSGJ01ChSStqbgKAjkBNhVewSEw4zvMY=@lists.xenproject.org X-Gm-Message-State: AOJu0YxJXJGeN96161O6Ov8/YH+P9fPY1j5yy0XxcE8RVM8aCLOhIMCC BTKaOO3638GqiKCmeLXO9hr0YxtWrZYSl3LiJ0p4GSgn//QVMWn1HdKvxwKH31U= X-Gm-Gg: ASbGncujo6Fg2annUORhnjIAPJJCEKdxJ3rD/mzf0ENbXbJ/65cVlot/bUyi4TzVxOc FdqqZ9jcGrpHhzMNOKcjy/f4SypAaAFA06cGJUr0feGrZQH1xge0cxIDd4IYF/CHVMjfABOGxPb AKTBAX8IB6JxFMiP5/MOB80dUmZ4uv/WcVY4Ya+10VXuHzbfZbQTH8CHj6gXoqKyqtMD5l1rZYW ixTkTmGGmWiVpWSjr6Bafc89uKPVfHATsCpGDmaq/AhEtw5+K6jJc7XNbDBildhejK95AvRBeFr UG/BWYwZGj0JLjYsLqcvT/j6Bd2SA0QmmUFdbw8hiuvh X-Google-Smtp-Source: AGHT+IG4zIqLxuyjovKp9g3TAXrCpctV1RL6f3536TGUBfN83HoHfbIXNZa1EoQ+qlG58AlBh7g+Ww== X-Received: by 2002:a17:90b:5403:b0:2ee:fa0c:cebc with SMTP id 98e67ed59e1d1-3014e861c18mr244498a91.20.1741883958391; Thu, 13 Mar 2025 09:39:18 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 06/17] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Thu, 13 Mar 2025 09:38:52 -0700 Message-Id: <20250313163903.1738581-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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/ppc/tcg-excp_helper.c | 1 + target/riscv/bitmanip_helper.c | 2 +- 7 files changed, 8 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 201f6292033..a79e398c132 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/ppc/tcg-excp_helper.c b/target/ppc/tcg-excp_helper.c index 5a189dc3d70..c422648cfdd 100644 --- a/target/ppc/tcg-excp_helper.c +++ b/target/ppc/tcg-excp_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "qemu/log.h" +#include "target/ppc/cpu.h" #include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" 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 Thu Mar 13 16:38: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: 14015424 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 77A41C282DE for ; Thu, 13 Mar 2025 16:39:31 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912888.1319117 (Exim 4.92) (envelope-from ) id 1tslad-00026E-70; Thu, 13 Mar 2025 16:39:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912888.1319117; Thu, 13 Mar 2025 16:39:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslac-00025D-Ub; Thu, 13 Mar 2025 16:39:22 +0000 Received: by outflank-mailman (input) for mailman id 912888; Thu, 13 Mar 2025 16:39:21 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslab-0000Wy-Ea for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:21 +0000 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [2607:f8b0:4864:20::102b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b6490efc-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:20 +0100 (CET) Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-2ff799d99dcso2532068a91.1 for ; Thu, 13 Mar 2025 09:39:20 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:19 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b6490efc-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883959; x=1742488759; darn=lists.xenproject.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=BUUsKinLUwoSVTx3bfllBKHlTJSJ61D1mbEG12f/1XiGSLzVKSZ7oxQ3ujTDgFImC+ JmKd1Alg3RAXOm7i6IIjgUt7/GvKrsGeNLykFM7PXadFHvwDwLZKAhh+kRNfb2iGQ/NQ GDZQlfB4Ji0jJOPVOGNbvhV08HQeTr0JC4C91Dz5QK86ZNBq7nwoMXURlhmq0eBmqlUC JYkfx5zgQHMcOVWV8IWsSfa+7QP2TGE1h7RzDpkadpQX9Lp+Y+yhgf+QOIFWrE5Vn0vs petbhwURZw44Wd5JTpzkXdRY5vMXs3PaaniuxT++GujO+q42dzKZTUh/pyAVOZhneA4L gFGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883959; x=1742488759; 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=jIVMJQBDBpV228jGkb9ronTgSPp9se5xPeeBlzvZBd88+Vzqa0pINI43pn2LoPP+DW 77uP0gob1P5tfVBhzHRQe6Y3Bh8m7IqQiuH9g4acHH++Azk9oS9qxEnRt+te4u/lnSI+ YKCBqlK0UtJdvnuW7a1hLfVAI3iz1ekgnusBS0zNWIiA3V/KNkjb5jJSdr7zy6Cuatgq sFUa+qNCos9mRiHSHas5CCHNsDKZHZ65fESE01lq41X1s5YSPFOU4KP14COZ6wClVmA9 2BWhNVCT2ePyMrQTb2anxob5tppWCxLQTFKZBl5biJH39xhAwK9bzIY2eG3GOvU8mgIv U52w== X-Forwarded-Encrypted: i=1; AJvYcCV5EaPrM9LaT0lXtlYeGRKFo2iuT/9k0eK0X1vHM5ULz0FtZ28hFmyjgIYQ/RP7oytIYPvDhKsMGiQ=@lists.xenproject.org X-Gm-Message-State: AOJu0YxNc8xXKUAOCDleZv0m8Uhn+kOjFCwOpTLlq6MzvFUGhRBG7Tve ZtwPZoeZ0N3bOuyEcCkct85OtOWozUK/Z2/N6EQlNzUlwbaZ7FoU8LjLHNITrdc= X-Gm-Gg: ASbGnctUJ/C6RLV2B3Y9Uv9osMNtenNVeLjYLC/8Ol3OR0EdXSr1K6UDJ+NWL78p83q WBYX/v4cegMO8MJOCWx7K6vmJT9+d6C4kn8fsG1FB1/lhOVZuafMRhABIzgJVUbIDmO+gtCNiGP oq7NKC6iCTLhqnXJEoTbN5rSjXaghj4Qe7jDomE7x2Ehm7/0Ht+tK9ugRKHZsUweJyy3HiXo/GK MvYri9L1pC2skPu+pL51Z//RIpvicUf4HO1KN9h8CLsb6oWPSkeKYrSGIkORTvAth+gvIhOItz6 MxsDeL1r559sBxRU53ag1TjVTmaC17nX5HU6qyjXxRdP X-Google-Smtp-Source: AGHT+IGIP+en0Aj0eYAe+7XhNeZ6W7zp31secPtMQkoPMAwiLZjQzktFWA/FDeyZICzvqUiJA1imgg== X-Received: by 2002:a17:90b:54c4:b0:2ff:52b8:2767 with SMTP id 98e67ed59e1d1-3014e8619f7mr247106a91.19.1741883959525; Thu, 13 Mar 2025 09:39:19 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 07/17] exec/exec-all: remove dependency on cpu.h Date: Thu, 13 Mar 2025 09:38:53 -0700 Message-Id: <20250313163903.1738581-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 Thu Mar 13 16:38: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: 14015427 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 9FB1CC282EC for ; Thu, 13 Mar 2025 16:39:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912892.1319138 (Exim 4.92) (envelope-from ) id 1tslag-0002ke-Ac; Thu, 13 Mar 2025 16:39:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912892.1319138; Thu, 13 Mar 2025 16:39:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslag-0002js-0A; Thu, 13 Mar 2025 16:39:26 +0000 Received: by outflank-mailman (input) for mailman id 912892; Thu, 13 Mar 2025 16:39:24 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslad-0000Wn-Sa for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:23 +0000 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [2607:f8b0:4864:20::102f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b5aa50bf-0029-11f0-9898-31a8f345e629; Thu, 13 Mar 2025 17:39:19 +0100 (CET) Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2ff6e91cff5so2131036a91.2 for ; Thu, 13 Mar 2025 09:39:22 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:20 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b5aa50bf-0029-11f0-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883960; x=1742488760; darn=lists.xenproject.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=r6NND27xqIFbfp7To8/POFOfzYrQJWK4uL3WcSoLBl20ZlIbD6D1JVLX0AJHOxLUl4 sMV0fHPj0/Chpyb+ibqePu4GVH8NLbkGMv5Dfnp7lnRhPUxx9rwUeOC4W7fVa6L7CCbT kFFKJHfwH5lkAo8eTUILBobOXeIcwPThrQkCfRtotNl4Mx5eiGr9+CqcNTgm0RXPd2VZ t3BrfTmq4D3lHNXJXujUo6Gne62oNLaOOwXAl/a9Fqep5hdHQsFaYTP5wFFxTZwpkkY4 O6cKO62JZvw3tvYSMrKDkl7SMJdyv+UlKTPkl3COBW9qEIrz0I1/xC62/R3Hmkl9kscj arkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883960; x=1742488760; 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/JfVJ+SF+lq5GNe67AV45BtJG/WIGuSgzFscp/Vbc0mR1E2eRnyA7vSuHkSWkxiHG y9uYd5HluVKTDf6hSesBkwM5n/wZ5oww4wS33SnYvi/JBopiT7wD3GUnILFoSpYtTnVi X3W3s3znrMPWGxHFcKS4obT8YqWSWwQe/faEsvjfqJJFEinp7qbnzH7jDZ6aeudplrGg VJCPPkTFkF/CLMeYEq+uuu2mu8oWXLe8F/gMFbtcT4cewe/hUiPJsxy6nDs+PF9DvFgF xM++QvX3MiVbtA9ktAvg6Y+eSrQz0Y1j6bfK2JKXEbMQmYidECoZDKJSDegfsOZCwzeq RGdw== X-Forwarded-Encrypted: i=1; AJvYcCUg87a4CgCdWSroYFQXW4pmDbVpsWJirNIY4Lvz+iH8Rb2noeL/a0EpT1CSLopM5FyrbLmpEqD4QJA=@lists.xenproject.org X-Gm-Message-State: AOJu0Yxbi6HPiWeNsiFh3rFBYw9d86qQYE6pnTI00ptJMOweekO/Er19 J2dUcVUdolRrnRYWsWG29tBkq6vuQBNc4Y16ZzmvEeIYuSHT+LVvKZth+frXiEo= X-Gm-Gg: ASbGncug8Xhi2JrSU3e86Ob42YcwWzodqr/nhi8yyFNT7I0oWCjbV64hVqiJzUg12Dw SpI7ayhyXEsGSU+8GgOaR/9cDGrOLGT80qIMXsKRzY/tfa01bRtruD2f/KndHFK3M35Z7GiRB9W /3ZnVr0fLYyT2VP9fZh0x8UlMyUy7lbC4JO4KprkrbQfyR7DmX2mDN3aWApVD1TzS0pfgOR8w90 FIcQiYpR1r0X3N3l5XXrz2693S0bMh5fOMaJ01JjsI/Xw9SCSkMnYfqr6aHFCHeyZeZnp/mPYlf 0V8owK4F/xuK2iywNPnVkcbho2rvcEQU9481+YRBSmwE X-Google-Smtp-Source: AGHT+IGZzjulkQU+BByDQKOIMhSKMvzNQK3Jb1Ldmjqqry9imNMjEt/+F7i1NK8ViRkyqUoEaWDauw== X-Received: by 2002:a17:90b:4f41:b0:2ee:c2b5:97a0 with SMTP id 98e67ed59e1d1-3014ea23938mr221254a91.25.1741883960596; Thu, 13 Mar 2025 09:39:20 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 08/17] exec/memory-internal: remove dependency on cpu.h Date: Thu, 13 Mar 2025 09:38:54 -0700 Message-Id: <20250313163903.1738581-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 Thu Mar 13 16:38: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: 14015426 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 D708EC35FF3 for ; Thu, 13 Mar 2025 16:39:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912891.1319133 (Exim 4.92) (envelope-from ) id 1tslaf-0002h4-Nz; Thu, 13 Mar 2025 16:39:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912891.1319133; Thu, 13 Mar 2025 16:39:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaf-0002ga-Ii; Thu, 13 Mar 2025 16:39:25 +0000 Received: by outflank-mailman (input) for mailman id 912891; Thu, 13 Mar 2025 16:39:23 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslad-0000Wy-Mr for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:23 +0000 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [2607:f8b0:4864:20::633]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b79c68c3-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:23 +0100 (CET) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-22403cbb47fso24466805ad.0 for ; Thu, 13 Mar 2025 09:39:23 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:21 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b79c68c3-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883962; x=1742488762; darn=lists.xenproject.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=PfpTTedni4gUGfvRcfnvXw4xTvY7JO0pNjOjXTZ7pI8=; b=N7Vz3wtDBFf9og8nbz4E72dEd+3aKdWpFWBJmjmv4GguFCoskQEMwRMmLCKYhxLElS i5dCW6zqePq4ASa+TDmIcL1oDENfVC1z+lgQoMvFqWg06JArUYMnYtNPuBYQikrxAdab 3b9W4fbdO11fGEZNUKduNFRgJaFOhM7mjIX/M6BSLuZrmgZRleBBOIKHjnK0S9WVkvBO vL6+vD3qClx7iUkaIkNfznGgGCdBTJSvpbXd0vr0bEoXY0vwBEGTgF1kD+gVfxHIbXLH MTdzPyfBg2PpD9yWgrkFTbH//SYuuNwnxP/J6luYHCFPpgSvqoHClI0daFjDiugR2s0I 6UCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883962; x=1742488762; 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=PfpTTedni4gUGfvRcfnvXw4xTvY7JO0pNjOjXTZ7pI8=; b=JhWYRv/ZGPlZF/X4uIuPoquLEwHrex9bqScaG1CoSS8CWfIaCDWC0tx6e/46vDBETI HWH0bkaJbU30+Ug2X424/oRQy3v3aC6/A9AEizTywdn7EKAD5naNbj6XB5SediqbMO+a 04yeu1odbhhZ89zrYAjQhNhwz2kUGI35sYQbCYzFxZhu2g9eaoUiTJsBwrn16855rLiT BtBVm5F+1xbfrSVn0DRhPGxFwUH6tjjEixljdBtMp4X3iTzCQFrtaoPpxClBdOGTG+sV Qn+HOCjQDWMiGiseIqKRvdoKUKFciH1SDewiwNXEXSGGKcw+LNFrsXf/wQ0PC1srnz/Y f8BA== X-Forwarded-Encrypted: i=1; AJvYcCUaYGRodJvsgJ0By74bp/0UwviGX07ay77Af8qWmxja59QDhV5pOSWByDhRLnjCvanrquM3ILU5UY0=@lists.xenproject.org X-Gm-Message-State: AOJu0YwFFGnsZCFvmMlrIAchdCOw2wZW56qP5z4tS9l2oQRpckGlDUcU U7o6daCQ6qZaEfg9d5fbHzHjlBUK3KVKIrIuwbkp0tUtIbj2wHBWPg/WZWVH4KY= X-Gm-Gg: ASbGnct9bM7mmpr0Gfs1pzyLno5LSxKNKaE1voaVRwjrqX3VJ8NUZ/w9DNykDzgMXDD jDzUbrOgkZBUjn5XTv5c0rNA71Ke2Or0pvWlaT0dXY+IPcqjDKpOShXyr+DdDD0GoXus0Y1lvN9 M7ViKCaRqpSRSen7uIMePVb0TLJzNzsAqimZTdl9Ggy8WOeep/quHOc28GJzJOy92vWiDSJ/k+J rPeb/G2VuERpjMZqj3buRyuka8SACXQEiCcxvzGL5Pxv1muf18PtF6xKYJTiydo/UY0DarWyH41 VwEy74t61mjly50kTUsgxJDVYCInyLmsHNPQP83clxVh X-Google-Smtp-Source: AGHT+IGoee0FqI1pRrQ30nb92L6Ez6iWr624Iw9VfJKN6XKShQ8vco+xd3ltWnO1olhH1gK/7mxIvg== X-Received: by 2002:a17:90b:3ccf:b0:2fe:a545:4c84 with SMTP id 98e67ed59e1d1-3014e8bff05mr210801a91.34.1741883961740; Thu, 13 Mar 2025 09:39:21 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 09/17] exec/ram_addr: remove dependency on cpu.h Date: Thu, 13 Mar 2025 09:38:55 -0700 Message-Id: <20250313163903.1738581-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 e4c28fbec9b..f5d574261a3 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 Thu Mar 13 16:38: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: 14015431 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 CEFB7C282DE for ; Thu, 13 Mar 2025 16:41:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912968.1319173 (Exim 4.92) (envelope-from ) id 1tslc9-0008Jr-5R; Thu, 13 Mar 2025 16:40:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912968.1319173; Thu, 13 Mar 2025 16:40:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslc9-0008Jk-1x; Thu, 13 Mar 2025 16:40:57 +0000 Received: by outflank-mailman (input) for mailman id 912968; Thu, 13 Mar 2025 16:40:55 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaf-0000Wy-NO for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:25 +0000 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [2607:f8b0:4864:20::634]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b854ee65-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:24 +0100 (CET) Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-2254e0b4b79so33218475ad.2 for ; Thu, 13 Mar 2025 09:39:24 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:22 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b854ee65-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883963; x=1742488763; darn=lists.xenproject.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=Pm7oW0p9MOxprCME69CgtVTfDnw4FA8rQ/HTzhFn3XMxplPt/BDl6nVjtA1jrNzu5p 1+5BXXgm9lAnSx16vtPJAGcCllfZTd+jU/Et/fYeG+r4/MA9f4Nx43e79Vu6hDhKEi74 Rvc4DKUSaNIos86Zi6JlKOfbGjtC/SZqQz8zRK4LMbCTSoffqfwQx9bBHjq8oaFiD+Yj pZvUC3ctXseoSasoObzJwDG5viI9ivSjDKJGDgfq1tnoWjRg1KLxgfU2xi8RXhdjf5cP ICqR6C/7rEXqgD4t4Ye0mmA78998kt4dP7eO3R1ogZFWqrDEVv3KZzk6tNUX208eJqvw /09w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883963; x=1742488763; 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=veWgchPav7V57eti4aRmeK18rg4Oxh5lDg/xsTruD5INQ8poOpz9StxOUamfAY3xtp QVCBztGYBH3ZiXSI9ZObOyz5oZJ82tCbTU1YIEXPSTR939dBaR1irjAU0F1Vb9Dwaxn6 AjPOE9DTq5AD1UkMBFAuhFM4ZVHh5HBV8tDfp4XnOIg2ysSv8Ic94do731ACtj9sRPay xb+SepH7ymXKnklsv39GeVj32DO27styObFZhHuMI7JvR7upS8zWZg20ikRVeMRAjsc3 doHS7Qxivvmunka++MlujwFBEDacWG771uP1w6Gl0F69jhU36fsRYA7afMkonQXRN3Ao evYA== X-Forwarded-Encrypted: i=1; AJvYcCXUrtK2geJw/8zfxqBHJMQ9yXo0yPXC9m2h+Kau3PeRkFA7Dxa/+7PW94bLow/wD5lgCdw1qIbeBGo=@lists.xenproject.org X-Gm-Message-State: AOJu0YxOKcfsxDX7cYhPY88Gr4pxsAfkplhJ3SX0Mr8F2yNSn7TzrWZu 8it7XiBIr28zSvZrgtUYow+w4QXwxKWdB9a42459DZzVpejXo8T9pna9R28sVzk= X-Gm-Gg: ASbGncs7udeE79uDRTMU01zbtrlfKhz1BqVikAwwrdQTzCb3DeijLW4vq6o+YqAEaM8 HUss3b2xqPQ7wAnXEQCZByxMXF3emrdiDkAgIcO9O64qo6mrpz3whRz5Uvxfbc2xM9Z+AP1VyWV mgMAz6qXzP+eGhxbWNRYNqkQd0jVtRdkFNFZrG+uJHchC4bjQBqgUXwkeYes8H0UYczzYnbV0u7 VRKduUpf+7bL5VB4YZRjYVvKgHZnsrq5e6LKFptUVQAyuafSQiqBYyo8iA51SfC9eD+1gvgCWXB gD1cc/pd3+2CP8N5pYTuhtLaYaQb41XH/lFBuDMW26AyhPLm5ox1AX4= X-Google-Smtp-Source: AGHT+IFA5iTR0M+uWE9BgHbKNSK5QhTOV/p9oDq/Jx41glVxwyMkriyoe5Nv+AlfRyMJQR/e/whMeQ== X-Received: by 2002:a17:902:d4c8:b0:224:1074:638e with SMTP id d9443c01a7336-225dd8ec5f6mr2405345ad.52.1741883962943; Thu, 13 Mar 2025 09:39:22 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 10/17] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Thu, 13 Mar 2025 09:38:56 -0700 Message-Id: <20250313163903.1738581-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 Thu Mar 13 16:38: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: 14015433 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 EB5C0C282DE for ; Thu, 13 Mar 2025 16:41:29 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912990.1319192 (Exim 4.92) (envelope-from ) id 1tslca-0001Ol-Mh; Thu, 13 Mar 2025 16:41:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912990.1319192; Thu, 13 Mar 2025 16:41:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslca-0001Oe-KD; Thu, 13 Mar 2025 16:41:24 +0000 Received: by outflank-mailman (input) for mailman id 912990; Thu, 13 Mar 2025 16:41:23 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaj-0000Wy-O7 for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:29 +0000 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [2607:f8b0:4864:20::1034]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b902e856-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:25 +0100 (CET) Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-2ff187f027fso2324090a91.1 for ; Thu, 13 Mar 2025 09:39:25 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:23 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b902e856-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883964; x=1742488764; darn=lists.xenproject.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=PABH8iZPN9WF+wJr72ZMp6Lm7i1C+9jWBJAvssLik90=; b=WwL0SM+zfM+CQfmZ0rIQHnJcRd4/GwZpAy7f+ntnhhVWHKwUncoiyZbERjxJugxVRk xwKYXZgsci/8IQvx82+GMguhaBtsr0KJilWrWyV2y5gyODFDYIQBfeqk3UUD0QwYRGTH UUKER8oytQtYGIoLsA/RiBsZnmJKVXuqTHBl/0x2ysTK1XoS8oLXJ1SJfAaDrKpN6md6 SbpnUH+FZjQemmVlD5Xd7v1oWzPkjTsoLojcnYqKqlQQcCVV6rIAFS3Nwuxkn2Jm6ciF /rQPGb0DKluE1aZy+mafHW7+/kTuohWyjjAXOvkXKTi5Inb+epYoqxx8N/7fdMLnxgKl 4EUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883964; x=1742488764; 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=PABH8iZPN9WF+wJr72ZMp6Lm7i1C+9jWBJAvssLik90=; b=kYA+kduwCM81V8AuBbrDngF0+o1++NS6YmEyL4y0ecYnDEG8ccNbVHzyRQQdVmEAIf TbBn0htvSxMls7oteP/5Zhn5L81lXgzQWJ2YIRM+IVlVGbI7RPAb9TUJ8NfQNjspmeUh U7ahF1ItiNQDA4Dap3DD4cIcm1e5OaMacvpHdjTQj57cWdq6c3az2AJR6udj5l17q+E2 Rmaq2mjZ+OW0+EZiA1qvne3wbuwWvzbsTuhxZVdtIF8G99cCVeNFag1jQrnQR156wAwW wqXba5dfXLc4xU+kd3S5NtaXMmdv4UaMw5uqc9TfojfUWLY7ZX1cnI64STMHDvcVS9lX GI6Q== X-Forwarded-Encrypted: i=1; AJvYcCVvRHXWo7UZJMg0e5cLa1v+8atzvvHbM2e95nF3tHPRNudtUCxZcbxCtNOCMNohVUrAL4rr+gBkjBQ=@lists.xenproject.org X-Gm-Message-State: AOJu0Yw9TDUWn/G3lYuMvFLfvWUs2ZT2LAhjOe5POrP3iyP4V1WjZA6S mRVDqAE0+bpugiqy60wuRaZKMTwcoERvMLSvOF802lHcc/1JT3uCwil/nwZXg3c= X-Gm-Gg: ASbGncv0tAGVSRM/WBo9TfjufsFcd/zj2WIXOoyHxrjg2/TFdC7nkEyEzcUWAtiQfm0 VmpwbkhhT7/RhogsR8sWz4tqrgO5LEEHdFmREkuPdEHe8Oh6y4jWifH4IIoOPXA3JSN4NNw6poy /6VEJ8AmI5vas021ciXlvRa2a0G+ZYLgE9XqkCYxunFY9d70TszqSUkdtM9Lj22U5ttI6Htj4VI ZSZ9ltpbBMqPDq8PRWWpmLqEiM3W88PnmXnB0bIWtkoXg1WC+9cy7J8tm4uC0txgisr1XZoM46o HL/u8ua/IeQ1HGfc7wqScLi+6yEHEX21tiv34XmkFCgn80l8MArBYQU= X-Google-Smtp-Source: AGHT+IFBCzdx2RE2XSuvFzfGvZFs1Ld7NKM4NGPSUQ/nU1Uh9fZ+kP54v1OAyBR0HlgDCGZ75ow8Ew== X-Received: by 2002:a17:90b:2f0d:b0:2ee:9661:eafb with SMTP id 98e67ed59e1d1-30135ed493amr4421602a91.12.1741883964075; Thu, 13 Mar 2025 09:39:24 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 11/17] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Thu, 13 Mar 2025 09:38:57 -0700 Message-Id: <20250313163903.1738581-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 f5d574261a3..92e8708af76 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -339,7 +339,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) @@ -415,7 +417,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 Thu Mar 13 16:38: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: 14015457 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 1DD9AC35FF3 for ; Thu, 13 Mar 2025 16:43:30 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.913034.1319224 (Exim 4.92) (envelope-from ) id 1tsleU-0003vf-Jf; Thu, 13 Mar 2025 16:43:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 913034.1319224; Thu, 13 Mar 2025 16:43:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsleU-0003vW-FG; Thu, 13 Mar 2025 16:43:22 +0000 Received: by outflank-mailman (input) for mailman id 913034; Thu, 13 Mar 2025 16:43:21 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslak-0000Wy-OI for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:30 +0000 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [2607:f8b0:4864:20::62c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b9cfe0cb-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:26 +0100 (CET) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22334203781so44356635ad.0 for ; Thu, 13 Mar 2025 09:39:26 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:24 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b9cfe0cb-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883965; x=1742488765; darn=lists.xenproject.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=XY0pAryMmuVMSRw/P/gqFLlcBZmW1H9roUoeM55D2hdK9PBD1y7Zc6V5DqKdbf0czu beWGFzQIAtmZ6ggoYv6hqdoC6MweXykxhExv9vBMGTNgx348Wug+YVj1am6myLyRb3/i veQMi0EFM5CYQa22KvrX0ecW15EdfGdSwXd+c5spV9z7diq4e5ytkDUt/pijgEeg83Aa wDeqZzMXH5qcitrzuyQmbFtxuc/e3oLZaB7rrFKHaYjO3dDCZlImY8i2+Dfc3srFJM22 M/thlHsdnsVQP/p+wFgsPxvlcSjCEQ39EZPdWYF46QlG21ee6vqFxPnaKZmwRonbS8D9 6MzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883965; x=1742488765; 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=e0wPqGMFc8xmBxy8BWAS4zrswnGmgupOg/45MQGGm1uRrSoZToAbsb20XkBzDiNkQS dR2AxFhtFIVrtTMeuUP12CWlrhAXGeseb0mVGgZ1UamJbKth/wnztdvwIfztTlKP//u5 xbIggHre1NpDaMtfIFHq88nGwOL8BLC22LHTtlboEv0I64sqZ8WhhsCM030pLXtUspPI Yk7opoJumzrUohJzq9SsqqkljSAS8atVCCVGqeXUebSTDa3hVLMohDRP5E8n+T83UvVY YTPje2hg0tvCr592pZ9ZkEbvn6gyDzcVAZZBJtE3C1lS6nbzf+Ydr/jns1hpO6t6AUs4 Tm+Q== X-Forwarded-Encrypted: i=1; AJvYcCWu0tToXJjyE75+TQWaP2GWq45YpGxWUnBFoS0XF9wdBaUqszvQh05XcrGRkHvOhZ8eO5xJ9VwKhvc=@lists.xenproject.org X-Gm-Message-State: AOJu0YzfCGgEh4s4IPdUyW3SFrAClr/pIXeUBF1Y75dB1J1ZhTQIjCoY qMqXlYRK84BEGeMemsaHPycn+TXCPEheJbu+y2zDBVusm65TOIetPnMAmINzSDs= X-Gm-Gg: ASbGncvh0AQJMzIHIqYpvCFOJOrERUWRToVgFyF+sCK8GmKo88tq1qMwVzK2tFfQZQH 4Vpv+kaJTKPwiscdbbtndW2TAjvaO/y2YvC1QjJC9rbizmaKfbnT0S4Wzwn4erOE9T7oor2+2J4 LKCS4wyc4B+GeqlkrcgHIzvgKwRt3HQaB6F8sdY9abF8pM+iZNCaG1Kf8iLWloW4aCwWY8QoVZX p8h/anEZFNjYX7+cMNkF8e5I5V455K5YPnHBSyW4lBDYOm/NhoMJxDtdg3e20CQ7GYJZH9Jv6RS joVCDdmZczeB0oPybaqLFPNmgHxfGCzt5XLPUyZGtvBC X-Google-Smtp-Source: AGHT+IFiKP7Cv0cYdqEMV+MhGWK6VMcS4hFI6ysthSkCfjorg7zJkJOo9IS+PhkZP2SVMZhjn6kprA== X-Received: by 2002:a17:90b:3502:b0:2fa:21d3:4332 with SMTP id 98e67ed59e1d1-30135f4d091mr4406058a91.12.1741883965232; Thu, 13 Mar 2025 09:39:25 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 12/17] hw/xen: add stubs for various functions Date: Thu, 13 Mar 2025 09:38:58 -0700 Message-Id: <20250313163903.1738581-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 Acked-by: Anthony PERARD --- 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 Thu Mar 13 16:38: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: 14015429 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 85C02C282DE for ; Thu, 13 Mar 2025 16:39:37 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912901.1319153 (Exim 4.92) (envelope-from ) id 1tslak-0003Wh-Gm; Thu, 13 Mar 2025 16:39:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912901.1319153; Thu, 13 Mar 2025 16:39:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslak-0003WH-9z; Thu, 13 Mar 2025 16:39:30 +0000 Received: by outflank-mailman (input) for mailman id 912901; Thu, 13 Mar 2025 16:39:29 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaj-0000Wn-Jz for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:29 +0000 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [2607:f8b0:4864:20::1036]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b9495a7a-0029-11f0-9898-31a8f345e629; Thu, 13 Mar 2025 17:39:26 +0100 (CET) Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-2ff85fec403so4308544a91.1 for ; Thu, 13 Mar 2025 09:39:28 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:26 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b9495a7a-0029-11f0-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883966; x=1742488766; darn=lists.xenproject.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=cOa15ppvF5kxsldjPkSIJYe5T0c824L9GaUvR3via0Q=; b=iMMCRlvMjRkWl3bXt4ODIHd8IRhsPtR7UUKUFV9iL9kTPP8jYWquSI1SwSWGSxwKmF XpMOJc4dn/TnvVjOuG0791Vkf+rIftgDeXOmC5mwD8jSabJfvCbQW1MDApsypGLxyrhl ketYI9WhLVmtdlNU4Csbyol8Aneh6LsG0LDjt5lp3G3N1DPD1X2d3GRksk2vjcT/J1B8 HqaZUY7XNWha2xsBbhl+mgBDN0qXVUnKjmUGIrcQssdIVOIZzGSvn0nSX8jmZ/E8qqL0 B4bssBkOxJYeACVnzZPouAl3BVgIc0ml22Oue5AIGlKAOgOz5p2EHAhWmmi2Sz2NxGWb m48Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883966; x=1742488766; 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=cOa15ppvF5kxsldjPkSIJYe5T0c824L9GaUvR3via0Q=; b=beYdh9uoBIEHEVrw1U92VvoIlmAX8tHC8rO3wjLTbu1l06mTzyBtI3tU7l99JzGIVb bGFCd1nPjG8zAl9AwMAErrgh62H8mAjIGgsZaTN/CTdzuzboesYyZstt24tJyK8QlYQ9 sezSZQzZXHBSIF9O7K/gRqO+c66OfEZ41m9/rjMs9+quBNSkTN6Y4szGO8eV5GOUBFM5 g8cHVYSxcbWAgNS3RS3XY7qxhKWlq+LprtCxMf/0OkMaGRn+hyu6Z3BoKu7htQUO1Fws I6fTz6GjZpInXPBgqfJXb6CjuuS/waPdHD3/4pE3oD5uAzRbrHBQx0U3KprxAAN+ENNv 7bjw== X-Forwarded-Encrypted: i=1; AJvYcCVEAU36GCZ7rshgB1cfbxMB5wfiP9rDXQWDFjv8b8cErJ3zEkCQ4PHl4OHCbA1qef2YW5goc/iUgl8=@lists.xenproject.org X-Gm-Message-State: AOJu0YwijuYKJotpEbzRDqSnym8tEJrUsDGi3WMiU/G2+mnz6AMjHPDA wATNqsvJxB1VUsqPs8c90LKsdx6P+4VObKNQxBGh1liHfmGgdRT2WFTRfo28M8g= X-Gm-Gg: ASbGnctcDgXU95m7LnqQheC5HmAlUkc1DuSQ0zcXKQ5lE7jhr/eK9eCynKwKhrvaxxH 00EN4NKYxcDvueGaBrpf2qBY3LKARZr2Pslt/d+EIZH0jyU0b4GKZHtxeOlRoQoaHu+T/ykkevp EFUgAqsKhSrI2tQuPxWHr717pTAHGbFiJNnljUjh/WP1tPLIAD81J7pRjnBZbaRVRg81lM4Y8qU C9DiYnIg29j9tfUxnAZB6RddRSW6woCT/kIvcZIA+bOd4tfCYqkUxra3bcSXaO/JacojG63EJc5 9f950JhJRVxFdP4mgVdzEiv0TM+jAQV/Djk17SyIlS7X X-Google-Smtp-Source: AGHT+IF4AzvOcFWztZZ2bxlYvUCRcZgJhJkixRgg9I+5NbaWKKn606UlzAb4zSHX4i3sVnz0TZr9yg== X-Received: by 2002:a17:90b:574c:b0:2fa:30e9:2051 with SMTP id 98e67ed59e1d1-30135eab105mr4295980a91.5.1741883966469; Thu, 13 Mar 2025 09:39:26 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 13/17] system/physmem: compilation unit is now common to all targets Date: Thu, 13 Mar 2025 09:38:59 -0700 Message-Id: <20250313163903.1738581-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 eec07a94513..bd82ef132e7 100644 --- a/system/meson.build +++ b/system/meson.build @@ -3,7 +3,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'ioport.c', 'globals-target.c', 'memory.c', - 'physmem.c', )]) system_ss.add(files( @@ -16,6 +15,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'physmem.c', 'qdev-monitor.c', 'qtest.c', 'rtc.c', From patchwork Thu Mar 13 16:39: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: 14015432 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 97D79C282DE for ; Thu, 13 Mar 2025 16:41:08 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912973.1319183 (Exim 4.92) (envelope-from ) id 1tslcD-0000E0-EP; Thu, 13 Mar 2025 16:41:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912973.1319183; Thu, 13 Mar 2025 16:41:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslcD-0000Dr-Bd; Thu, 13 Mar 2025 16:41:01 +0000 Received: by outflank-mailman (input) for mailman id 912973; Thu, 13 Mar 2025 16:41:00 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslak-0000Wn-KS for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:30 +0000 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [2607:f8b0:4864:20::633]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b9d8956b-0029-11f0-9898-31a8f345e629; Thu, 13 Mar 2025 17:39:26 +0100 (CET) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-225a28a511eso22556325ad.1 for ; Thu, 13 Mar 2025 09:39:29 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:27 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b9d8956b-0029-11f0-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883967; x=1742488767; darn=lists.xenproject.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=nIuvgRQSCIKSkJIIHuJR8fc52spkMdYUEn7kuK5KWr96zlP4qtOvtjFOVsNYvL7Kyw Sftprcebu+sN9gKhn3H56Q/kuWpRNaKyOxTxyhYODPCLU372Dp3UpidblW/K1a5/zTn6 1zubNyhY2tE6DZiUWct96fUt+cv6clqjCkL90kw7Huj7p09t4V3JgPGjzBJW4hXXJxJA e+f90i9Svz5Wl6SH5mm1/SgalPXUC2pbyo1xwR3C1J1O5jEnemvrGaz7DwUl+01/zTCP ZYoInpT5e0xvlwGnWN89gr4MLJ9hszkytGPIzUsGlruMJJPyVx1yUiSDwZYmaDUugg8e t5Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883967; x=1742488767; 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=UbwK2FZoVnwr1lay+QAYmTzQi68igW1AiGgAp9l6xm0Os+2Lu2DlX/s7jcIRyBp9G1 FG6lTqRqGG1lmvCjphqL+s2/IgCogHjGYdjKSzQ4RmIqFMkGcRnVlSQ+CuZ6XTNwzeh0 OWA3Ggqkhz8IvIeb7j+Xg1y5ObpqKBCW8UioNiHRCgIIhurzsygWjJc+6TfPtwmJIT2K jXM2kq31tG9bAvBrLibDVNZHyKyal+kXsdiJ+W9gVTtwMcYZthLO3staG86HiuwUYhBA Ac2W5GPug39la5NlDcFIu6U5ll+Vq2O40tz71kyekMpNuBSSHSg/KX06jwxeFfYQMqe4 l2bw== X-Forwarded-Encrypted: i=1; AJvYcCXQ/momGIpWdM+yeavkabdLmWhNcYCtUCRpwFydTIbDh887qYWn006WC94+QZLU/nKr0w6pv9Auppo=@lists.xenproject.org X-Gm-Message-State: AOJu0YzjNQbIRNymsKMcHXP4NNkBpZMJMQ+rsEkomoiOz3+ueFiw/zVt YqRgmfEViNde5JpVWrnv9eX75QTQeWrFauH3WT2DRG83JwAfjBJTeNB/Q9v/smE= X-Gm-Gg: ASbGnctWsJ6qyYpjR31h1C3WTjOvI9JfGUgct3LR0Owy/U1uTkMTAQ8H9Eo2T0N3YO5 NLcrpxaz7kloUpXshBxnBvK0Zi6Sp5T6VuWE4pHg6i60d95c/Q59T159rsjVtdvqgt8T5OjiZhx KDCxciKmKgDm7LPYMds5Ca9iykSYAU7d4t5jGXpVoT1y4xlNBp1cv1Kyrv9yP2s8zUUfpUpct9K V4Og+PfjR30Mxlw1NJVdJVK12fPB+CLeElm3yOv886L8mf+Hsr/AjrUjM6U+hvY2jgNEznPC5D/ Rp8wDNtIj42xNSA82DY82PhLBQAD49uFPWSdoS02bbO0YCF4sr/dBK4= X-Google-Smtp-Source: AGHT+IFcq5bUjsmA5zzk8huR+izs7UMfjfhsI/1Y2larg5eumFEccAwXse4tJs4zAbzQaGCcQS+wlQ== X-Received: by 2002:a17:902:cecd:b0:220:e924:99dd with SMTP id d9443c01a7336-225dd8b9922mr2731115ad.34.1741883967572; Thu, 13 Mar 2025 09:39:27 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 14/17] include/exec/memory: extract devend_big_endian from devend_memop Date: Thu, 13 Mar 2025 09:39:00 -0700 Message-Id: <20250313163903.1738581-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 Thu Mar 13 16:39: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: 14015456 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 E13AEC282DE for ; Thu, 13 Mar 2025 16:43:20 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.913030.1319214 (Exim 4.92) (envelope-from ) id 1tsleM-0003Y0-9g; Thu, 13 Mar 2025 16:43:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 913030.1319214; Thu, 13 Mar 2025 16:43:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tsleM-0003Xt-59; Thu, 13 Mar 2025 16:43:14 +0000 Received: by outflank-mailman (input) for mailman id 913030; Thu, 13 Mar 2025 16:43:13 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslao-0000Wn-A9 for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:34 +0000 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [2607:f8b0:4864:20::1035]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ba9c1e4f-0029-11f0-9898-31a8f345e629; Thu, 13 Mar 2025 17:39:28 +0100 (CET) Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-2ff80290debso2584834a91.3 for ; Thu, 13 Mar 2025 09:39:30 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:28 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ba9c1e4f-0029-11f0-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883969; x=1742488769; darn=lists.xenproject.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=FK+6ebUWD5Sapcuwjy7wYqq5wTRuRuk5HqYFrVy/OhkvAtlGQ7tE7KQGSL60kw7HcR pdsNE1IhXuyK/EkSw8jvtFlkTHEmfypneJ26kbXfqTxernJD4XdP3UDra58iMZV24vgd SohN7lHDQBecpl8JIlTzIyssEEaAdw1AF8woKqTYTf4dKUf9VdI6+gSwtiWltIgiIsrm SkwGU4r7GqDZ1rmnvebTOJlcvi6c7bfjMZmc6K4bdZ/CeWYBDPpuPkNe14scXeL6P7uR GUEoCn4o1icIWvGqByqGphPuPXg55P2HD8yJi1Nc6/h3sbWEULxVxmLaUESO7vV4OhmZ gXZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883969; x=1742488769; 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=m1JiOb1ipersXZ8QowoI5huqnCKfge5MgkM7HlO7EFb6sHzXKUOgEg+awEOtMr+Yap XYS51Tdz6jbKjYOQuBpj2emI8f5cW10lsygZDaZzMoUsgYWvrx5n2f8pMpZG+oEv0Ket sji2Df1P/B+9k0vO+OizE9QUHPmj9pA3sGfFC6tnR+aWts8v1K3qtg7zdYdNo1leLPq6 dGAJo25GPxa2IOAKR6CWBJsa3lvXC6+uWxengB4gIN53/xDOjKK8EtiddxWz4tTLDQlF WhEe520875zeZoliJHpWJ2CrZepFUpLHSMjKRUF5qO8nYx4iE9qun5e7VQmJcRtynKlJ WBDQ== X-Forwarded-Encrypted: i=1; AJvYcCWOmGoRbzUYIt+VEv0lsxJrgbP99unnox2rwkV9wYXXIp9eWVKLRxSxClib6zw1PHRlkfOKefUicuM=@lists.xenproject.org X-Gm-Message-State: AOJu0YwqTK7WI8Y6IYXD0cvIMck37gdjku/vcPlv5P7hVM2aDfDixjvD itnoONxUpRdUisSGnZSWHtH1RA98fk+ZS9GLvo/VgmRPctgUg8j67OE9l6MdHi0= X-Gm-Gg: ASbGncslhRmWMocYtaDzq10MxoKQReJM6dkVcGRy7M3cNqYqyd2lv/ZnNS5nuS05I27 AsrQ+/+qWTy0vLfH93nPq3Purdr+vp9BHRLVjOLeAgnv4Eqvx3q1HjKP/qw9koootMcSIUAPG5r 0BlzHXi9adNhXOklBzPD43IhLZ8pNg4EXxQM6fT0f4XEolPQTlGmXVq3TY62myPJWezwEym06be ZHH82JnyeC6lFuFXXUabwDQCGKjCuV+wwYSGbaXht85vy0W2iv/6YEu3ewoCcD7OIa0Q+fRkl88 vq4p/LC8pHSwB0plkrL/l/mO1EDqja/I8uYtCmSP9hbe X-Google-Smtp-Source: AGHT+IE6Us2O77TYYfj/J/RmRU6RhpFIbMCr45wvgkThs0nxBWSPhVRimj63yvMeVhIF4wJ+N9MdKw== X-Received: by 2002:a17:90b:3bc6:b0:2ff:58b8:5c46 with SMTP id 98e67ed59e1d1-3014e82fd9amr271511a91.8.1741883968719; Thu, 13 Mar 2025 09:39:28 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 15/17] include/exec/memory: move devend functions to memory-internal.h Date: Thu, 13 Mar 2025 09:39:01 -0700 Message-Id: <20250313163903.1738581-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 Thu Mar 13 16:39: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: 14015430 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 E054CC282DE for ; Thu, 13 Mar 2025 16:40:43 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.912952.1319162 (Exim 4.92) (envelope-from ) id 1tslbp-0007Hf-TJ; Thu, 13 Mar 2025 16:40:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 912952.1319162; Thu, 13 Mar 2025 16:40:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslbp-0007HY-QH; Thu, 13 Mar 2025 16:40:37 +0000 Received: by outflank-mailman (input) for mailman id 912952; Thu, 13 Mar 2025 16:40:37 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslap-0000Wy-Pp for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:35 +0000 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [2607:f8b0:4864:20::102f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bc73c532-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:31 +0100 (CET) Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2ff6cf448b8so2680806a91.3 for ; Thu, 13 Mar 2025 09:39:31 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:29 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bc73c532-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883970; x=1742488770; darn=lists.xenproject.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=EBRugwqnxw4q7Phz2P050i5IjB6Zbf1WGwdoEilqtkY=; b=xlbH1Yhq02FPeTsM5C0Lq7XD3XZ61XmRDMPhzJsKLdXg6acKnQB4WYrkEO+QAPT1h7 gJm+UI3kHUbhCtuC/GC7vq3rt8ivYxCJtZmmbArxwAf0hXV8p74ksYukuheboI8eGPvK 7HSEbWsHiba/SX17rfhGJb5XhriS2b/irwi6WaRikLXaSV2s60euflfLbKzL/ILORmUN jFILBkZuZ5oHKYdR3ZyI5IP9sXMnKsIh5rKtxCFcg5KjcXAD6zTIDLSszZAk8TZJglu8 1w07HPAQqQTjdFpbTzw8itvsScZouSnwK2qp1f+2L53oidmx8AhJ3AMQXH+ZnUE+2XhW t0pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883970; x=1742488770; 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=EBRugwqnxw4q7Phz2P050i5IjB6Zbf1WGwdoEilqtkY=; b=EGAmGMYYyLajicQh4gmYks4eRdiGHEZWJVQgEs048NAgcTOd0zggKZlEBWSZ9dJdxf ZJf7HuheDa+vW9XVJuiUg2o5x+hzI/mdUNODs5xVMSsn3c8FAZrZmyqD8nlV2XpmmZI6 OA68eqOUEvRBS6SgOD5LW6UachTLUNsZ6GUyCaTQZg7w50f4VLjH4rCWqv6Z9kvJmsHZ 4B3KHfuG53gQY3K3cHUsLws6F8SI7SqqQ9WuflWEeqBz292QI1fb+UNog/MBSl3XZs2f MngNAJatnzJgt+jPjJYPbcIATXvlGyzkByGbvCLuoijFzHsFUoQRYb+EQJ6b2uUjmFbP uH0Q== X-Forwarded-Encrypted: i=1; AJvYcCW8Nu0rh6UTVm7jap8nOsds0EvtqtmPqpstgH/o+j/a2LssvC87bvkJKbZR8mhBhXAjKa/rGjWQwOw=@lists.xenproject.org X-Gm-Message-State: AOJu0YyrjNsBhoCOeUaIDO+eK7MBgkQIila+qcjAIEl0KreHWrtVIZ0D gTt8+SUws4fa1rMPwJIFXnf+sfjjifYPjJs52kg8bNnAK514cQo9dXgTe9E0JMA= X-Gm-Gg: ASbGncus0OrevZz6D98efq8DUKWUUDsNmNSmCCnFhH7PWr6gdrZN7hcisEWcTSK1I4O ccV97aFgfFib8BVO15BzWf28OQInOIf4TdWumK97wEVM+Lh/K2sWz/loPgjvXgVCcocZli9LfrH Ap18GZJhB/HXz4ttMDo8Uv1tFsSStiDypStjFlSinsv47Bl1RGW+0Ox9jhrWhFYjHWtBzA1pgjH cIVDifynKtizlcuOYMCZX+G8+QmbazA5Iatp39lZCnAp/1DXuvhGKP1kxjNLia/NQfujtn13ILA Jj3jOq+B4CKzKelqZdrKRiI8eblBuzyxGEcNap9/7O48 X-Google-Smtp-Source: AGHT+IHRyNfs/2JPL1rq+dZtoKg0Gk6ovyIhkaylwgSPQTAI/HYpqKgruBLvp53+c1fVanolW+jjbw== X-Received: by 2002:a17:90b:51d1:b0:2fe:a614:5cf7 with SMTP id 98e67ed59e1d1-3014e815c62mr251908a91.3.1741883969872; Thu, 13 Mar 2025 09:39:29 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 16/17] system/memory: make compilation unit common Date: Thu, 13 Mar 2025 09:39:02 -0700 Message-Id: <20250313163903.1738581-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 bd82ef132e7..4f44b78df31 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', 'globals-target.c', - 'memory.c', )]) system_ss.add(files( @@ -15,6 +14,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'memory.c', 'physmem.c', 'qdev-monitor.c', 'qtest.c', From patchwork Thu Mar 13 16:39: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: 14015458 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.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 45F06C282DE for ; Thu, 13 Mar 2025 16:43:42 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.913048.1319233 (Exim 4.92) (envelope-from ) id 1tslei-0004Y2-RY; Thu, 13 Mar 2025 16:43:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 913048.1319233; Thu, 13 Mar 2025 16:43:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslei-0004Xt-NG; Thu, 13 Mar 2025 16:43:36 +0000 Received: by outflank-mailman (input) for mailman id 913048; Thu, 13 Mar 2025 16:43:35 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tslaq-0000Wy-Pm for xen-devel@lists.xenproject.org; Thu, 13 Mar 2025 16:39:36 +0000 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [2607:f8b0:4864:20::635]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bd1b2dcf-0029-11f0-9ab9-95dc52dad729; Thu, 13 Mar 2025 17:39:32 +0100 (CET) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-22349bb8605so27429805ad.0 for ; Thu, 13 Mar 2025 09:39:32 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30119265938sm4020084a91.39.2025.03.13.09.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Mar 2025 09:39:30 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bd1b2dcf-0029-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741883971; x=1742488771; darn=lists.xenproject.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=pdsNHldr91xnqdGHk1DTLXuYnmkD/cCe/HKmA2EoKL4=; b=TxSHTWyR6ffb/dYZWYK4mXb6uEP8mhP0+qBMxJiv0LqQOas0KsRXfK20+u+tgGvr9M U/WPpLS1wFS+pMq2Azxrff6ifDo5Q32CCM6ROCrt2P5XQWDMz36KvC6XSskXy5/3F1nm qk+Dp6s/QFVZwPYd1L9zjBXUlNVyC/7WQ96NSD5fjASApd53zh6dVQ2tQYeYUFfbERCj aCs6fHv+uqQ3Ns1aPnqB2dimwEEUpx9lN+gAyLF82IdIZ3kiRusjh5sKbkZg0nX7IW2N RzEdbhbiljVnOW86qh8u3rXzoWlCapZKStUDB1+RbIka5mGLfC4/1efthR955yfFaaSH mgpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741883971; x=1742488771; 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=pdsNHldr91xnqdGHk1DTLXuYnmkD/cCe/HKmA2EoKL4=; b=p9enphWgA6/C5/voR/y83PYNgHaJRV+4JpUO0NhP1hrO+wrK6EVZ0VxC0otV4LApI4 NXRDeVMWS1FSm9gyQpy3rX1G//sQC9UHcMP49D/lF+RZgGoeyhesZdwUngMDK4WLVW3M nfbxwjxyISORUKZc12rMhMhJdsPz7gZ1Y7dRBWo+l+nXuRvn87eXn1Ae1syz63tvMnJi krypqTGXPMOhApsfWYWDMGCK7/alPv3VNr/JoUI6LubOmrVR3wBYzX9UORWHwGLPn08I ksACSxQjr0sSdVAHD+zNC2qxyua5uYKe3lgzADKAid5Yiz86WRZ1fHM3CKbBAVh04n85 xLHA== X-Forwarded-Encrypted: i=1; AJvYcCUF6yMZv49N5pThq3vzyqoQ7u3k/c2jtaMX6CJyg3GdqK00x7a12SPbkpQaB0yPPRqnvwOJLYmW+O8=@lists.xenproject.org X-Gm-Message-State: AOJu0YzOlchs20hOhUcWVrVvRkJPctSvyy7TBad5mnKf32I6yu0TkciD luqBTqhtiG+1w+LJbmp091FpiUiAJFmcENBLEAUhaMHEl8qrT9YGTthzvx9jTwc= X-Gm-Gg: ASbGncu7G4Ko4DAvHRD5NsSZ6wPbnpjf+DZ8p2AEVI/47JLfAkCCUkEnYyR85t+m4qe Cv79MzRrwd4nDiASVGrDYVSLelBxN3EHDdpkAyGm3eHmKHmLInNWjKnEkv0s4TB3+voMWjq5PEQ 5qKiDtqm5wpBLGWaEPJk5YwTcBV4A5X1RCwsUkN4jjN4CNZepUiUtQOJqqhn/pqCH++ApGxqdbk t1COZrRtb0ZBu4rTtBiRMDK0rHjdRbnNSWMGlAd2Tl2NNaIygnndO+A2tvx1d/wB1g7Rjvex/yd zGmWm44JJ9hgGgxsEt8tcRhty45mreOCNEVjHAbA9H8p X-Google-Smtp-Source: AGHT+IGwkoEmUkadWWuwDPp5K+cQQMib7Zg2jJHfpZBwTIoZ4S09vzdl8DeRv7aJJJyLYJnLE9fiwQ== X-Received: by 2002:a17:90a:d604:b0:2f9:cf97:56ac with SMTP id 98e67ed59e1d1-3014e735345mr385635a91.0.1741883970945; Thu, 13 Mar 2025 09:39:30 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Harsh Prateek Bora , Liu Zhiwei , "Edgar E. Iglesias" , xen-devel@lists.xenproject.org, Peter Xu , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Stefano Stabellini , Paolo Bonzini , qemu-ppc@nongnu.org, Richard Henderson , kvm@vger.kernel.org, David Hildenbrand , Palmer Dabbelt , Weiwei Li , qemu-riscv@nongnu.org, Alistair Francis , Anthony PERARD , Yoshinori Sato , Daniel Henrique Barboza , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v4 17/17] system/ioport: make compilation unit common Date: Thu, 13 Mar 2025 09:39:03 -0700 Message-Id: <20250313163903.1738581-18-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> References: <20250313163903.1738581-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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 4f44b78df31..063301c3ad0 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', 'globals-target.c', )]) @@ -13,6 +12,7 @@ system_ss.add(files( 'dirtylimit.c', 'dma-helpers.c', 'globals.c', + 'ioport.c', 'memory_mapping.c', 'memory.c', 'physmem.c',