From patchwork Fri Mar 14 17:31:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017211 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 9C5A9C282EC for ; Fri, 14 Mar 2025 17:32:00 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.914967.1320606 (Exim 4.92) (envelope-from ) id 1tt8sy-00032t-Ri; Fri, 14 Mar 2025 17:31:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 914967.1320606; Fri, 14 Mar 2025 17:31:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt8sy-00030r-ME; Fri, 14 Mar 2025 17:31:52 +0000 Received: by outflank-mailman (input) for mailman id 914967; Fri, 14 Mar 2025 17:31:52 +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 1tt8sy-0000xy-0W for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:31:52 +0000 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [2607:f8b0:4864:20::635]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 34227646-00fa-11f0-9899-31a8f345e629; Fri, 14 Mar 2025 18:31:47 +0100 (CET) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-22355618fd9so48786925ad.3 for ; Fri, 14 Mar 2025 10:31:47 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:45 -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: 34227646-00fa-11f0-9899-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973506; x=1742578306; 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=KBnjvRvhagUil1NbY5Wp+4g1yfeD+sXYIOueppDRSbnhehO/S9YwsIHISLPhjtWNCz zp62Ev1zE8gM6WN2FLMk4avgeV8Dj2dNn+9FJwg11+QM2a6nMxiLrwKMi3C1PLfVlCNH uvN08ou5A0gvo1Y7GcUJUBk1VfHWTsInu2otRRGmKW2LavK5xtVado9whASiggAuOLmi U5p7h4i3ZwgxVgmJQ2BctwpXSEHTzh9efr993gP1xOUmTavdn2q/okVnvOVSdYQf/Nkj ySrsFCJN316u7Iv4ebc/a6ol6n74z/83BZh37hJL/94eSci/lomHBgw5mKUvCUnmFjjL HhfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973506; x=1742578306; 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=XpvVdXeYtRS2nhTHTAjwTNHYYP2d/7ewCRAk8M2hCnFW8d1vCcRAoJfk8U8YI1s532 aKdwGP6lNredE/AnawIGfpQ6U7t/lymTqeBf6orNK4Z6uFRY9uz6TIrA9CN7OqOioqkO 1PD8e8wOkI8vbqZj+L48/EPK+D38tAQ2S394QQPrwKWZgrA0YpqbXQPNehhGgIlOC2cf NXptj+JMhnb9An5vuDCGdUnttftV1aPq14avtQqqjAII9kv4F+g0rIVUy89eFOxGgFOG GANOzo6G06Rstu2qY6DsgftFvEar+7SFDMwi+5p0nb6JT9EJ/6C4ZtcizOsDTq34nFuJ eGZg== X-Forwarded-Encrypted: i=1; AJvYcCU2Ky5Mu5ckK0MxufRecUmrfAYjk4nYUbr2XGW08pUO0D3B7OpZPUvQIqDCOwYiahl/tMhQUWlF46o=@lists.xenproject.org X-Gm-Message-State: AOJu0YzsoexX+YoB3KsREJIFYTaHCQG+03CrSj4aHh5iukhrLprBsCmP Id+40VRTNxP9hlcfvPQDIWlMXfRGwRYw8DM0/3BcnQsqGZZyBW4gXZuM3yIcZ9E= X-Gm-Gg: ASbGncukhdxRL7/SR+0NZJ1zzmsO20fwQeHeVJJvmk8nN+jfqTkp8msekK2jULOE7w0 CpgV/YGtcTTAQ88oc9ovENnHCWHpeEvn9hf5j63/2C+K/ZZsCulbHxf8vK7qKPArhTJCP0Gc/Cz NltCuCGmsn4/rE8sPbA0tBhFxjVHVPOwgPXaeai3+Eqg+u3q8ljP1gnz/GqISKHveBz+kHX0ldn RL+oUAI2WQvT8t4Hjzu9vItCMcGgZatDfd/spT9CmB1lNRd//UGHaBzz+mdqpJ4FFMS4+0CGhJW XlJKC1zg+cqWg0MJADQr8+W6SvDVGaDcmi+WchWQnl6C X-Google-Smtp-Source: AGHT+IEjELEcHkUSgYSyUpOQLSDQBfR3q2soKgt+mWzeI9X+HyRoUAOICNrXniu51BG9jWIge0MJZQ== X-Received: by 2002:a05:6a21:168e:b0:1f5:7f2e:5c3c with SMTP id adf61e73a8af0-1f5c113795cmr4514154637.1.1741973505987; Fri, 14 Mar 2025 10:31:45 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 01/17] exec/tswap: target code can use TARGET_BIG_ENDIAN instead of target_words_bigendian() Date: Fri, 14 Mar 2025 10:31:23 -0700 Message-Id: <20250314173139.2122904-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017209 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 57D46C35FF6 for ; Fri, 14 Mar 2025 17:31:58 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.914965.1320589 (Exim 4.92) (envelope-from ) id 1tt8sx-0002eJ-1W; Fri, 14 Mar 2025 17:31:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 914965.1320589; Fri, 14 Mar 2025 17:31:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt8sw-0002eA-TH; Fri, 14 Mar 2025 17:31:50 +0000 Received: by outflank-mailman (input) for mailman id 914965; Fri, 14 Mar 2025 17:31:49 +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 1tt8sv-0000Ih-ES for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:31:49 +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 34f68fcf-00fa-11f0-9ab9-95dc52dad729; Fri, 14 Mar 2025 18:31:48 +0100 (CET) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-219f8263ae0so42497105ad.0 for ; Fri, 14 Mar 2025 10:31:48 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:46 -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: 34f68fcf-00fa-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973507; x=1742578307; 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=RBhlbKFT6B+RLi5oJUJxl0lHPgD0UvV+GQPzzL6HgsOHDqXz/PEaFUrGBgbU47Rfju VHponTgnpwMuQKMJCmXqdtt5njac1BoxA7uZoglk1f5jqzPQ8FBJ905mzrI24oy93BEW arF5LSrZ1rijyb/GUDfctZwY5zei/Zq9anY371yJpHkcyn7Mm4EExHUtM674C+PTxTWi Lf5C3+rxVt1PvD85HTZdf8dfeGp3X7Ndu5BydqPKpqSF1XY90uydWtD2/I72E7GOJ+hp xkfSd4Oi+zEJVmVlzqfqGYAaiLLXauLmiwFpBrOkuRJw+lJFPXl5sJ2KsbMM24BtmvEU LPvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973507; x=1742578307; 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=filHEVwuFyvYM9cAwvSCPNq1iZWhLs1bQyfHaJ75Ecp4NB4eWyb5cfGjxIHCGlRF2R 8GgkQ4GlDCQmfHJd4D5806mcoV5UMPvdPrg/mKzEhDl/0Q8c7OF9MoUaYNjms/Rrn+4R o92rTtt+WClt9FcaXi7LLNgw92XMwfcY4u6jiIDzMgtjJFUlk6jgk2LF3blstKh1WrL5 G2FTAqV7UdMchKVztdCH1KKfu2T1zPQJqtOBHvUv4X6mDiHGNkBSwFZf4l4f93ddaU5o NWGh6FZoVkQS0SUW0j2b5q3WkhSh60D8doX50YurDSKzNK+SsE1SdgTyGxD182JpKXYd xs8A== X-Forwarded-Encrypted: i=1; AJvYcCXMAYwC6uX4s1Yh997ZgH4iP3MOlEEgVxlTE7sCaTa1Pthvj4OLCemvoJN4Kp2nciWtUSm6C9qIc68=@lists.xenproject.org X-Gm-Message-State: AOJu0Ywg8F0R29N8CSU+nM71+t6XYZNtgBVEQZXMrnm9BTBxc1OvK9cw nzhiMOOfLjAtwKoErFpHYB4CBJU0O6PGXyDODqdQrrcNeCllvcK+HeHNmZxqR7M= X-Gm-Gg: ASbGnct/76THHAy24uyo05dac14yUmoDwHiGDBuJM7yoLd7/hZBVwZrg/61TYhG4efB ZRi3KC6nFNIcQR+VAfdwC3p8D4130+t3rmG9hDobTLAKTa+oNWauq2zZMEkVezvv/l8S/IYBOt+ g9JhwSGVMVnoOS8WhpYbHX9VmWCKGeB3jdxIyH7XxH4smcrX9dPmbI4HEvjXCqCUiE3WhVBmMZP TgTy+4XlIVLuW0oH1eUtVdUVkKlzYyh/mHkqcDiJHKHfNhD9vLxdL10g7T7RoAYONYE4NBM18xM TWOmTrV/PM+fJ4uM3TpQoZ0SjKYOqX4rOqLo3ND/GCfm X-Google-Smtp-Source: AGHT+IG98FFUYfg0sUj6szpvN+iBBsyjmwTHoAxx0itmB7R9pQNc8XnfcIaBUehzGw+xAOY05im+Eg== X-Received: by 2002:a05:6a20:c106:b0:1f3:47e2:80b3 with SMTP id adf61e73a8af0-1f5c11c3cd2mr3981620637.20.1741973507092; Fri, 14 Mar 2025 10:31:47 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 02/17] exec/tswap: implement {ld,st}.*_p as functions instead of macros Date: Fri, 14 Mar 2025 10:31:24 -0700 Message-Id: <20250314173139.2122904-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017212 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 2DD05C35FF6 for ; Fri, 14 Mar 2025 17:32:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.914970.1320618 (Exim 4.92) (envelope-from ) id 1tt8t1-0003Wn-9F; Fri, 14 Mar 2025 17:31:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 914970.1320618; Fri, 14 Mar 2025 17:31:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt8t1-0003WX-4g; Fri, 14 Mar 2025 17:31:55 +0000 Received: by outflank-mailman (input) for mailman id 914970; Fri, 14 Mar 2025 17:31:54 +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 1tt8t0-0000xy-14 for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:31:54 +0000 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [2607:f8b0:4864:20::62b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 35a4cb4e-00fa-11f0-9899-31a8f345e629; Fri, 14 Mar 2025 18:31:49 +0100 (CET) Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-22403cbb47fso45115365ad.0 for ; Fri, 14 Mar 2025 10:31:49 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:48 -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: 35a4cb4e-00fa-11f0-9899-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973508; x=1742578308; 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=aZSmT5jRYQBGwWjDtUsLhl678rFHFxibP6wFupLEeQfhK51rdf7vzlHlot1wwzCOWr 6z+WeKKOt7mH21sI7aHma6+ZZDWTHjxuk71TmFUNxcdsf563lVpakWmSyHTF5ATgiHZY RmIjQOyCN3szcmMyeT7eCltnB3oAsTPrQVpu97zLeP1d+lXOgc9DgzPoQbDX9bxeVtZ8 mYPEMDpkgelXxifhAZT/+fWqXGgvtQr9qaUgchnQOoYnPN+nuj6KlwEkFflGFNIIOua0 5ddaFumi/POqtFPe9R07GH2CKNK2KA+v0Phi1gW+lIYsSXg2+EmkyA3aW+3lDZ4H4DI1 2OJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973508; x=1742578308; 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=ph/uPrg9cZD6Me1mQTBXF7V6c/SFHblPw7uP/pSBFD/f10Fd/kailEB8ldoV3KHvzN a91MTAOyBgsGOOA7Ar024mWcA0CrWGSk2jJjMBkCMfscHB2G8Cu9r/b0oeCO9OMCozJi /LZuT/3ioJqfXgiZetFw9k7RojD+vz+IwFZixRVhbUY+8xhfRT2FepcPQdqizgy7ZSXm TotN6Mm6WtYDR+mjycujg1ny3SAbcoYLz0PImMYcxggVN7dNd6b9AXDEJoM/NXaAJOdH r7jRBmnwUZJoK/bWhxZ4v2bYROwo7CNrGTCZgc3Mx7IK5fXsGcWpe97M0Xw6J45xg6+R 4j8w== X-Forwarded-Encrypted: i=1; AJvYcCUNFO6ji0Y79I25P6va8OwrIGXyrl6HNMR9DLP4CIWf06TipHTabQ8VQqY+NUig5M4hZQ7ItAyHD1U=@lists.xenproject.org X-Gm-Message-State: AOJu0YyLc8NqywL1VahYe2JW1jCeT0WLe4sMfJ2U2Je891jQUs20aZsm aWX477x2O0Rxc7RJ8fSg9b05+HK+01AVDKJIYZeltniIXia0Fq94v8CsLTtUAJk= X-Gm-Gg: ASbGncvNduuzzVszGfIY2xCdhIHc1ebyguYcEF6Tobqu+iQjIo3SPvRzfQXUY5hIWco CKMA3IjZgegL6LTOaSCMuwKkDneDM6JABgIhPza6W7o4DKGTUcz/8bShz4iVLE3CcIcKfmM0YAk l4v0qufsZeCrNT/MjfkbnjFC3ui+6cAaQuG7ubaoPVaPBxBw3O8nXqnCNPt9+Js0XVnCQvcuUDI qmwHChhJ1kdnviTPok0S3TCP8iVeq0nwEgDSNpU7ujElfOgmJam87LbwgFKzA/Eg6tZjMynooqy MqrQq48Ym0JliCEil+dDG5OMom4iIqGTIZro1iLZPWjm X-Google-Smtp-Source: AGHT+IEybdH1a4UlSgUtF+/hwXdxnavqEZfmFC1l+XuioTIMcBmIgOmIQCQoptJbICxTDzesMl+Yag== X-Received: by 2002:a05:6a00:a1f:b0:732:5164:3cc with SMTP id d2e1a72fcca58-737223e7399mr3832395b3a.19.1741973508455; Fri, 14 Mar 2025 10:31:48 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 03/17] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Fri, 14 Mar 2025 10:31:25 -0700 Message-Id: <20250314173139.2122904-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017214 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 C150AC35FF3 for ; Fri, 14 Mar 2025 17:32:04 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.914971.1320629 (Exim 4.92) (envelope-from ) id 1tt8t2-0003ph-MS; Fri, 14 Mar 2025 17:31:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 914971.1320629; Fri, 14 Mar 2025 17:31:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt8t2-0003ny-Gg; Fri, 14 Mar 2025 17:31:56 +0000 Received: by outflank-mailman (input) for mailman id 914971; Fri, 14 Mar 2025 17:31:55 +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 1tt8t1-0000xy-1I for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:31:55 +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 364f078a-00fa-11f0-9899-31a8f345e629; Fri, 14 Mar 2025 18:31:51 +0100 (CET) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2232aead377so53466945ad.0 for ; Fri, 14 Mar 2025 10:31:51 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:49 -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: 364f078a-00fa-11f0-9899-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973509; x=1742578309; 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=RPGjC7gs8GTHNpxWHD/FaJX63VphE9wwtO5FlkiiHbgEVnz9ApA3mq2o8jDlbWEaMD 1h4PJhmP1da/RMK0ngfYJtXlsH8x3vpOdv6f3wVkcAbDZpIDK1+6Kl6EilsNijw9uZdn c6pV4HJaLqIapDmCBVNlnVPkxayTO3Jl5wROGcrPW0sOe8dEpI92J3KpbiLh6tBPasmn 89KTC0A4BbWqaZriobp4iZY/rS3nUdZCVESbWM+O2xQlLJfftgGIWVCLDBZjvLcBD7+2 2yF/BhBYlAzCY5hmL6Clf3Cwv4soSI1u5c5CkvOXXCqqZKT8ZzWZw4WT0Yv881EFa/mW p/Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973509; x=1742578309; 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=RC/9Ph0hO85vneEYSTSxR2R8KfEjsGQ5bXfBdxQWfRbNoiq6s0KopDGsYA64P7XEt8 T4kEOy+uKDwUZ+NaVuJDlGGDH4sHE94z+nnphiHKLG7JodQDt+e7ZD7b1tSXlR0SBQoM Unedok2YcDgh8dLDU1tfICWY5wvA28Vzx+84REI1C/CF5drSuiHrkV1RYk/b7x24RS+X 1x7ljkzroY0nq7nAzpQSW2NmFotoEykfPFLuUpnM0dAKyHiwQ6ljDPUtWYs17jTkTFrY 0hdC+o1Zo4Y5wDIIIz0PzcbmyuhBRr5z98jpB/EFy+6sOLfG8V5/n1/WDpCWLvvj0Maz ovYQ== X-Forwarded-Encrypted: i=1; AJvYcCUNn2oKb2Ml55R1w6Wwy+zoYyZlBoiWqk7ub7mD5Gi3sMTo+vcTfPS2xcgvuRpzknLXky3cAsVQhzE=@lists.xenproject.org X-Gm-Message-State: AOJu0Yx2kDItZogCcZrV7d5GH3o6EkTlY0vyxxHKZwYkYC3RnBqfj5sO TKkiazoMTAFIQ9AZ+7ti9J4M9xeGXGUq67COC5JZn+f4FS09mpIjc+jQzE6LwKU= X-Gm-Gg: ASbGncs8AQEPVAM8yRQcjqkxIYXkWH9pEVYbY+M5pWN9QXpH669sh9Ijuzv4F7AZE7Q YksuVSmL52jl0UBwgt3OLr1yUgarb5b95qlQcTIMEMhAdrUAJiuroGKr5tMiqhZVKvOxfHxHsjq RRxMGtwbJlxShz5uQTChedhPJq+nPdTAUaE0jHAOqSCdkNG/mH/IXZ3qAlJfRAYK+BeVVJ303Uv evBrsEfD1d8+7CZGI5hHshL40CjxhZkIV0fO5KDgnaUX8bWCtw+qu/KBbqyrU7ms9t6uTJHZqBJ a0X64A4MI46PkiTcfPHmujVCo2YyA15aBBleW25dfjI5 X-Google-Smtp-Source: AGHT+IFQBeqqn3ezA5En8rRFWwDRdkhHWJ51dC4tNWFcY4zpXwmWJXk93HseKx7PQbRLNq1zxfYk9w== X-Received: by 2002:a05:6a21:1519:b0:1f5:8a1d:3905 with SMTP id adf61e73a8af0-1f5c10f7d60mr6252806637.7.1741973509576; Fri, 14 Mar 2025 10:31:49 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 04/17] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Fri, 14 Mar 2025 10:31:26 -0700 Message-Id: <20250314173139.2122904-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017213 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 88BD7C282EC for ; Fri, 14 Mar 2025 17:32:04 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.914972.1320636 (Exim 4.92) (envelope-from ) id 1tt8t3-0003uv-7v; Fri, 14 Mar 2025 17:31:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 914972.1320636; Fri, 14 Mar 2025 17:31: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 1tt8t2-0003sv-TY; Fri, 14 Mar 2025 17:31:56 +0000 Received: by outflank-mailman (input) for mailman id 914972; Fri, 14 Mar 2025 17:31:56 +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 1tt8t2-0000xy-1c for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:31:56 +0000 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [2607:f8b0:4864:20::631]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 36f5e975-00fa-11f0-9899-31a8f345e629; Fri, 14 Mar 2025 18:31:52 +0100 (CET) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-22398e09e39so51803695ad.3 for ; Fri, 14 Mar 2025 10:31:52 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:50 -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: 36f5e975-00fa-11f0-9899-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973511; x=1742578311; 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=f1rpiZP08QqLZ0CE8ZYBaNMBHT3mDjfkuGEoFwa5xnlGPoeDoXlGN79fNiMqYibPe8 6qjKXtbQ0Szb3u29Rq7MYzy2p+Q0GWEJQYfNkKPlTQLvtI8B3Q77+fR4OSVItNkJ8kxR Q5b7Cu9HZteDdU3oJcajBfg+F2LFunfmAuK9ONPKq+XuAxIDxsURbjKYsdaNSgfsTa34 Xs2W6aZp0m89YouxjIhOLiEIc+KXRO0s1O8xkLcIRAa1Y9Jn/5QHxh9SbenchgVqo29d TPMZCdG3qVvwlGZKqVJc860PH62lrEwu3CwCr7Nzo2HFNSyMYL+zKo2B9UYqA8rNJzVT I9zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973511; x=1742578311; 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=EJ/ie68UtR1IP4x/+5dcgMIzl3T30uvYXXJmrVC/dxFq2A4TJe5/CS/rH/R+xmx5fY 7JQ8obTcPAdtFhVaAitgwFM1OcTyhZI+LKmbMN01cRRo/OYcQJCrZmufOXWbWMPnI3Co czWtmxhJdzCUNUW77JHo9Oh4627IyVTU29IayCJjY8T4uyQ3BJW0So7Zp06uouSfaET8 dfEEWfNbg/H+vQbjOzjEBuk/Thuyab90vBCcFKfB49jc5QaY3MATtA5wD6A033LMKPzn lZBX6WflDB3mzkQxEh9jkcs3Wnf+z4Cq3VkLMetLSv5CumY4IWK4tLl1i2UWKeC1NQTm 1mpw== X-Forwarded-Encrypted: i=1; AJvYcCVDioyIjEYGXl1AtwooesWV2bYFCv3QAxAHOj1/0dE+EGt9K50fuYbuveb27cwj2p+9RBXrP9Hf4wM=@lists.xenproject.org X-Gm-Message-State: AOJu0Yz1RapwBRmDOG+F9TY8UndvNLw+skM5Hc7iZ3u38+9uC3PLs3XP 8ikioUPSCkSwU0eW5/9E2qhcu4Sg+VYb3QJaJ0F9aQv5kQdS8fsjYUzf3SxQw2k= X-Gm-Gg: ASbGncsFXSc5mpz93nx+jLZOpD3h0YwrBNlMhS+ryukW0iVJ+NhkBsDp59pEhRsUmRI V/FtN84h3ETpRItdKEi18XbGPCIF8h73bIIxGhU2tKo8yUL2kb+FokUI77fV/+8SXHxrIERcSLy nwF1CTkyBM15j/cI5i46i6JLpAOrCErPSsOxzWlrXDh1NK/p2DcJcqxLU1YaB+BH9oh3yKQBEhA calnf9xlspaUMl6Gb2V5xG4zz2ROKP4W/CAuDl1kdIEAP0SBtjwCsI3Bxrv8AMYa7UvdKNAqfER amJcP8gQIgdbvVNYl+LY2sNt6A4U0wQ1m7+8QrCywy98 X-Google-Smtp-Source: AGHT+IHrpliMNKDFJoDtMC4n7ul1BPKlqc8CVK3A1d9AQSWcUHjtbEMPub70Om5ILhqP0o6bsvQnoA== X-Received: by 2002:a05:6a21:9005:b0:1f5:75a9:526c with SMTP id adf61e73a8af0-1f5c117e146mr4872005637.13.1741973510710; Fri, 14 Mar 2025 10:31:50 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 05/17] exec/memory.h: make devend_memop "target defines" agnostic Date: Fri, 14 Mar 2025 10:31:27 -0700 Message-Id: <20250314173139.2122904-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017215 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 25C81C35FF6 for ; Fri, 14 Mar 2025 17:32:07 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.914973.1320649 (Exim 4.92) (envelope-from ) id 1tt8t4-0004Kk-VN; Fri, 14 Mar 2025 17:31:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 914973.1320649; Fri, 14 Mar 2025 17:31:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt8t4-0004Iy-KR; Fri, 14 Mar 2025 17:31:58 +0000 Received: by outflank-mailman (input) for mailman id 914973; Fri, 14 Mar 2025 17:31:57 +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 1tt8t3-0000xy-1c for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:31:57 +0000 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [2607:f8b0:4864:20::62b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 37ada7f0-00fa-11f0-9899-31a8f345e629; Fri, 14 Mar 2025 18:31:53 +0100 (CET) Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-225b5448519so44944565ad.0 for ; Fri, 14 Mar 2025 10:31:53 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:51 -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: 37ada7f0-00fa-11f0-9899-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973512; x=1742578312; 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=On3N5RnjG6CDLw0GxVnAXIuA2OOm+JODVdFabP//UbCFxQA7lH310ewQwBC8PtGA7K 6nbcZiHyn4LkmPRgIhpL0IEqetTK5oIl9TYH3En/OMnxSJF87edR6wDQQG8tlL2lYlKm k9dbc/oSC7cQ1O35ITZ2OlRtNUkHQMC7VUdyN8lUgDBbGQ/wLeu9NPkqEbCzZKR/qcRE 0MoPBIqvkU2zTZlMUceg5h2Izev2J1rqrYCKe9nuqWsKUs/hUTFKTJwDzdFoYRNlL8tK qVCbA2EhKo0yRRF+Lk+U7GVU2l+fAcDLdeVTgHSw3DB3YIj4EjHBfYYY2SeF2d1VoYRp teyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973512; x=1742578312; 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=eIB18KERE368Ugw7m+yUXbQf+OJTBHUoCFPeeYUaNJ8xziIlJo+MCd32uUsU9vvNpT sHKIcJYlJDdoHnRUSR7x/9eaHlEhojv4tcuzBgk/g2eYprQjc3Dyk0KB8slFmV0Udomh nS7esWbsLoILk9vXoDExCmVt873nbfDuc5jBFwCBk9FGVDHxbKTAwiKBb504jeLbvQEN G2hfApxZvqh6w+andSPxzWCRUSdf+Nc/Yu7ii5xDaRfVmSEYxyAHZOG3N/9/djumR8kT FnnvoC8F0GihABqmxTiqhoPFf1ufCp5NKfQed81g4xnIC0WEHjO5a0ZpJXWJ5+rGzEoS IWJg== X-Forwarded-Encrypted: i=1; AJvYcCXZ+lPgb8Op62q261hmJ/W7wfQWG+FCOr1lDIIPKqPI3UzPxS651ME0I6ygRHmmvbatyLKiyR73YNc=@lists.xenproject.org X-Gm-Message-State: AOJu0YwPYGDEXnu7ZcrjCuFk5xBxL0YhdIvKOO8sv+gFt6LqpDVSD7IT D/la1iUbUalqODNZbf+mfv7rzSXKVss44Qsmys5gUgONtmSa8l3yGoZsVjFb3UI= X-Gm-Gg: ASbGncsSSWZQigfSjvlKT0b6AMDd8rrN+pX9Fg2vS3YUjmIi7+gNMHBQDRACrktNQxn lvjbybsnPgeypGCJEkpVpIl0Tfw1iQ4aTmXaq0oortixBXkmbE9A8BWkExqwR5o+zCErVSz/gQb trS5qJ2vAfDOxCQJd8vSZQbKnPfEXlrvYWB0junCovQn/nnTOS+6FNTgHamuWyNYe+rdmqcc9ba t6XJV+3fOt/ba9p0JeWLzl0CGwxvyQupa55q1O2xjCqz+hSron7pDDw7xMpdtZ+SwbVhlx5f7AM i8eYuEFWLylImewSp/84f7dFO6sCKgkUviYuxhR2IBv+ X-Google-Smtp-Source: AGHT+IEORLbJQZPgomOf1sDjTcDkAnGl+mlFCK1VHaTDHzBWmfJYoIo2+c2hSAC++5jNWglDm/0AKA== X-Received: by 2002:a05:6a21:502:b0:1f5:8179:4f47 with SMTP id adf61e73a8af0-1f5c11d86e1mr5274835637.20.1741973511929; Fri, 14 Mar 2025 10:31:51 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 06/17] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Fri, 14 Mar 2025 10:31:28 -0700 Message-Id: <20250314173139.2122904-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017271 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 B6C37C282EC for ; Fri, 14 Mar 2025 17:44:57 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.915164.1320748 (Exim 4.92) (envelope-from ) id 1tt95X-00069u-Cn; Fri, 14 Mar 2025 17:44:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 915164.1320748; Fri, 14 Mar 2025 17:44:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt95X-00069n-9n; Fri, 14 Mar 2025 17:44:51 +0000 Received: by outflank-mailman (input) for mailman id 915164; Fri, 14 Mar 2025 17:44:50 +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 1tt8t1-0000Ih-PR for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:31:55 +0000 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [2607:f8b0:4864:20::632]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 386284c5-00fa-11f0-9ab9-95dc52dad729; Fri, 14 Mar 2025 18:31:54 +0100 (CET) Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-22423adf751so38666135ad.2 for ; Fri, 14 Mar 2025 10:31:54 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:52 -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: 386284c5-00fa-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973513; x=1742578313; 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=ZlBWg/C50fgRCQKx3VdhVwkCE7wGu+inb3yfO5DGyn93FBZsQmSbrEPA5sdeN6luwA +lFsC/m9IHRtIkSz/C7IYF2+hSSjMFmStsujqvFbezUEM1jc8CAfy/MslUQPx/Xl6sMh djHskUrqwZFXrRgeFTt5Y15Cavu51O4lKC0h9qyNGYVEljGuj6+h7hNZtj0op2Wqp0WQ doijzRnu2P8p/72O5+HKprOtug5B/3jhg/Io3L/f6aqPrPFfOGO2CDFOxABbGQU0jSdh BDrrgUbmzQL9PLu9bW3QZE5er+/cKHdsM5CJFtwyE+upCmtpIMmPgBhS8hB45HQ8lUkR bAEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973513; x=1742578313; 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=TsJN60KHYiHWFpbMW898+K6zW9ENsNwiSOTVS0bBGfZ/eYxrY9320hDIPp9IvSa7TT KW6N7Vvr5NIzLvGRwrwF+PUSlzgl26HWE5NznglMmIgZJul1NZB8anaBDbwIRBw0O5ZE mQxdVDc25+IXbPEC+BgtOvDWMvQxm15t3ER9hsi/rp3YN6NqqFGFcDVYAQW3PhYz4RMw Be+cLE0tRyKV6PsccK6h1LlJnmbQJuiS9SU7grwQOc1DWusSHxjI3I+YfbgLMKSXovFt TpbzvLbEsP5oN4xBpIjDv8hRH9IQcJstX86vBLdJqwP4lF4/L80ftnkYsnnjbP6zK3vP CQVQ== X-Forwarded-Encrypted: i=1; AJvYcCW41yxaSeXsVWxjMfV4WjEhl0OoewJrRHajY8RR4O2xGVzjASqMJ7ik3Dz7dSdd0qfIwm256OUaIxQ=@lists.xenproject.org X-Gm-Message-State: AOJu0Yy7h1qAspzduGXsjbwuXnPGDZwS7HUThE8CxOCdYucLTzwT36nA kWuSFi85WXH6WExhCZ0FeduydY56srBG9PYzjXgiV6WzhA/b+oC7SnMunFhUxVg= X-Gm-Gg: ASbGncsyTGeNVftcUmY3+WePfRraOay2w1KlOnoheCJXA/q6d42kv8NHOtfMuValwc9 ELuwbKEzhbqNgAGFbXk9NAiq1sBITFiU0Itg4EU72QZo6CsFqcAB9dBBiW60q69FJoHWsIcJHaP FwWfCvZc2QKrKIwjloF4ySbSDmHAuWKbIksr44YEbBapCTzr3GGBMwUIXl6YW5gP4BDo1K5KeJ8 5nNDDWVATJcyctSRZNzWhJn+s7hxQuQfJpDYqpaJam3iqh+UDOd0IuMAcn7Vj5vtH6ADRhdfAr4 Bfg8ypvhgBGxpvjTSgQg9cxbO6Ou+yuHlZTvrrrBdLH5 X-Google-Smtp-Source: AGHT+IHKJWanCd9a3ngVFjdniRCV0nA3qgwDHy2sNxgD5gHXjvzGRnW7PF30BgY1b31dJB7uC0Yy3g== X-Received: by 2002:a05:6a21:7308:b0:1f5:64fd:68eb with SMTP id adf61e73a8af0-1f5c1137439mr5964561637.7.1741973513079; Fri, 14 Mar 2025 10:31:53 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 07/17] exec/exec-all: remove dependency on cpu.h Date: Fri, 14 Mar 2025 10:31:29 -0700 Message-Id: <20250314173139.2122904-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017273 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 29059C282EC for ; Fri, 14 Mar 2025 17:45:35 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.915189.1320759 (Exim 4.92) (envelope-from ) id 1tt965-0007E6-LO; Fri, 14 Mar 2025 17:45:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 915189.1320759; Fri, 14 Mar 2025 17:45: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 1tt965-0007Dz-IA; Fri, 14 Mar 2025 17:45:25 +0000 Received: by outflank-mailman (input) for mailman id 915189; Fri, 14 Mar 2025 17:45:24 +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 1tt8t2-0000Ih-PO for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:31:56 +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 3921d005-00fa-11f0-9ab9-95dc52dad729; Fri, 14 Mar 2025 18:31:55 +0100 (CET) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-225df540edcso18252015ad.0 for ; Fri, 14 Mar 2025 10:31:55 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:53 -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: 3921d005-00fa-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973514; x=1742578314; 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=V5rmuXD8nWsXNhY1khpybNrFRHhbhyAbm2iaXi2z0QfGsXtUiQfab4cz/U+CORmBfv /fFdnkCWgx0r91eunHAvsL5cOCKg76acIGXdRcEu+pJQ4/J+X8OeiKjWUoq8HA5JNMh6 vtvLFQ0Bs4c/pP1HX7ivEl7lEdy6vm99bzb0//j6j15z2TZOORSoUn6NXnFThaDlFI3t 5BhlqNeivS6WqDaOKZ76lNEN9thE/ZckWnOMGFG0aYkON9qHzRrJwThB65vbLGe+CNck H7yBzhs3Bue8B0TnBrMO835E+b7FINaUdstcXN+dKsfmbHKF1ruVjoogVhnGxulO7Rjz Ys8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973514; x=1742578314; 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=Mml7+KoCKt5HS2ExPRgpBkttETqAsjkuWXlpOLxCHDzOWnXYVZnVGik9FGq9fk8GPl 0mtfYoEH7E7tw7Sq+HxdHb4dExur8/G2OMxvH0BEEHr2a0BAHAk5F7gnQNBdRit6MDOL AkIpN1mH8Bhj5p/hYDkE3RSHY6YXVi9czwRS91PUgBDDmnFUvomtC2plDZJj3I5nni5M hmxVKIWA1XrAsJR4reo+b58Ggh/1a2JeW+1W2pcQwTHqFlMQg/bmFnaRUEUCBYYUo2OK 9Q2bN2z1KC8ILg1DbLCQL+bJEbYwxjoAI90qc2z99+ixdAkp2G1VnXY00hOIuJCvhh/n uiYw== X-Forwarded-Encrypted: i=1; AJvYcCUhcJpP7RrIleIXl0dQ8wo7sj2Sud1I/mq1gCYBwRkzZDT4cnXx69fjoIvAfB/ktSMvjNErgdFsNKI=@lists.xenproject.org X-Gm-Message-State: AOJu0YygjxFEdc/VPH4bwpViAcmOpAb4x9eMlzyqoGdQc5U8K/3a84wd A4ssW69ydjqvEXwbQUyu4RWhUcC49FHgTiXgpUuYLQZrRHbEJV02udD1xgW3XIo= X-Gm-Gg: ASbGncsfD5m/s3AaOmZriCNBbCam2D3wMFCF2cSNaILeCalGzlf526iIuZ6SD4ZRmZT zdDmY+4acAafS6jBupKgweCL3DyXrDD9TEuZpjHQTXmyJuMQ3vpdrEYxQfnTjes18UBxVpiV9YB zA7xBlsPcetCVjBEznA+utIeiHLOvZwJOM3OR8K/VrZ2aTMi1Wf+e2qc8RNUDe2lWjqKGucdWyP Pgi++nqPJf8zctdRohfc/QtRisCull4sFxhBvLMQusHYDX0lBvTgXzBrB3CQIpCc5sPU2y3F9xs t2kVR0FYVVnLXjN+iiSVBLpXs714nroJ9SsDjbPmZQp1 X-Google-Smtp-Source: AGHT+IGePgTU4KS0V7kjk76bTSqsHMsJJFpsZKEW9Y9cBbqNQCd9EST3S+oni0XLMdUtO/XVrzydIg== X-Received: by 2002:a05:6a20:728d:b0:1f5:9cdc:54bb with SMTP id adf61e73a8af0-1f5b07bb133mr8380424637.11.1741973514284; Fri, 14 Mar 2025 10:31:54 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 08/17] exec/memory-internal: remove dependency on cpu.h Date: Fri, 14 Mar 2025 10:31:30 -0700 Message-Id: <20250314173139.2122904-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017266 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 4261CC35FF1 for ; Fri, 14 Mar 2025 17:42:54 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.915086.1320699 (Exim 4.92) (envelope-from ) id 1tt93X-0002nu-2H; Fri, 14 Mar 2025 17:42:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 915086.1320699; Fri, 14 Mar 2025 17:42:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt93W-0002nn-Vj; Fri, 14 Mar 2025 17:42:46 +0000 Received: by outflank-mailman (input) for mailman id 915086; Fri, 14 Mar 2025 17:42:46 +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 1tt8t3-0000Ih-Pd for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:31:57 +0000 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [2607:f8b0:4864:20::62b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 39c61ddf-00fa-11f0-9ab9-95dc52dad729; Fri, 14 Mar 2025 18:31:56 +0100 (CET) Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-225d66a4839so27410975ad.1 for ; Fri, 14 Mar 2025 10:31:56 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:55 -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: 39c61ddf-00fa-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973515; x=1742578315; 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=UOGmUBK/BmylnP/uFe2DxOY18uKGbQCpIexS5P6b4TOLHhNolbp/9Hz4oX+oUMPjo2 5l7ku5DnLquYxZiSKhjJFRNU+PzpGxj52ZhISSoH6FRxQ7JLMg+spO1lFPvgwq7cTno2 8GZdKjBwyesCbAH0s6CZxq4H0sXJZ1DtVwDBuAWdET7UORElUxq1sh/Vk4p6nyVQl3UL 0xxrK6XZiEQ8/2n9WS/DC5L42zZ5OYrGkOAs57mwFATmZSJd6Mt6j734K2wisH8lolZk oMRZQr/u6UXIWDW/f+m4jQ0H/Kb7YAEdH09YKkRvZvZCj7sU+9MccsNKSCYXbEcIUnED tQ3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973515; x=1742578315; 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=Ck6YOyFhmzMvrQGEi8igDq8Y8JI1x0S6CPmEivEMNM6mcCV3jiD+gInX9acTsPkARu 3uxIuCdZmeshfC01OsGexu7hHYuXEp3kk9wF/EOII7tx9vIH9SRzhGEmjLvwatTUJY7x U4UbXRsAFWhfGPDvWyX8+wR1c9rJqyyAYP9LhQpx2R6MedgFecQUVECWNeuEwDBZ4+9Y 1djmjzYNlcxkoMw3zLGwvo1YMfe8Ie9i2tpgsyGbo6sgP+JyGHglcJFPa68u4M4MhhDQ PIdCH4LYT1O5NwjBzWvG6e74v1gS6gEk/twwxIM9hXkL4CR8Y465dlY+2Mcg3FZO6opm yCfw== X-Forwarded-Encrypted: i=1; AJvYcCXhk0deoz4dwVOy4XLr0BDAKjtBMftO9Y3PdMW0zrV97LJSQZCIyy1eYk7NfC6JtATZ5XQy6vIHYp0=@lists.xenproject.org X-Gm-Message-State: AOJu0YzIru79vHS+nVjIHrK4DmbbaQhRvCfi+MDBMxz3+a1vMyKr3j9H gCkM10oQqmym3fl+ukgsp3YDU4Ta/KvnHebKs96ZAUSAfw9L7QL6KVTNgRHINow= X-Gm-Gg: ASbGncsSg7lrENzawvd239Cye6iA6M4nEY0DPJYpjt9/CLlPBRVy3vYuVfzr+bsqn/V C+4vcZfwAFMxl+eRIoYjnY86Fo2JOh+Oh/ubzNIwRCTQUMkrAm2AQ4Yu4C6mMBeAj/qWH2KYSmx KvtQsSL+t4JSjxCmijFvs5oZnLHfM14VA3BqrtZ3MfbDjl61uf05HD7tiy1efwunnGOqWM+7bVw nLcmsGmj0uAkQ55v3FnwNuIRIMDIOSWQiVJHq117H258hHugtqiDTkYwFLwyoMFdCJ4CRjoqKk1 bhxfp+ZuicFlmyHGenx06vZUc4vKDQDvAHf0BO+SFcz8eZTh1jL4rp4= X-Google-Smtp-Source: AGHT+IGj/I3RP0NPhKjXDLOwbHPd8rrkJpTvSehnV45pZ5KtPvxWJrCPU4ZqmKsKsNZoI57izw+qbw== X-Received: by 2002:a05:6300:619c:b0:1f3:323e:3743 with SMTP id adf61e73a8af0-1f5c28650c4mr5059385637.12.1741973515400; Fri, 14 Mar 2025 10:31:55 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 09/17] exec/ram_addr: remove dependency on cpu.h Date: Fri, 14 Mar 2025 10:31:31 -0700 Message-Id: <20250314173139.2122904-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017267 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 9976EC282EC for ; Fri, 14 Mar 2025 17:43:23 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.915104.1320708 (Exim 4.92) (envelope-from ) id 1tt941-0003Vo-9W; Fri, 14 Mar 2025 17:43:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 915104.1320708; Fri, 14 Mar 2025 17:43: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 1tt941-0003Vh-6w; Fri, 14 Mar 2025 17:43:17 +0000 Received: by outflank-mailman (input) for mailman id 915104; Fri, 14 Mar 2025 17:43: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 1tt8t4-0000Ih-Py for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:31:58 +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 3a7f9c9b-00fa-11f0-9ab9-95dc52dad729; Fri, 14 Mar 2025 18:31:58 +0100 (CET) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-223fd89d036so50298055ad.1 for ; Fri, 14 Mar 2025 10:31:58 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:56 -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: 3a7f9c9b-00fa-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973516; x=1742578316; 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=Ps8DwMv30OnOS1pr8llj0bYh339y0ndrO1BaV7/V3E2W2TlLE37W7c/+5Lfdf/ZAMR /payVKpsFrGWd4VEri8sw89YgK7mrhSSEpyyuuM6N6hyaT1I6v3VX73/F8HsFninIM0f q3uRU527iFq0dD3b+Y6C4e1zS74sqjt4XHXpNG8WNh+vCDO6mxhv0baXswRzJbGNSFOy XeHV53yvtrN+rm/ciFZoq2n8rfmipjviNPY/j6miQVs5ypy0w8F9QyibcnzIY+RDAcn3 3UjZb1hp44SEwupVslRKqd40o731o8EBqiN0mCNPNmB1Xeqc5kJxF/NKjKag7LxVqkZ/ czdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973516; x=1742578316; 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=iicepINbLKbcFjGUYVKbLHWDPxkU1tJpIBYpleA/9iLqbTTB49wSKqS9KdrfprcyK7 iomm/lw+MFVNwt0/AvD1pA1gbpSB/8XQFIlmAHrU/eVGy19lp70/oBTWGilwa5VDdTNF hyL6q0Tsi6Vzccj3WwBwBf1ujlXP1eKzu7H2AF/lKDWx/ajJ8gOYYwFn0awqOHHGn+eg vZwS+QRTbwj3Fu3mY8gOEo4TPCUC7XM+1UnsguBd0nmmhuwyq9+PiXTJBpYKUYDd1DGt XFb3A037mKXGqz6HoG4U36Py8FEBT85TYSW81QFCxVIQP1LCOUkOxMRTifwYPCmdDi5t ZtRg== X-Forwarded-Encrypted: i=1; AJvYcCX9AL7OVCnbfdIKHJlUgk9G/8BnMnIwBeDgho1QnZbtlYs/KXp+TmXtGFoVmS3LIAGIS9rokiaRo6U=@lists.xenproject.org X-Gm-Message-State: AOJu0YxwTv/hjgshi5nHQHHIpmc7/xg1sg2XM5I4Fl2FaReqxfrGTyVT 0AHYWX6NsTEDyUcCiwd4Nv7nXHtEM9FEvHKpDkRBxlw1PZPRxFj4YW+Y5868oVs= X-Gm-Gg: ASbGncuW2G7Py7ehAIG5H6dN9dX16IX0eZqIy9WqOQaWnq2kEX63A4ii+pTkbw1KqpD kF3wZg1BgftPNeB43zagwPH0LGGFdADMMorjRWGAIHuDIhg3vDR6HdGmfckPhDRRrU57SG5+QPT RQzgnY+kijOicpo+PHB5WTmzPBMMeXkn7Sie/nv3YkWi1nnNqlzOA4CXcoNmnLLIgJANktGeKnp pAV90584VwVtq4y4jUBAvEDMq5Zej6MOPeMY41hQ2cqLljTHvUGjmvmT3Xp8FKUFQSeRySfGyec weBWaAcy8LfNQsmmoNficRlZgcYo32bGWKAg9ODn1Arr X-Google-Smtp-Source: AGHT+IHMleMJwhfQuIw2SImS8wKBtMic5A4ELNmhk5zJYoh3vglYg1/X+SLV/IgTuYLv0/Y4ZISJug== X-Received: by 2002:a05:6a20:1595:b0:1f5:8622:5ecd with SMTP id adf61e73a8af0-1f5c12c78aamr4816767637.32.1741973516583; Fri, 14 Mar 2025 10:31:56 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 10/17] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Fri, 14 Mar 2025 10:31:32 -0700 Message-Id: <20250314173139.2122904-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017268 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 E2606C282EC for ; Fri, 14 Mar 2025 17:44:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.915131.1320718 (Exim 4.92) (envelope-from ) id 1tt94o-0004Mf-Ig; Fri, 14 Mar 2025 17:44:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 915131.1320718; Fri, 14 Mar 2025 17:44:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt94o-0004MY-G1; Fri, 14 Mar 2025 17:44:06 +0000 Received: by outflank-mailman (input) for mailman id 915131; Fri, 14 Mar 2025 17:44:05 +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 1tt8t7-0000xy-AP for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:32:01 +0000 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [2607:f8b0:4864:20::632]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3b329b2f-00fa-11f0-9899-31a8f345e629; Fri, 14 Mar 2025 18:31:59 +0100 (CET) Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2254e0b4b79so61940125ad.2 for ; Fri, 14 Mar 2025 10:31:59 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:57 -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: 3b329b2f-00fa-11f0-9899-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973518; x=1742578318; 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=NMqmIYHkM3pA5Qs3eB7qIU2gRhelkCPgF18JXX95gDDTvD0wnpd9a3nktj1SaHa6QM lTa9TV27adarjnTtTZQxQJh3vUPJp33o6bb6GYmitQKaJySYX8rc7CcEgjq0iYtbfnPz OZbcuBxccsSS9oZnFnb4k8k3LVRfMJoEPp6Fx6wisEWCnuE3XMaqWCA6rcRlCBAzDFhT wr5HWloDIP02hkF6eWyJ9+9a/EV/7E/Q4wN3bfIz8TyoaoT8uqbv5AJDUxW5KUYgAItj b7bKSZijKxmY4/lUOyu9XAuxk+fTqznJAdEoYE8VNNppUNO535heFdnAbGIyCsQZNgA8 g3Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973518; x=1742578318; 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=atwWgmvCTS/gHF4ue8cbzpPjs0fZgA3UgpaNxz37dmd5INfCAP6S7cbT6+mrmJELDs gPrb1tVwI+te/+fZuot4iNwDvXJ/RoS/tI5wyOnoCVJt8r6iUzYMpMLkEcCkgXU4VRtY gvfA2d2C1AycZFks0Wmw9EgLmB5NvrQIdkF/K3kK+KCHw4b6alER0p6O7C1SS2nfFhNF uUwkn3v4StTHNwg53FaA5X5Z08f1Xb5S48yVn+0yas3iIhZlyk0GvEtoKd/69c4dytXj tAbqDN6kPlauz9sXlTpx/MwXpIROuvG1REfA5EPjFiMgQ2BaOp1nfdjnVkGsX0cv9yI7 Izxw== X-Forwarded-Encrypted: i=1; AJvYcCXstVUMBQKw+V9dMonFdIowY8QjiJxZKkTcBOmZ2WkokUsqgzcqJYl3SRvUuKs2gghsYa4XYN5O0cg=@lists.xenproject.org X-Gm-Message-State: AOJu0Yy2PvaujFo2XcU6rSdEEdOolySUISu9mFfnM2k4XB4VSVmVJ5bL QidBgVNOMd9EL/cke+t7OfxTzMDK+ky4MvL7afLnKl4dCii8pAHsCOUW0Wes0z4= X-Gm-Gg: ASbGncsSwV8PciItv9qGPrLtz0wFBFgkYwe0OjAth8ERt7fG4b31mGvGWjPn+nDq+JP 8d8eB6GZ78o96fD8drQ3vW541s6b+BwOsBTwrobu+1VzmkY+LpTqJ1UKWUHXZyf8989YOlen1Hx AqnvDbBcgXGHa7YL7mcGK20nkuYOCfawgvybfmZT7Yg+c6XxR6lca4ne3hMpzBvydwKsn9BSKvF WDj5rtyVd2/CWp3Mx1Vq48Vv0fQYTXbK2DvfdWBe2GYsLw34pBwbS4j9uSCmQ8WiT2w4rLG5kPl pgan0QKs2lZy9GsG0xCgpvN/e9ALO51WUtAsZPPHmZBp X-Google-Smtp-Source: AGHT+IGnTvSqXO1fzlE+2xVmojsF7Bo5wJQ+q4TppfmkSKTjR2FsyvyfU5Ot+87AVkRJkvXuDcvBmA== X-Received: by 2002:a05:6a00:228e:b0:736:562b:9a9c with SMTP id d2e1a72fcca58-7372242d387mr4348766b3a.18.1741973517785; Fri, 14 Mar 2025 10:31:57 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 11/17] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Fri, 14 Mar 2025 10:31:33 -0700 Message-Id: <20250314173139.2122904-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017283 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 03D63C282EC for ; Fri, 14 Mar 2025 17:48:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.915204.1320778 (Exim 4.92) (envelope-from ) id 1tt98s-0000FR-Al; Fri, 14 Mar 2025 17:48:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 915204.1320778; Fri, 14 Mar 2025 17:48: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 1tt98s-0000FK-7c; Fri, 14 Mar 2025 17:48:18 +0000 Received: by outflank-mailman (input) for mailman id 915204; Fri, 14 Mar 2025 17:48:16 +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 1tt8t8-0000xy-31 for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:32:02 +0000 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [2607:f8b0:4864:20::630]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3bde3c3a-00fa-11f0-9899-31a8f345e629; Fri, 14 Mar 2025 18:32:00 +0100 (CET) Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2232aead377so53470325ad.0 for ; Fri, 14 Mar 2025 10:32:00 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:58 -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: 3bde3c3a-00fa-11f0-9899-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973519; x=1742578319; 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=WZK4IDfbpcoj/UHXYNBc9hj61CH/qnmJNHrSERoWz24=; b=DtvnofA2cwOvKQdqOYyIlZHF9OU+ooy98NIk34RWvL72bnlq6SScyRvYNa5xUcCYg1 3xmdFi6aeSAs/E30H9bNxVREj9QN1flnnEmqTQKduPcEGh/oXtJldFVNbn2U3xV9aob/ EtUpN48K7uIHVwAaMz1EkOSb8IagOTKrRhK9Dp6uKrP0VBdNg+HQaeGdQhFo6IjgrRk8 +K+bFjHgY+eUHR62SYcj4HE0yPNTiGa9xJWrVwb4Ck7Y1eY/0+LSv0VuuNzFTvTDkT76 i5z65eClMSGZBLIsvJ6dpcB1KZiyIgIEoRE6Eobuc2HrVBY+rjS2RfReBxJ2fZoj2TB/ 30Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973519; x=1742578319; 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=WZK4IDfbpcoj/UHXYNBc9hj61CH/qnmJNHrSERoWz24=; b=w2XHGqBQUCBkZ4O0WBuonsmoIhr1cIIrvHfAKgrxFcD6M4aq7gQ09XdOT8mKhdPzQm IHKrdlA0Tahz83m1r5g2yoY7zrKRM4iWFdeL9AkTq9hjcrrxk4j9ZNqFpSu/05GOaCHj 73DCkl6u3bVFaM2bUHcaVZSFRG8/O/v0mb3H78the8Q2gHRQ/JNVG7hDUxSKrj9cTZ0R sXaQtYWgcGmuxlydvnOj+oihrCfaTuq2tLxte/Uwlj2nb3ENK5QpNED2uJAfN8o2pRGB J/toQuCSAT/SU38mC/cJXU3xW+IIcMSkSDIK66Zr+DfFtRLGNS/jffleMLoib43tnTGi XT3g== X-Forwarded-Encrypted: i=1; AJvYcCXKEiEBZRgkpEQMXOpdCcJ8Eo36TwhmpNT+DVnIJw7WOa8rJFi7XFUBR+2UDm+txgYgHPljLXPlwVg=@lists.xenproject.org X-Gm-Message-State: AOJu0YwARH0aOQTqBG13J/2MYcotMv1Yodava9Q823WnsF5OOKPFK/nN 9e8DSHj6TZMRwbtAJnOtE+iQVCzS/mgoVqn0Ym5kfxdpnCBdedfm7fgm7Xj4NYo= X-Gm-Gg: ASbGncsrEFWodoEwL8jtrM2cUVMtMatI2Ege+Sv3icW3WeF/TEPwNQdjCM5FFbehg71 qww84B+pRXxgp8XHa+WZMKYryKG7prBksg12jvoxRp8kSF3BBpjKVgFGg59WUyb9Fsp5WPyMpo7 VIJM6Q9RuOxeiiTflj1OgeOkgNdKJOZvcYJ0RFQKY+lLajYhYHYfsULhCczpuNtnsVRt78Rn/mg fO58xoCc4je5yUxyc0W4LbTUJFVz3AJgaOmbS3hDN+iMam56cE7W5Utuwtyq2waSK/e1YImjehg A1gGbbDxFXWYCJ2AMQaMHge0hmTU5gPCrUoGY3hvpC3P X-Google-Smtp-Source: AGHT+IFO+PDwMeyLa4EGhItdNdod3PivHdGg2tuOsQqj5N7me/+24tmsBkj8Jw+BltKmizpirWlssg== X-Received: by 2002:a05:6a00:b4e:b0:736:533b:f6fa with SMTP id d2e1a72fcca58-737223bf5e7mr3790179b3a.13.1741973518933; Fri, 14 Mar 2025 10:31:58 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier , Anthony PERARD Subject: [PATCH v5 12/17] hw/xen: add stubs for various functions Date: Fri, 14 Mar 2025 10:31:34 -0700 Message-Id: <20250314173139.2122904-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Those symbols are used by system/physmem.c, and are called only if xen_enabled() (which happens only if CONFIG_XEN is set and xen is available). So we can crash the stubs in case those are called, as they are linked only when CONFIG_XEN is not set. Acked-by: Richard Henderson Acked-by: Anthony PERARD Signed-off-by: Pierrick Bouvier --- hw/xen/xen_stubs.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ hw/xen/meson.build | 3 +++ 2 files changed, 54 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..5e565df3929 --- /dev/null +++ b/hw/xen/xen_stubs.c @@ -0,0 +1,51 @@ +/* + * 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(); +} + +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 Fri Mar 14 17:31:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017269 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 43C2CC282EC for ; Fri, 14 Mar 2025 17:44:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.915142.1320729 (Exim 4.92) (envelope-from ) id 1tt958-00054n-QN; Fri, 14 Mar 2025 17:44:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 915142.1320729; Fri, 14 Mar 2025 17:44: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 1tt958-00054g-NO; Fri, 14 Mar 2025 17:44:26 +0000 Received: by outflank-mailman (input) for mailman id 915142; Fri, 14 Mar 2025 17:44:25 +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 1tt8tC-0000xy-4O for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:32:06 +0000 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [2607:f8b0:4864:20::629]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3c86e576-00fa-11f0-9899-31a8f345e629; Fri, 14 Mar 2025 18:32:01 +0100 (CET) Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-225a28a511eso43038985ad.1 for ; Fri, 14 Mar 2025 10:32:01 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:59 -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: 3c86e576-00fa-11f0-9899-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973520; x=1742578320; 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=IWAagrMlOK8AmQpFhjvRXFSmBR8zSB/lyokNU6vYmg1G/4pGaIMDV6mhAyoYWHTDGx Vnr2TC17ao0KgQ6Efw7sxwVLuwmoaC3n5TpMCpAEdY0dtcclTHzLDgzb9Rb924xyiBrh cQAliMa1ZXtXF4bmbhhz3Ug0CUodzSs6JVjfd+JwUJoi8dkG/2MgGA6lSBW3WUECunl8 zDE6AM/9SoeH0vBRXl9WU0jGqZ0FSrRV+HzHN/KnQWrTREzCQKJuAoUbwUav22jyPbwt ujdIrTCLwK8Bxao+xBUFzmq/XZLDdBG8GX8mCYOd0VqtCFn2f9W0oYhN3mHtoZVafHHe ywkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973520; x=1742578320; 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=FPCuJ5zP7T9BmqBgkR6MQ6WOZqfhteZTn5lM18Z9ydo06hRk83eoU/fyhA1+YY9Xol Pkh2yI6QWUeLiQQUzXqpCcFTgUJsEnS+Ih+DRx2l0bgOLqHxInZrotwJOlbwcVR3k54A jLGe7DPQnpkStHrTauDOQOw6Et53h8K99kvx4HXRWDO3WouijylQFdO0Pr4x4v/Lbk6H SKxMu2BI3Huposc2z/h6KtngV7RSOZ5bLlRciNHHLwNEdzicln7f+YFfhrVp/fh9rth+ HZx77Kxl5wtBEYM82Bh7w0TO/DSR0x0UBduqNZxT+AfFQ8wxnff/FBZSi49tk2nSxOt9 4JKA== X-Forwarded-Encrypted: i=1; AJvYcCUrOsKqkR3Ji4BbYarCetAwwCjg2LLDx/dVDlSkPhAPUPvAnKYPbpesJL4xMtxnIu/5l8Oj2OVm3Y0=@lists.xenproject.org X-Gm-Message-State: AOJu0YzK2pFV8ZMk0FXrCLRUsCqzwyxTJvtOiE6HultAH5VKg8Tpv52Y Nt6M0vW/JtWzL75/0PAS+eAV6GNmCdSBXVFSgk8TY7NAiAlVAYfJWmA+UXW1ol0= X-Gm-Gg: ASbGncu6Ak5Qlqzr5N4Khhnaba+BXOHD+aGaXTSpiGoKtTW0IdBRIxgEYWk9TOIVsIG ZU4Q1Qkjb2lq7QD18sgoxQiGR75VR2j4p74vojVT92UfcxV6EW+cQ4XZW8tmIYje5f3v2pC5qa6 xZ8JepjZgyh3QxX2w9Sww5mLejtw3khk7EF4LIqzRxdX/XnAj/Yv7BnHN36Bt/SsXGtC9f4j73O 41+fsKkPequJveba4viYvmbPssrqbhZitCMNagjb/FjfG/T6wFg37+LWxkuF4zplr3CR2/gln6N /yflgWVRHe7ayoe/ykvkW1CycJsiAfwrGNyrLFm1UkZMt6/vYyLzKUQ= X-Google-Smtp-Source: AGHT+IFlQhNJcOD04DdXfXRzIQFpLw7YnyShzSPUUYA1tOEz0vWyEbVCk22Q9xZ8telIqsQxDa+sSQ== X-Received: by 2002:a05:6a21:4a8c:b0:1f0:e42e:fb1d with SMTP id adf61e73a8af0-1f5c1326a41mr6196288637.36.1741973520104; Fri, 14 Mar 2025 10:32:00 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 13/17] system/physmem: compilation unit is now common to all targets Date: Fri, 14 Mar 2025 10:31:35 -0700 Message-Id: <20250314173139.2122904-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017284 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 E517AC282EC for ; Fri, 14 Mar 2025 17:51:04 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.915220.1320789 (Exim 4.92) (envelope-from ) id 1tt9BM-00022D-Qz; Fri, 14 Mar 2025 17:50:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 915220.1320789; Fri, 14 Mar 2025 17:50:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt9BM-000226-OJ; Fri, 14 Mar 2025 17:50:52 +0000 Received: by outflank-mailman (input) for mailman id 915220; Fri, 14 Mar 2025 17:50:51 +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 1tt8tE-0000xy-4i for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:32:08 +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 3d3af37e-00fa-11f0-9899-31a8f345e629; Fri, 14 Mar 2025 18:32:02 +0100 (CET) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22113560c57so48295505ad.2 for ; Fri, 14 Mar 2025 10:32:02 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:32:00 -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: 3d3af37e-00fa-11f0-9899-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973521; x=1742578321; 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=eLhi9ASUnkQSDHrVRruCp4aY65MBDbjFSUxhDau/jAY0dmG67kOl5um9BggkoDDvep qz6f82MgXvqvevm2I/F1pLpb78hZtuIpotUNYuFUKyh/c4AEEwxwR2vHoQL3g2YodYrP LZ9rfrWVaJuOfDZApwxfEPVwmCNV/iGLwWfcpHyDfaDNBFVojg/WTon5ze2FCDpnCAF0 /Vc2O4+CsoJYgOIVHJBzMO/4frUKaf0k1QSAIAuzhE3LmmqW1x8pRVLwvvWvtesuVP1v ZPs7zNwtMXDcS/hzXBf9gOD35fcJtWfaYuv8MkpCXMc1zNbiR0vSD/+1Y1e9R0N/0YOA 5Xkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973521; x=1742578321; 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=JwdlmsFh1ymOkU9N/abqyDoB0r5W3BM97VujJKKJCPuNQfGDeryGhOo0XWKXvpZewr r3ZXc6uL56gO1gMJJaafEp12Xj9p87CNYrjd7n8/ECqh1dVJ7eTcabZz93jjuHshoTAC ezybPaLAg0SRSSwf+ZDgRh6azsQ0nAOgwVMzWMu8WIh0Qy5qiMuDd8bTGiytFTxtSX5/ CLPxWXZCQq3KoczLBrC/D19auC2jLVy+H//hPja1iY48MCFMuZE47tRMQgg+pqemfH6o KcOvfYJOwVCdpWQgEyI+qEg6Ug69UCV2FErf8Dr2k/vJ8IAqyZe6Zb1ZAWrM0RQGq977 CgZw== X-Forwarded-Encrypted: i=1; AJvYcCVXyTqPYdA3CHu8UIjwH+FyQE2u4knDrtqgbz9bSZxbVqzCFh8Q7MTuhHWOJyy37tYNRHo0D6j3Q7E=@lists.xenproject.org X-Gm-Message-State: AOJu0Yx0y3IAGxv4lJ5J91uLcLYEaTSCI3J5tIORT74d3jAWiMeWJsIo PTQe8SzXE0stQerEIs+/l7B09MpvEPR+e6S3t+X6OVwTWREZzhZAn0atM2dPVoI= X-Gm-Gg: ASbGncsze2Bn0w7C+JxnKxMlUc4Peo474lBzacK0SV+OaPL6CUfalhPhkF2J+YFQG3j ppkkfFlDc4tYk6C4kpr/HTXJj2JAmQ8ycbEbwn6vNoK4xxu3uwE/Hh5k5OvhL5X0/73ZH+Zoqie 0U79a4zViOiVFnBJsTSNyfYx8S/89MY/N1WJ57GrBo1EXq6YgU9zTb4ZTiSplYg4J1OqnoIHhEz puxzX6hicuskORua0ezntav3y/Mw8lnEle62xRftIK8stp1/EIydW0ZNdm7dYTPu5cI8lP5qb9k /ueH7m0JlxEpZ5nnKMM3mEqtOUIA8TW7hDNB7yvOVC4n X-Google-Smtp-Source: AGHT+IG6cCxvjsVBwzL07VH+mus/++8may6iqII6GPehxKvNj4VKnHVcl4393YyfiqPTiVq1ksSu0w== X-Received: by 2002:a05:6a20:9c8d:b0:1ee:efa5:6573 with SMTP id adf61e73a8af0-1f5c113f552mr5261243637.8.1741973521265; Fri, 14 Mar 2025 10:32:01 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 14/17] include/exec/memory: extract devend_big_endian from devend_memop Date: Fri, 14 Mar 2025 10:31:36 -0700 Message-Id: <20250314173139.2122904-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017265 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 396C0C282EC for ; Fri, 14 Mar 2025 17:41:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.915059.1320688 (Exim 4.92) (envelope-from ) id 1tt92Q-0001jd-Pb; Fri, 14 Mar 2025 17:41:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 915059.1320688; Fri, 14 Mar 2025 17:41:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt92Q-0001jW-Mq; Fri, 14 Mar 2025 17:41:38 +0000 Received: by outflank-mailman (input) for mailman id 915059; Fri, 14 Mar 2025 17:41:36 +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 1tt8tB-0000Ih-Rq for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:32:05 +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 3e033356-00fa-11f0-9ab9-95dc52dad729; Fri, 14 Mar 2025 18:32:04 +0100 (CET) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-22398e09e39so51807585ad.3 for ; Fri, 14 Mar 2025 10:32:03 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.32.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:32:02 -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: 3e033356-00fa-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973522; x=1742578322; 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=ipPAyCMNYKQgJ+e1Pj22cNEjWMul6XXi9iVGdQZJ7Rc=; b=RVxT1nJMAeHp6753vqOl+3FN9eP7M9RUNM9SSPBPY/r+fC2/eRLJLx4LN6svDeBH+O s7WUzAqctoB1/r0bJTBIMtZxTdxWMXnFTFzKKAA2cdcZCn5ttaz1m2MDyxVDV757kLDD qyi/98WyCQ6cX0vMSVeIfJltc4cg0Qv37S+kqoh9FOPSYu4QBHNNxdMetSkRWJU69C6C qN1wHGPbyu5cQifSVIMaXFaMHIoU4oZq+EeZtQ/iRHU/juII9xy0mIhYt2fEuwFresZx rikkgzMZhjQlB1Z8e4WttmviteGQaHPt4JTANIKzCJA7R8abIAH8/J8pCjKv85JD/X9K xQqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973522; x=1742578322; 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=ipPAyCMNYKQgJ+e1Pj22cNEjWMul6XXi9iVGdQZJ7Rc=; b=K4Qjbps2bwarcEsIBb4f7XCXELKO17V6Cihw1mTMbqeKZKQDCnSDpm6vYvN04PjEYI sMq0A4v36ysRD7bGKwwabUiVu7Kh9Hj2lPV/piDfmGXZcDkZz7OuJAjJUcxJtNOJxnil ZwkAqDtFdenhvkQL2Ui+sdiiRLUGATBADkpMrEQl6IkT6Jl5w158T+KtESX7fS6pquBe 02KiTY0bM/aJMDUOFiauegN4S+/wU0JqNHTIzfnZZSizQl+FSUcuIqBAD8RfCLwMwzWw nUcDSgcIEle2X2lGx+QMUTPw9PyCEczw14VDPv5J4YlgaF3qMEp6KZSTfyEtR9d3nOhg 67kQ== X-Forwarded-Encrypted: i=1; AJvYcCU0Dgq+NHUiYdnEYIsrRihUqMCRsx64uIX2qSWlYvMgyp6dFXYKP75VGY+eiZjhANrB+CNN9codyDM=@lists.xenproject.org X-Gm-Message-State: AOJu0YycBeEmiDAeacVegtvwAlY9lmp4xGjrXIk7OPivaignQHcXSI68 Xz25groSQbtQfN5bXOJL2QXyBG82NaumutVeBrCU78mHRVs/RDg413dTMxBI1bw= X-Gm-Gg: ASbGncs+kUx0LBjT8rWI7XgFlX4iWliU2/exC2FTVk92gFJhw/vQX3ap7J/v7aSklTa Y7IQuEqTSBCzrCnTUWzEuM5vTX/EIF6Mnol2cSPxKTd5Kowh6+OvnCkiu9GWGhTnme7UvaL+jrJ CFAiO/umN4GPLSiv7s4dvyEzMS94qxV/arkp5GyQEWHCVSjxBJUhBmlsDn4mR2e/6D59gA5tEak 419gbZqP4uLyjrUWFgZEVU5NfVJ4UuOHe7cnjUjX24xBrfz4QyEb6SQDS6tVCvuOK5q7l33hzaw E4EzefmCgPrK/NHgiJmUeM/QjLAnHTnon5QUPJ79J4iE X-Google-Smtp-Source: AGHT+IEtHSmevJ6R5avE3bKBZZosO5sZ+P9hAoOgJtZ8OftQtbIF6mLlVq94OOMFZzJGHDBT5BJrHg== X-Received: by 2002:a05:6a21:6d88:b0:1f5:7873:3053 with SMTP id adf61e73a8af0-1f5c12ec5b1mr4773946637.29.1741973522470; Fri, 14 Mar 2025 10:32:02 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 15/17] include/exec/memory: move devend functions to memory-internal.h Date: Fri, 14 Mar 2025 10:31:37 -0700 Message-Id: <20250314173139.2122904-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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. Reviewed-by: Richard Henderson 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 Fri Mar 14 17:31:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017270 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 A1E37C282EC for ; Fri, 14 Mar 2025 17:44:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.915156.1320739 (Exim 4.92) (envelope-from ) id 1tt95O-0005d7-5G; Fri, 14 Mar 2025 17:44:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 915156.1320739; Fri, 14 Mar 2025 17:44:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tt95O-0005d0-2c; Fri, 14 Mar 2025 17:44:42 +0000 Received: by outflank-mailman (input) for mailman id 915156; Fri, 14 Mar 2025 17:44:40 +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 1tt8tI-0000xy-5G for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:32:12 +0000 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [2607:f8b0:4864:20::636]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3eb861af-00fa-11f0-9899-31a8f345e629; Fri, 14 Mar 2025 18:32:05 +0100 (CET) Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-225d66a4839so27413145ad.1 for ; Fri, 14 Mar 2025 10:32:05 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.32.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:32:03 -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: 3eb861af-00fa-11f0-9899-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973524; x=1742578324; 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=caI3rs+otVvKwdYgVP5CABrao6jK8ZQ4qsXSHgTDeZVHflhBu1lzgdBXe4Lg4RXQ5A M41IXQcZXrBLJB8OvaNtOQZ+UZCDN8k6Bub1l7Yd5EH7XHqVODJPnO06KSFRWtJBjoy8 4GbrRFGUN/Pftvj8aniUDgbewPtRWzB4eTWO+++QEQ6N6eDmnbhD/nE5/S/LTQ4+I/9v 6TRbr9bBscERKRtaNi+gCnfpzxnqGR5qo8c3Nbsm56Ew/UaSzrBOfpilrkBNcUzXJHDw zdS4XDWIEM7KLzP/XpJ5pajJHdD03PAVMJKpE6AMJTkeg70fal5gGTYQsdD//Nr2xd/b t7ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973524; x=1742578324; 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=Pqzt605BO7PgypEJH1dr5yXVekwjJ/nLweebbWM1MiYU49gUvifPWTz9IQzWeCs0Tv EGHtgkqKRgQagTeFhgUt55XUsLh0cPOzOPMcTWQYuyrzYAcwwlfn6ii010h8/7rbzLWC f3yow7nML7hY7asdKKDuF1U0ImlJ/KTvvr/YZRY+ST8zC41+NzVQgjFtotwSqQM+ldal 74ArdOm+Dmsjua2PoSDr+bmL9wOLpfaExDFbFziHHjCSLk3Szcw6Z4ub+NP04ZnDRVam ahLa4DfGYiorx6+l9JWq8eh+6es+4HOyXbP1jKyLciddDKenVJ+7LBgIBbZtVwQkpSun Rt4g== X-Forwarded-Encrypted: i=1; AJvYcCU+TwnzkuWPR5xiq0kTUnjTjYt2p8nftX+F5jw/rop0PxtrVzWBlY88pu6/222h5DwItSvTEGhsFGM=@lists.xenproject.org X-Gm-Message-State: AOJu0YzK0IRrmoqvuGfVdy7ig7SgMYqiuhDXe7oDqOr8fNKLjw5qY3B9 YU0C3Sa77lZd52OxYv61EyWx9TurJWwYloMVKqyhK3LtU3Sxwf9SlD6G1KeDcG4= X-Gm-Gg: ASbGncsM1eJGIt92tX4FHYUoYsMaTTdp32ES+hkus3V2ocmpIhxJXDYosbaFdNQVkzj syKqajqievP4wEP4+Ehr9jA66rzjSGEheiv2KVxtPws4v7h9aPrLZ0P53mjoINbIR6ExCdwJvYy FYHR0R1COZsr1AkR3RPtiDv0IZJHJ84RMCr4jqoyZSa01AiOmY1UvUbBYcJK5TKoZcnX9nX7bhC peXNG+OsHuow7xro6KTuceMCMkXWfVa6uFzLzKCzYN4qI6VXLlNkAqlUiE3AfaB/kqQ0muH269W eQURxi0CIXuxYjrMnhKr1b3wYwGBPQeKw6xQ+tEOKOc4D24AHK33c/g= X-Google-Smtp-Source: AGHT+IFTScYSX7clzsDQUywbpsrF2iPQsXcqATUvOkRpCep5DuIqTnkqpSfhY4o7FVAe26d7sGjRdg== X-Received: by 2002:a05:6a21:1583:b0:1e1:a449:ff71 with SMTP id adf61e73a8af0-1f5c279ef94mr4638551637.1.1741973523678; Fri, 14 Mar 2025 10:32:03 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 16/17] system/memory: make compilation unit common Date: Fri, 14 Mar 2025 10:31:38 -0700 Message-Id: <20250314173139.2122904-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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 Fri Mar 14 17:31:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017272 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 321DAC35FF1 for ; Fri, 14 Mar 2025 17:45:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.915190.1320764 (Exim 4.92) (envelope-from ) id 1tt965-0007HL-U5; Fri, 14 Mar 2025 17:45:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 915190.1320764; Fri, 14 Mar 2025 17:45: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 1tt965-0007Gg-Pp; Fri, 14 Mar 2025 17:45:25 +0000 Received: by outflank-mailman (input) for mailman id 915190; Fri, 14 Mar 2025 17:45:24 +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 1tt8tD-0000Ih-Rq for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:32:07 +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 3f6763f4-00fa-11f0-9ab9-95dc52dad729; Fri, 14 Mar 2025 18:32:06 +0100 (CET) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-225e3002dffso13001315ad.1 for ; Fri, 14 Mar 2025 10:32:06 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:32:04 -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: 3f6763f4-00fa-11f0-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973525; x=1742578325; 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=WswtqiDOjjyqH1FZhOiRRlf8vyvPmyfFHu3YMvOJO4G5ypHBQ7zRXqPAK6eo8p1MK8 fsWM+gyq2gLkyYbTPkfQPmgTv7vZvMhdeNQN5VGPPFaEf4TdvBw9jjzyz3phJbWAd+Fx CySvCzRALBhz568snOCpyyRoQlWZRBsZLgVbCxCQmfL52jDfkSbgg/jA7UWVGvKxhu7o GX0B85RXXcuWqCoD14gE5ckzoG0VivtqW+lQ6XmfHky/JUjZ3ovRp/OdK9gvsDALdMvB Pb7RuAcJlV27IlFCI93/PlLAKZUT0RkI7tTlLw/6nkHH+ITzab2P/9jWksUSfyulTNQ3 6iwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973525; x=1742578325; 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=VQPZ95oUEJgV5tpT7+9V7fYvJqNNNdSxdjCrx4TrJj2cHWrbHHU2D/3YQCuJyWbpja fHQ5B1tWGq31Q91BF+sRAK5TegufHgMdmYrhgz6Lm53u7qGOrOaauN+5DTlnmh7AxQyf 7oK6Ck4Qte4zcAqemCM/eUEvH1uKY36NNCJLbY9yp2LyPyAmozn+SEENP05YWXVad1+Z HozLm41AV1p5nqQcH8r+j5xQDkkkWh5A/l9/c6pN2h2AJuJB1fXc51acnoJ4Ntos+nyx ov/Y/ip8JlwiUuuPCOqSfkSwFGpcVnwoon0Yum42bKwztXxx2EkKlBIykAGED+JEkdLK NIRw== X-Forwarded-Encrypted: i=1; AJvYcCWgQ/GOeRpL3a4e4N1EYFr+7cOKuZjwV6BMiYWdrlcK7Nn/TWcstAUloOnWbD9/jcPHG3lJ4UB4mjg=@lists.xenproject.org X-Gm-Message-State: AOJu0YwEzhzpfKt6RfWz5Os44prg7GqzvC9ujXtNRzMeEiXbu/fBuX3u JJQ+iI+Vk7rCwoGTTfZlEcYXXxHtJRodjceurw+kSxbrwjpxaYtPQAXZ9+ODInuyH75NxjJNF1y 7oW8= X-Gm-Gg: ASbGncsu+T9QHyuZ93yftegTEWJYs9kJzEXNU3Oxon/aT3x3FklbBNGRm9n95CttW07 kEus7pKORgHHj5KkGjNcjcWUAVipAI7j6g8DEYaiRakupRQPpahXfdxaROKgot41IrVzfLnxDGk peI6SghwPXk2UFA4rJejEwIgh9jMEDWWkRd1vlWxM2ByGSturan9YFV9pxlZJygZJq9ynVKMn82 I32kwwuwpeZtjE9WmBrSpnPEBiQBlCIz/AF0t6Y9QLYUcYRKOzfZ2Ec2gIRae5dopla3uYT6zv1 Zx8nur0x1zdkBJCvQuLx12fwh/aHWL9ix73bMnQkYeZO X-Google-Smtp-Source: AGHT+IHKE9NhNFaDqc44peROMWsjYJioKgZvs6KA5f3lAVTw3ISh5g4Lmu4Vqxy0jtgBCp9rXQffRQ== X-Received: by 2002:a05:6a21:1f81:b0:1f5:75a9:5257 with SMTP id adf61e73a8af0-1f5c1174fd0mr5240657637.13.1741973524846; Fri, 14 Mar 2025 10:32:04 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 17/17] system/ioport: make compilation unit common Date: Fri, 14 Mar 2025 10:31:39 -0700 Message-Id: <20250314173139.2122904-18-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-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',