From patchwork Tue Mar 11 04:08: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: 14011066 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 46733C28B2F for ; Tue, 11 Mar 2025 04:09:36 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907015.1314309 (Exim 4.92) (envelope-from ) id 1trqvP-0000ff-Vb; Tue, 11 Mar 2025 04:09:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907015.1314309; Tue, 11 Mar 2025 04:09:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvP-0000fY-SE; Tue, 11 Mar 2025 04:09:03 +0000 Received: by outflank-mailman (input) for mailman id 907015; Tue, 11 Mar 2025 04:09:02 +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 1trqvO-0000fJ-2e for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:02 +0000 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [2607:f8b0:4864:20::1030]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8ee12b85-fe2e-11ef-9ab8-95dc52dad729; Tue, 11 Mar 2025 05:09:00 +0100 (CET) Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-300f92661fcso1724700a91.3 for ; Mon, 10 Mar 2025 21:09:00 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:08: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: 8ee12b85-fe2e-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666138; x=1742270938; 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=QSIGkaZavC1QxSA5/aRCC2Kcj7KeBDlPtwOnycoI0r7AYlC80dxWIbJpzvaK4j7wW/ kt2QkXrON1Eofzn6w7+bcPM9LJxw8sLpXcNDYpOIsIqJqk42Ocp+xprtTHrqz9CuzpeI dnz3ipftSgd4uFJhBpXwY9gLN1J9IUMwiSRUDJD478QdqbHMXn1CUS58mBp+aW4EXw0s fEdWbE5/ANUfUbKVsMbZRimldT6Vb4hiTREG2qLaWcfjcugKQbgTunlpkMNQPKAb3+hx Sdfc5Jy9C7HaXHR5MYh53ajOwVj9UMPo1bp/qfQ14SMIrXeJPp1QsntB5c4kcN8MbUfi N95A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666138; x=1742270938; 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=LVkNPbDqb+2feCCAuHGfZQTZEtSaaG56HAfqWmKQQ53ONrZDAA46D6ROVdFyHG46nI rj6AqGSplTvcLMYO/lLR5k06kp28P4TsHIH4qcqTrWe2Gdz7Iks8OdOJJdYj2/hlwuDe //2x/1gu50jMqn7kvWzwzIj7qNTgbZReDR1cLwzr/NgFhbxHfPLxxjmBaPz/ePpG2sS+ 7ncsGFEKyZF3DO2s9CBJIrM7EKe+Gvz1UXxqh5UGuxyGcfbdh8ld/qiXDLEh/j7PcY92 qhIT84USkdaRcDbqDH5z5aknZPK5ga6FsEiJZQUydZD6t+4dd/rzg7nwYC2wPtz2iFV5 /EYA== X-Forwarded-Encrypted: i=1; AJvYcCUbn69sO2+PeavTPJAfi/qtokfI7NiLXYsUN6EcOGHbyQXPW+tlehD3y6mZBmxrCXGo+FtNxQn8WG8=@lists.xenproject.org X-Gm-Message-State: AOJu0YxuzqIYVUs4uNUP3bSrK051pYD+qHzenIqXCwtuNdBXb7F5r3ZF 4jSefw6UpO+EvqhrBJ0GIQ2ahXCQsElmVgXSBKfJLjDqwQcFxUB7hDqdvwUpqYc= X-Gm-Gg: ASbGnct43PpZZt79HiliiFv4/qd1BgZVSfNc9pOtrnAndlQDJB8OSV03GNdntm1ixxG X1TM/lbABhtHa+zN5DnP4w6STSu735B6sh5R9UoZQWKL+xJMfugeGRdB6S7/tL7UeIejWcoXVaR xfNe1rqpglcASX8w9R0ip3fWepDosSrk40g2dIWII4QvuT8d/rBMObixfJWOhVGLKroYRWf9O+4 NNvKhC2NWcBGelGjCkgY0NUK4xAQKzxbyyDTZkuJRRAcEUtT03qt8BjjfT2WqmctK6rdk4xwicx 7a5zIPm/849ZAIdBvh4aOzOPYk+LyskWGftrHiyxiXkq X-Google-Smtp-Source: AGHT+IEzBJ4Y504tWVEKTLiAl14rUz4i3nUGGoyaKrgK43oaArjDd5np2LA5f1JQHmiuxtYBHKlEDg== X-Received: by 2002:a05:6a21:b97:b0:1f5:889c:3cdb with SMTP id adf61e73a8af0-1f5889c6dc7mr5899820637.8.1741666138527; Mon, 10 Mar 2025 21:08:58 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 01/16] exec/tswap: target code can use TARGET_BIG_ENDIAN instead of target_words_bigendian() Date: Mon, 10 Mar 2025 21:08:23 -0700 Message-Id: <20250311040838.3937136-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-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 Tue Mar 11 04:08: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: 14011075 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 8FCCFC28B2F for ; Tue, 11 Mar 2025 04:10:14 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907038.1314422 (Exim 4.92) (envelope-from ) id 1trqvp-0004Ob-CN; Tue, 11 Mar 2025 04:09:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907038.1314422; Tue, 11 Mar 2025 04:09:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvp-0004NO-23; Tue, 11 Mar 2025 04:09:29 +0000 Received: by outflank-mailman (input) for mailman id 907038; Tue, 11 Mar 2025 04:09:27 +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 1trqvn-0003IE-Eo for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:27 +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 8f8cd8cb-fe2e-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 05:09:01 +0100 (CET) Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-225477548e1so45549675ad.0 for ; Mon, 10 Mar 2025 21:09:01 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:08: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: 8f8cd8cb-fe2e-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666139; x=1742270939; 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=p9XKPWEC1FDWwfXw4amuYrHiaWnSduBZ0xkgSDXw7jg=; b=GQfywY3MIxqH86zEipic01g+SOZZzmBk4CoeHOvaO0kNGX0NCggqYL8HVQnuCNTCaE 29qPO3D2nhX+hualstaAJQU+6TBFuHaH6HoDgW1w5Z42LF77IqeuYCoh+qQm+NSGGSmc y3Uso7Cwc7xlNKd/Rlm65brmfSFoOQJpkSmoRns/+JZZzMHNZnycOanAGTk5UX1S9W3E 3jZILVxRwGJ49K9q7yJVIFC6PpuHdaSIM5cp5jiHzND4/l9Jht3RiUTw1bq3yPdWg0hV IgijoZn4yWjWyOormLqZmEbn7v0NqbYjeRmnhCpagMdoL7f8bZQw2HU9nHtNhXqfKLaO R7WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666139; x=1742270939; 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=p9XKPWEC1FDWwfXw4amuYrHiaWnSduBZ0xkgSDXw7jg=; b=IqyXJco4bfwk4sUQAbrfBgx/ruDNJD+1UJ7doOoO+PclkiNpIg0RREp8hUaJk+6+Kr Lt8nF5MsCYa0h37kxOpm1Olz0UabbAuKCEfbH6ocaCfV+dkI3EBl0xgWFuAT2TbjHjAa Fwnm/Wiqd6IMNELArfkrm/Kf8cSVHzkxYXxFdAShw+4n2FaYqcggxMV7Z5TopIMMw8zf 2gPic4DgFCyy2mNG03/XPtwGl/3lj61R9t0AZ5oSxGxNkj0c6skXbz9ckYsysC3cDmC2 5ExXHyhxN4HZo09fz1FWCPv6ZUL70qiJpaFJh3bvKhuwwAWo/ER2E85NeJ9dfiJM2UCk hxgA== X-Forwarded-Encrypted: i=1; AJvYcCUO3RasBoGHHanfKXRF35dQCeBlEg6U5g5fM5915yIgSUihXxViJLJUuCMbB27fkHwfWHlVoGtjYkM=@lists.xenproject.org X-Gm-Message-State: AOJu0Yx9IqMdgNENKz6saShPcThJ0S9n9brE8ySbjgOudwGA7Ct/BFJT Zv0j465BIysJKBnao09FZfQklYwxEwb4PVD03jxMjHSmrIo6qk+UlSCOI4wO9A4= X-Gm-Gg: ASbGncvktes1RLSd63jjGaSdFdQsdpHEAN4BV/TJz51eXaIWI4G8uA1QbxmANG3gUX4 zKkp7NC0sLD3olt+keZd2IKqDb/RcsAyOxhJshvsfUoNOcee7e8uhLAry/ZYLqa2R+UIxTPIb8K Jgd+AwZIn0xIgCKZUxVM+5IGfdUD1kzTZW0NZ4lMx6oAX4dsvFY6mPP+TiKVS67/FvHY6RxSGZt Ow3jAMohz8mwKh9Bl8hRR7x+qAfgPFUbzOwbamAjczEGUayHu8kr3wN7yayw/zenvlVaVaGJ8f2 okFQLQVGFBNbmM0UE7qT7UvwrJSVb5w9qAGi8YvTW4tG X-Google-Smtp-Source: AGHT+IFULxKXKLSRt6Qs0nLWBVqgQyDOkjRhSbU6XrRQVwLJue3Ph3bi7X9tYlurUTD8KJTtNJkwJQ== X-Received: by 2002:a05:6a20:2d24:b0:1f5:7007:9eb7 with SMTP id adf61e73a8af0-1f57008366dmr14192716637.37.1741666139634; Mon, 10 Mar 2025 21:08:59 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 02/16] exec/tswap: implement {ld,st}.*_p as functions instead of macros Date: Mon, 10 Mar 2025 21:08:24 -0700 Message-Id: <20250311040838.3937136-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-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. Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 25 --------------- include/exec/tswap.h | 70 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 8cd6c00cf89..e56c064d46f 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,31 +38,6 @@ #define BSWAP_NEEDED #endif -/* Target-endianness CPU memory access functions. These fit into the - * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. - */ -#if TARGET_BIG_ENDIAN -#define lduw_p(p) lduw_be_p(p) -#define ldsw_p(p) ldsw_be_p(p) -#define ldl_p(p) ldl_be_p(p) -#define ldq_p(p) ldq_be_p(p) -#define stw_p(p, v) stw_be_p(p, v) -#define stl_p(p, v) stl_be_p(p, v) -#define stq_p(p, v) stq_be_p(p, v) -#define ldn_p(p, sz) ldn_be_p(p, sz) -#define stn_p(p, sz, v) stn_be_p(p, sz, v) -#else -#define lduw_p(p) lduw_le_p(p) -#define ldsw_p(p) ldsw_le_p(p) -#define ldl_p(p) ldl_le_p(p) -#define ldq_p(p) ldq_le_p(p) -#define stw_p(p, v) stw_le_p(p, v) -#define stl_p(p, v) stl_le_p(p, v) -#define stq_p(p, v) stq_le_p(p, v) -#define ldn_p(p, sz) ldn_le_p(p, sz) -#define stn_p(p, sz, v) stn_le_p(p, sz, v) -#endif - /* MMU memory access macros */ #if !defined(CONFIG_USER_ONLY) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index 2683da0adb7..84060a49994 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -80,4 +80,74 @@ static inline void tswap64s(uint64_t *s) } } +/* Return ld{word}_{le,be}_p following target endianness. */ +#define LOAD_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + return glue(glue(ld, word), _be_p)(args); \ + } else { \ + return glue(glue(ld, word), _le_p)(args); \ + } \ +} while (0) + +static inline int lduw_p(const void *ptr) +{ + LOAD_IMPL(uw, ptr); +} + +static inline int ldsw_p(const void *ptr) +{ + LOAD_IMPL(sw, ptr); +} + +static inline int ldl_p(const void *ptr) +{ + LOAD_IMPL(l, ptr); +} + +static inline uint64_t ldq_p(const void *ptr) +{ + LOAD_IMPL(q, ptr); +} + +static inline uint64_t ldn_p(const void *ptr, int sz) +{ + LOAD_IMPL(n, ptr, sz); +} + +#undef LOAD_IMPL + +/* Call st{word}_{le,be}_p following target endianness. */ +#define STORE_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + glue(glue(st, word), _be_p)(args); \ + } else { \ + glue(glue(st, word), _le_p)(args); \ + } \ +} while (0) + + +static inline void stw_p(void *ptr, uint16_t v) +{ + STORE_IMPL(w, ptr, v); +} + +static inline void stl_p(void *ptr, uint32_t v) +{ + STORE_IMPL(l, ptr, v); +} + +static inline void stq_p(void *ptr, uint64_t v) +{ + STORE_IMPL(q, ptr, v); +} + +static inline void stn_p(void *ptr, int sz, uint64_t v) +{ + STORE_IMPL(n, ptr, sz, v); +} + +#undef STORE_IMPL + #endif /* TSWAP_H */ From patchwork Tue Mar 11 04:08: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: 14011067 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 77360C28B2E for ; Tue, 11 Mar 2025 04:09:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907016.1314312 (Exim 4.92) (envelope-from ) id 1trqvQ-0000iq-4q; Tue, 11 Mar 2025 04:09:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907016.1314312; Tue, 11 Mar 2025 04:09:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvQ-0000hU-2A; Tue, 11 Mar 2025 04:09:04 +0000 Received: by outflank-mailman (input) for mailman id 907016; Tue, 11 Mar 2025 04:09:02 +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 1trqvO-0000fJ-Ks for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:02 +0000 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [2607:f8b0:4864:20::635]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 902e64e9-fe2e-11ef-9ab8-95dc52dad729; Tue, 11 Mar 2025 05:09:02 +0100 (CET) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-223fb0f619dso93349925ad.1 for ; Mon, 10 Mar 2025 21:09:02 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09: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: 902e64e9-fe2e-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666141; x=1742270941; 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=KTcsPgfp4qWHKI5IiGC/xRJnn7HmZtcbIn5ZIF7f/ys=; b=cSbNj25mA5HsZT5KVjKrE0TLwJV6j9DrVK5wgfTSbC3nASEmC8LQqvS2O/Ni9rsnc+ G0OF8otUYOSUnS3iZ8OBiHGh9bXN8DigRl3bg5a1AhbB7Q6dj//F3fgm+TF5NgupOF1w rPWd5nIhor0AnwVchF639ppfnmvjoLZmaeYDA5O/heas/6U+bbCjmAEPIP610qjjgk99 zgzLiJKyeuMly6na50OJVHd8zvFRnNtda+YmDzzDyWshND7By7iUcQzlnnvy6DrtAPKl SQ523UA4F4wMh21d/cgUlplO2+9EoLPMPda/HrbDpGVT4sgCvUAiaSsE72DVMH+p7B/p VFkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666141; x=1742270941; 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=KTcsPgfp4qWHKI5IiGC/xRJnn7HmZtcbIn5ZIF7f/ys=; b=KfwbGOq1OLAp6nTkU3+yORFIVW/IZ4VScFCgZWs/zn0/Pha/Yu0arDZ4gybRfj4AwU 5FYkr+l/7XEGnYE8iYnheAghxJsXbvT5aon7IXseryx9FDjOQlywTNYmYeJo5vI7lsLO 83TXZTchAgZySSVpOHPG/IfRd5eUEC9Np4eqxtG5sEmAYmdEdhZHQuLsrM9pC1SOaf4l Ce29AIAYHaMZzvotcKH2vjKnpYAwm4py3mSbnEIoNHhRPL/j+eB1O0frYah7CLfdPYIn gZ6EacdfZJp+SyXF6TCpmQOkqNUaejA96/sseLPdzQPe5qmoH6FpTHQpCKZ1porm3J7Z tkLg== X-Forwarded-Encrypted: i=1; AJvYcCXDFQQK66w1OC6jAKgNdYILvAw80J7JkRM+MBWvSh2n9kd/yfRvaqDDa4h26+1kbLAKigbCSBJLbZY=@lists.xenproject.org X-Gm-Message-State: AOJu0YxrKOa3q93fEyzPZFLiK8IInFz0LxB73Jg0I1L7Dkx7OuwZpOsh n+C9M/G9gC8hIDUL6ZeWeJs/sxWVynQKKU3ufIEQAUfyW6asTz56ZP/UtkHDdYE= X-Gm-Gg: ASbGnctW4VlWONDzIbCw7Dk/rzOoydnpXKFcxDHMhstF0mjbHSNmPuoS7a1WYiz+BpE NcJEMjNOLYXLbnic2iNucdj1HlAx7eH+XEuA+wclRr+b/7xkzXBNUo6SYP03/wkBYacasH3XMFY s9ozY7RoQ5sZpa/Bft+IeQvFPRwZlJfB/aaflBzfeRhnMMox8CaLWgaKXADiXwG+U0Ez/ldVofe TEGn9qqNrHyT7Hft8zveWaml/+IcYRAyDfXk6RUKH+V4iXk+p+VqZCeKfDzZgAG5xykvNf9RSFF bSjY3cXlOM9nC71e6BOqjPlcqVFKEqgW2tLZOgBLNocx+RC2Y1V7CyQ= X-Google-Smtp-Source: AGHT+IFvmMV6FR9w9HRJlmca+n7Q/Lcb7qpOce3I31boqIZsCEXwR+2F1i3uigVa31tDctZYbS6W9g== X-Received: by 2002:a05:6a21:6b18:b0:1ee:c7c8:ca4 with SMTP id adf61e73a8af0-1f58cbef8a4mr4223140637.36.1741666140734; Mon, 10 Mar 2025 21:09:00 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 03/16] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Mon, 10 Mar 2025 21:08:25 -0700 Message-Id: <20250311040838.3937136-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-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. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- include/exec/cpu-all.h | 12 ------------ include/exec/memory_ldst.h.inc | 4 ---- 2 files changed, 16 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e56c064d46f..0e8205818a4 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -44,18 +44,6 @@ #include "exec/hwaddr.h" -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - -#define SUFFIX _cached_slow -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) { address_space_stl_notdirty(as, addr, val, diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 92ad74e9560..7270235c600 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, @@ -34,7 +33,6 @@ void glue(address_space_stl, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#else uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, @@ -63,9 +61,7 @@ void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Tue Mar 11 04:08: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: 14011064 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 0E23EC28B2E for ; Tue, 11 Mar 2025 04:09:29 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907017.1314329 (Exim 4.92) (envelope-from ) id 1trqvR-00017g-Hq; Tue, 11 Mar 2025 04:09:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907017.1314329; Tue, 11 Mar 2025 04:09:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvR-00017Z-Et; Tue, 11 Mar 2025 04:09:05 +0000 Received: by outflank-mailman (input) for mailman id 907017; Tue, 11 Mar 2025 04:09:04 +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 1trqvQ-0000fJ-3J for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:04 +0000 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [2607:f8b0:4864:20::62f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 90d95c1f-fe2e-11ef-9ab8-95dc52dad729; Tue, 11 Mar 2025 05:09:03 +0100 (CET) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-224341bbc1dso60930655ad.3 for ; Mon, 10 Mar 2025 21:09:03 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:01 -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: 90d95c1f-fe2e-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666142; x=1742270942; 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=GZg0/as8vJD+8Um7sy7JKxAjMVLEtPUz9ZnXYeX+5Ko=; b=GE9FmSt5ZO/Lj56jkZSR0M/n+RBZQzPPAvseRCmGMDWaF0Zd1kJ34SQZQoSN2tF1OK wA0Dlr3P31b8NEsoh3nbyHbi/COX7gbuJo1rv86j8BgRPdarLMVfXG2ZtRBSoHbk8yrp y1Z6ICivtslL/N8XB5ViZkACgdhYGeqIiwwuW9Fgo/J6PrOdSF/N03IJ33KPJHfUoK1j gcHQL0OZFBmI8YAeUmyH7c6sCqBwujsqd62lcVGD1V8fT0HBkHAzWEeokBkl8GcQDQbW kRdRY4+8rw+vyIsrkbaCUk5fmqGYFz1YCc4htQ6ifR4BqgiOXd98Bn3JTIVDw8ydtG2g ytGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666142; x=1742270942; 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=GZg0/as8vJD+8Um7sy7JKxAjMVLEtPUz9ZnXYeX+5Ko=; b=n4MjXwcO7r8Q/NhCWGp7cjZMhcvhHnO5i+D0y5SNFQpfm8DkB9+jB4WbHinAIHqYrH Xo+UQ5DWrM1IQLDlcCCeWhmBfFNQbBZQxjHrDayJAH2sqm4+UO8csierW5yDw/Fiy9bT zgb3HXoWmkyq/PAirzh5FcK2YGYk0dICbKI+GeqKZ0mGePIIqdAynAMGDPvF7WeZm/eW f3ypkfukcq2a1vi3AUV2iupKon60sBGi19BbW1HyaAqLmVNQKUEhavBeZ2HTqBJe9biA LQiWbRUtsoALJQOu9Xjv9DxUnk/ZtyKiqAkSCN0DJXmNpuyhDG4vqX6JW2Or57jaKKHD BdLQ== X-Forwarded-Encrypted: i=1; AJvYcCVc9flUOnjr3qA8eqlPRI6qoGLHd2PyXVIupSdcMW1A/vP7Y4e39tHo385yvjuA3Ko+JaPDvpbHpMU=@lists.xenproject.org X-Gm-Message-State: AOJu0YwdetYUS8Mz5s0krYoBWBYWzLcX3SeXS0ioe9uV0JBW1BYT93QB BJYrsxSi44y08hMNQZgx94+It8DMJCAKvt5hSuq79K4qYKfYKbdaigeYIuv6AWg= X-Gm-Gg: ASbGncvRkozWCM/AOGo6DqBVfkyWlaikUUAkueWBDkSJX7aEucY1u4NZoPYxkkz082r Ir2Rh/ezqLm0H4M/P/ET1h9bc18Dhq7b0cOgCJtg76yaUuZrlljUmiXvnzf8kVNG1ljXTDwg7OS syO9LR/XyWuVxuvrPa2gmWbAyos8mSNKYB2B2Duo0jTdDsOtdMx/5iOZrxwGk0jXO/80bTk74VI VjNQZiwsYRhhiTjb1dj2A6YyACCzotAyxV4LkewyNtOYwGq8JK2lgJCyRGZcncPfXrDO53ncqPo tmk/JrVwJvYvT+ZFzJNdSVW8gCKlt+/xTGjfT6uxMBvF X-Google-Smtp-Source: AGHT+IEv6pfYhMlZcVFtUT8KTCc1zYGaqiUcLOn7dx2sPDPFPmpFWZtYBaUHHMwx5Ykg9mMF6L42zQ== X-Received: by 2002:a05:6a21:7002:b0:1f5:7fcb:397d with SMTP id adf61e73a8af0-1f58cb1bea7mr3411754637.16.1741666141836; Mon, 10 Mar 2025 21:09:01 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 04/16] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Mon, 10 Mar 2025 21:08:26 -0700 Message-Id: <20250311040838.3937136-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-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. 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 78c4e0aec8d..ff3a06e6ced 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -21,6 +21,7 @@ #include "exec/memattrs.h" #include "exec/memop.h" #include "exec/ramlist.h" +#include "exec/tswap.h" #include "qemu/bswap.h" #include "qemu/queue.h" #include "qemu/int128.h" @@ -2732,6 +2733,12 @@ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, #define ARG1_DECL AddressSpace *as #include "exec/memory_ldst.h.inc" +static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) +{ + address_space_stl_notdirty(as, addr, val, + MEMTXATTRS_UNSPECIFIED, NULL); +} + #define SUFFIX #define ARG1 as #define ARG1_DECL AddressSpace *as @@ -2798,6 +2805,9 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache, } } +#define ENDIANNESS +#include "exec/memory_ldst_cached.h.inc" + #define ENDIANNESS _le #include "exec/memory_ldst_cached.h.inc" diff --git a/include/exec/memory_ldst_phys.h.inc b/include/exec/memory_ldst_phys.h.inc index ecd678610d1..db67de75251 100644 --- a/include/exec/memory_ldst_phys.h.inc +++ b/include/exec/memory_ldst_phys.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS static inline uint16_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw, SUFFIX)(ARG1, addr, @@ -55,7 +54,7 @@ static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val) glue(address_space_stq, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#else + static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldub, SUFFIX)(ARG1, addr, @@ -139,9 +138,7 @@ static inline void glue(stq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t va glue(address_space_stq_be, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Tue Mar 11 04:08: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: 14011077 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 394D4C28B2E for ; Tue, 11 Mar 2025 04:10:22 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907040.1314427 (Exim 4.92) (envelope-from ) id 1trqvp-0004UG-Td; Tue, 11 Mar 2025 04:09:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907040.1314427; Tue, 11 Mar 2025 04:09:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvp-0004S7-Du; Tue, 11 Mar 2025 04:09:29 +0000 Received: by outflank-mailman (input) for mailman id 907040; Tue, 11 Mar 2025 04:09:28 +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 1trqvo-0003IE-F6 for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:28 +0000 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [2607:f8b0:4864:20::1032]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 917d52d2-fe2e-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 05:09:04 +0100 (CET) Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-2fec13a4067so7695710a91.2 for ; Mon, 10 Mar 2025 21:09:04 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09: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: 917d52d2-fe2e-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666143; x=1742270943; 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=igRm5DauylZU7kF6A9LJbRIXn+glPoGkFsEjcODvlvM=; b=B3qIhjGNC6w616SHELrFG4osL6QD6fRkSAp4uap6KhjrwVsNcpLksdtsc8Rgn3kmVQ UpGbnVYIeDK6lOqPmOcsfkGi7riUabdoSrqo3QeF9eIL86jkQCB7+y+HVKhispF59bwA mNQRLWi68qRz/Q5HYWjqEXibW7RWLDpqA+XD8LvgzqiQNUHaDAXZErhP2djwmo/QJkMZ 21ckhIDBSiHVPbeDy5787zsMJWNBjcXGzUhLQtcI1tPsvqiif+ZJUxgPMf+8E8SNyUcl EFLz6IzG4TrULtIZMBO653M1Z4EyZkrevmH5cd/bcH/AekD8hMuoqnGm9AtB6gqDHzt3 7Q3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666143; x=1742270943; 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=igRm5DauylZU7kF6A9LJbRIXn+glPoGkFsEjcODvlvM=; b=Y3lAQLTZR/Ng6nCr3b+PTPkJ860K5UTniCa954Kn/RaATrqQoI5hZKgwOtl24QbNUl wdSfmNN8qe+WKmMndcYYftk+88732O6WKbYgzflmIvf+LzCKoQMb4iU3bwwEx7UA1Y3Z hRW90AYXdHLilw5h1phygKkA+LQoHxBkoLuYBayMJTkZBIuN3sewxEqPVRY0tj3qfZ+j 0uQ8mBPgwKWHXZsnEllXq6k9RVdm/o90C8iL6W99HGV9ZwMrYc4GYiWJlU+cun7YOmZY T+Ed2mI31m/7lDsZmdMov9eet7xFEImyL7heT0ivGhjx+PDF3CdEzUk6Zj0kqQlg5ejr 2Qog== X-Forwarded-Encrypted: i=1; AJvYcCWjQgXc4K0/fKjhLTr01YICLktgfqEYOICK70846TNh0x38UkfMNzRqPCqCB4wJbHWvWMsQpsYjqvs=@lists.xenproject.org X-Gm-Message-State: AOJu0YzXnXoiRTGboTtfjqyZyopUmoaSuyFxMU2pObB5MAe1X0Hdmx+A iUcFluoO1xhOUxqyiL9SgsNd6zrTNYHjHsvbsrGTQ5nrEDNbubeZ45qlrKxMADs= X-Gm-Gg: ASbGnculGOI1sTF/XOJXCBPA7pmSXlgdAc4OE8/DT0gjcdiGG01c6fnyoYxqzOnyGGn mjhLx99dsf23WI4kfCRWgZgcTeRYtwpXAJ3jdhsRvIUSSJX30V06g2M7W2BjNHrwTkFyFm8K6AQ WK+iaVtG9yJWdzc4C6SGgcrySxalkhE/0KJEMjj5j75N4b5fyvStmBljhJc+GH6TmSHz7KqoGIl dos7C7WZ+nTobbctkJ6uPaj1hHWUb78e7NCc77v1Pt2InQ7rwnekh0BZn38O9crjr3KRXVnEhf5 X7Ogoo5CaKljKxtYbPOgfThIRdQP7JPa5qeQpBD1TxmJ X-Google-Smtp-Source: AGHT+IHqGisSQCK+iGHuI44FF+Puo0WshM2hC7DuGryTfuE/I3BKO7cRhsCQCZNyA9pqBEuzvyba5w== X-Received: by 2002:a05:6a21:3a85:b0:1f3:40a9:2c36 with SMTP id adf61e73a8af0-1f58cb20502mr3303668637.10.1741666142929; Mon, 10 Mar 2025 21:09:02 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 05/16] exec/memory.h: make devend_memop "target defines" agnostic Date: Mon, 10 Mar 2025 21:08:27 -0700 Message-Id: <20250311040838.3937136-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Will allow to make system/memory.c common later. 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 ff3a06e6ced..60c0fb6ccd4 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,25 +3138,17 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -#ifdef COMPILING_PER_TARGET /* enum device_endian to MemOp. */ static inline MemOp devend_memop(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); -#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN - /* Swap if non-host endianness or native (target) endianness */ - return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP; -#else - const int non_host_endianness = - DEVICE_LITTLE_ENDIAN ^ DEVICE_BIG_ENDIAN ^ DEVICE_HOST_ENDIAN; - - /* In this case, native (target) endianness needs no swap. */ - return (end == non_host_endianness) ? MO_BSWAP : 0; -#endif + bool big_endian = (end == DEVICE_NATIVE_ENDIAN + ? target_words_bigendian() + : end == DEVICE_BIG_ENDIAN); + return big_endian ? MO_BE : MO_LE; } -#endif /* COMPILING_PER_TARGET */ /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., From patchwork Tue Mar 11 04:08: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: 14011072 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 AD7D5C28B2E for ; Tue, 11 Mar 2025 04:10:01 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907033.1314389 (Exim 4.92) (envelope-from ) id 1trqvl-0003Rp-N5; Tue, 11 Mar 2025 04:09:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907033.1314389; Tue, 11 Mar 2025 04:09: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 1trqvl-0003Rd-IF; Tue, 11 Mar 2025 04:09:25 +0000 Received: by outflank-mailman (input) for mailman id 907033; Tue, 11 Mar 2025 04:09: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 1trqvl-0003IE-59 for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:25 +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 9228c9b1-fe2e-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 05:09:05 +0100 (CET) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-223fb0f619dso93350375ad.1 for ; Mon, 10 Mar 2025 21:09:05 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09: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: 9228c9b1-fe2e-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666144; x=1742270944; 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=wYUY7egDw13yHwOIShpp+yHE9Lg9eeptR3FMaPhbw5Y=; b=gXPpclS3LVHGQvNC0lT60hIxV2wPW8XtdvfbeysQq7Gia9bTrSHGYabEiWsfOO09r6 kv/0cUspprenkU4TKQuesy290rKTcud8TBVFjeQBDGAYIvIGShVSD3tnz58bHarIdVgw v5qdIAFPl8vQWL8X0INQYpEbmassVgN0oalgNM/NFt4zqW6KI03LaERRmSmvlF4IrHPX N59aGn2Po6RIaP1jvMxEQEhdlpQm0fktWcbDa2/HdzPI27sG/Kvu+yEk5TiIOGja27Uv Lxcte7y0ifQb7ZA0oZMlf2G+I99yT+BLjVywP8zmHvvZnU87O9tK2dk7jEqPOAnP/ZPB /9lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666144; x=1742270944; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wYUY7egDw13yHwOIShpp+yHE9Lg9eeptR3FMaPhbw5Y=; b=mMdXibXLFHPo8FaoO8+479nj/MYXd79D/+cfTiKl4mQDnxSnLZ9ckg1Jq9sgxx2fun +YNQzJMZk8BeYf3rI3mY1+Fgyw0Ia6cyVa/3Ha/CCjvOCMTAwNP/OxQjrcLU01S5hYnW c40+dryr2++RV75Bi58N7B3SmXecZnRVuxyWGthbkgec6JbInPak1/vXxF4Nf0M4fpQN GvNXGpWBFenU1VwCqTR6iFjL4OPs9XKo2tRTUGigUhEsI1e4xkuj48O/KVZPmYEOEAU1 xvD3T/oUPKCg7LiihU7OdxWpz52XEcgwFgF9xcyNsxvZSefxtmM1Mn/1pJZQiQZpDyAq N/sw== X-Forwarded-Encrypted: i=1; AJvYcCX10oCQ3YvF8zDhiaImHE9Uvv5ZpkRXTMgcouSCfPrktsVlgYIEelsqDFf+1ICks454ORLgGB6HmGU=@lists.xenproject.org X-Gm-Message-State: AOJu0YwYC6kpAW1mXuJ52gcdtPeg2XppypZuPk8rcn0UvpcSqYCehj7b MTBw+9cGnCcmrQiA+Aek3IDb9rYKy8BU6DIMaxVkk+9MxQXpt7acPICEqwUHUhU= X-Gm-Gg: ASbGncuvU/iZE3xcyUpteX/7Ga3N+0m/AqfHuFlonySotT1dWhlRpavSf05mQL4Mp/A zE+ZIHpQJMglWnGI7102JT90+wUh6gG6x/5zHMIJR1mm6vDOk1vYH6Wrr2Q91DOzY/hxLm9ARId 3Jf6bv+4oaO3Xi1YXXCC3OqP9Zaxfpc8obh8bcYU57m+2OeNt0OjPN5sQcSb6kYlNLX6Qt8z0ER r4Pa/L4OEkdG2ka7aAhhJKfhMbphtTeguePsWaw4WAjO7cP+4lGIb/RaaWRh7s9mbpNx6zagJAK w85JCwpIy4F6y4bB9MRflaWYz3o7q1CQL5ApL1WBWd9o X-Google-Smtp-Source: AGHT+IG1r91N/pZj/+/h4MYPAOLJfFbK6eObEmS4IiEzuC9Hkmi66055HrrfvkPljzn8i/+Wegt/7g== X-Received: by 2002:a05:6a21:4cc7:b0:1f3:36f7:c0d2 with SMTP id adf61e73a8af0-1f58cbf3befmr3240926637.41.1741666144062; Mon, 10 Mar 2025 21:09:04 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 06/16] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Mon, 10 Mar 2025 21:08:28 -0700 Message-Id: <20250311040838.3937136-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-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/riscv/bitmanip_helper.c | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index a02850583bd..bc46b5570c4 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -9,6 +9,7 @@ #define TCG_TCG_OP_H #include "tcg/tcg-op-common.h" +#include "exec/target_long.h" #ifndef TARGET_LONG_BITS #error must include QEMU headers diff --git a/target/ppc/helper_regs.h b/target/ppc/helper_regs.h index 8196c1346dc..b928c2c452d 100644 --- a/target/ppc/helper_regs.h +++ b/target/ppc/helper_regs.h @@ -20,6 +20,8 @@ #ifndef HELPER_REGS_H #define HELPER_REGS_H +#include "target/ppc/cpu.h" + void hreg_swap_gpr_tgpr(CPUPPCState *env); void hreg_compute_hflags(CPUPPCState *env); void hreg_update_pmu_hflags(CPUPPCState *env); diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c index 23958c6383a..18bbb1403c6 100644 --- a/hw/ppc/spapr_nested.c +++ b/hw/ppc/spapr_nested.c @@ -2,6 +2,7 @@ #include "qemu/cutils.h" #include "exec/exec-all.h" #include "exec/cputlb.h" +#include "exec/target_long.h" #include "helper_regs.h" #include "hw/ppc/ppc.h" #include "hw/ppc/spapr.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 6faf0e3ca8b..41306fb6008 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -29,6 +29,7 @@ #include "hw/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" +#include "target/sh4/cpu.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sh7750_regs.h" diff --git a/page-vary-target.c b/page-vary-target.c index 3f81144cda8..84ddeb7c26a 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "exec/page-vary.h" -#include "exec/exec-all.h" +#include "exec/target_page.h" bool set_preferred_target_page_bits(int bits) { diff --git a/target/riscv/bitmanip_helper.c b/target/riscv/bitmanip_helper.c index b99c4a39a1f..e9c8d7f7780 100644 --- a/target/riscv/bitmanip_helper.c +++ b/target/riscv/bitmanip_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" +#include "exec/target_long.h" #include "exec/helper-proto.h" #include "tcg/tcg.h" From patchwork Tue Mar 11 04:08: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: 14011074 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 3E3A8C28B2F for ; Tue, 11 Mar 2025 04:10:10 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907037.1314418 (Exim 4.92) (envelope-from ) id 1trqvo-0004KY-Tx; Tue, 11 Mar 2025 04:09:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907037.1314418; Tue, 11 Mar 2025 04:09:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvo-0004JJ-L2; Tue, 11 Mar 2025 04:09:28 +0000 Received: by outflank-mailman (input) for mailman id 907037; Tue, 11 Mar 2025 04:09:26 +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 1trqvm-0003IE-Eo for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:26 +0000 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [2607:f8b0:4864:20::634]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 92c27126-fe2e-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 05:09:06 +0100 (CET) Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-2239c066347so87017815ad.2 for ; Mon, 10 Mar 2025 21:09:06 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09: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: 92c27126-fe2e-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666145; x=1742270945; 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=JJTMw6tkQg2gyyv9VopXfGbD8re6/gGFQNon8Npv7Ak=; b=nUY7vh9cTpLoU7q8EJJVt+ubn7hqFkzNgXua6XjS9FoZMbizVUtkBxFBuA5j3MbMvq q22A7WVnisSX7ZlxwHiXzlQJsD8VLCTJ7ef5WGmndAZ9sAy49o4MhWovrKaZK/gMXGPG MrGF90SoZtUcTJQnXT30Sj/XGA/jVRDEm36RjEfq3GhjDE4RPFhQROy3/5hCt7+CAO2S V9GeguvO3d3Gwn9BKxI5VPF1lop/M+hFn4cazRRgY8TNqneuO3Ej3OdW6V3g1x4Kkgjk iW5CkR3zwvGRXKNoJCoOaVpKIYiwrSJVmjUeqa3IdicTxCxuVEZNXSb8vWU6XsQCfH7y JH1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666145; x=1742270945; 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=JJTMw6tkQg2gyyv9VopXfGbD8re6/gGFQNon8Npv7Ak=; b=EBel0w4iv4FUTs4nCtN0qNqWQ5/BNyR+GLetZI34sdaaGYVf0qQ+uzilm+WLzp7tBn k67v+B4RudG6CpsCvhNhiJdfYeF6lOf/yBWcveehacwoFuCd8aHlT5W+uLswZVB9hPHe wQqiV4w82lslJVM8BLGg4VvkIb/LK1QKIZmp0BMaaxuzE7KNLVFQw3gr0Q7B+lrPMICx dk33bVMmWlfKDToIcFd7sYRiyyQLk3tyfCi/6lQkIQ+vDQLyiMQkSBdWdxSxMvhfywwC IzXVjSl1lF3fYamj19iQB8NJ/NGSlDDHxQHbhoVxeoDE+RpCxDng8mRT9ilu3c8xcuJp MHjg== X-Forwarded-Encrypted: i=1; AJvYcCU0boarhT9S6C8t35jfek7e/VbSny/jsmgecMJEDxPZfUNgkv6iRGCbreyhQzvYtFVnaj5L9tA33AQ=@lists.xenproject.org X-Gm-Message-State: AOJu0Yy6nyWcZ7bLrnPk0C47rHuRWapnNyKC1zKgJDf+Ph/rc2aNFKSB 59oxGCRhZW33jDu1oH++YHinlRyHehd8WtkBaa/onoQM5iKgIQE2nyZ3RWytjCA7LYvaMVhpZXG En6I= X-Gm-Gg: ASbGnctUqkM9wUALN871syyyYD9PY+W7GlrREQ+bbP00RikdJDvlUrHXdgARFDq67we 9gvJZiCSVRrNv0SM39/3QotqKYeJFP+I2OlT9FPGrL1FoUQk0JJC1lPocDiforEpJibh0ytXyTK +Y2fuKNMsF8zvNVbpFCY9onNP2vaobw2WHZrFaAkDeKL3OfaH5I1GTkBVcolqQRt2CXxGi7AQLP waem/HVsxhG9/1lLeaSY1YW76EA8s/1n5cqXd9mwlEZwrGoRM4VW7StfoG1+dyBOcbgReMP/2Hs QDzuJaiZIErDc8yX6Geir80qANAnxp4fCwe6Me+OYhNXmQS5VgqasG4= X-Google-Smtp-Source: AGHT+IEZQz4PbmDcJ14zbyjAyAYIBXfqlvYCPkEDTZUS00hzo0yd+SRkwBCunP0Y6iJa+tBGNAcErA== X-Received: by 2002:a05:6a20:2d2c:b0:1f5:8221:d68c with SMTP id adf61e73a8af0-1f58221fee5mr8742647637.3.1741666145118; Mon, 10 Mar 2025 21:09:05 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 07/16] exec/exec-all: remove dependency on cpu.h Date: Mon, 10 Mar 2025 21:08:29 -0700 Message-Id: <20250311040838.3937136-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/exec-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index dd5c40f2233..19b0eda44a7 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,7 +20,6 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H -#include "cpu.h" #if defined(CONFIG_USER_ONLY) #include "exec/cpu_ldst.h" #endif From patchwork Tue Mar 11 04:08: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: 14011069 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 D0F70C28B2F for ; Tue, 11 Mar 2025 04:09:48 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907018.1314339 (Exim 4.92) (envelope-from ) id 1trqvV-0001OM-Pz; Tue, 11 Mar 2025 04:09:09 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907018.1314339; Tue, 11 Mar 2025 04:09:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvV-0001OF-Mv; Tue, 11 Mar 2025 04:09:09 +0000 Received: by outflank-mailman (input) for mailman id 907018; Tue, 11 Mar 2025 04:09:08 +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 1trqvU-0000fJ-52 for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:08 +0000 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [2607:f8b0:4864:20::629]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9369f46b-fe2e-11ef-9ab8-95dc52dad729; Tue, 11 Mar 2025 05:09:07 +0100 (CET) Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-224171d6826so78753575ad.3 for ; Mon, 10 Mar 2025 21:09:07 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:05 -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: 9369f46b-fe2e-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666146; x=1742270946; 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=S847jAMJoPTCQP5Yv6FtgKXIrkXeVt152gZ92AA3GhI=; b=P/uDzEgLFFDPAJuCgSzgH6+/Gc5qksYe5yqND+txAymV8k6z4vTFC8FtvUt+1WO25u lZdH4n+7QEsfwhkMfZf2gWriYo9TnCi2A6xBJiqByCdn1Vv/Gcq8CpWO/Mf57bSRnED1 iuNOXS4ouywjXYqCD6xlIlU+AbWLP+IbEgcmW6VldtI14lu+kZeUz4FFt/4h2JeT75gr yIZibgRwonL9mObBh9YtvncaZFlQMN0kpMAv9KdEbG7yBA7x8gHhYkQixfP2MEPbIDav GayKr/cR3sKpd+AinsqLFyjmjqG3kJR/cF5rHgVuS6GSgh5FgMEaKTVTH6qwDvnrIVlI wYrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666146; x=1742270946; 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=S847jAMJoPTCQP5Yv6FtgKXIrkXeVt152gZ92AA3GhI=; b=D4iEtwTnnOzvpe7qqud2BuupOGpLHtixLZmJA5b9gQT2ZTe3O5zqU3pnXDV1tVybiM ZnYOVziEmFbWVIlJD1jA+PkiYUoFdQM/1ZaQDxAiC5Ya4M7YUvM541KveSdG2DNpHu1J a6Khopkt/RAeFWRqWKBnqJV3mYEzeGzfZyGGgxWmpnz41JFTVN8Z1SmjsXJPIfHxID5b mfWe+lKEw+fUIHkHanfhabyOFHQqi7jjbrlmure2u4M6WBpZ/zaUjVN116PdjAXQje/z Mmjgs2wxA45saFN7fSisMZ3fk6+PfzFe2zUxCgd7cprrY+0tY2O1vxhuCIyad+88dqFE 8aIA== X-Forwarded-Encrypted: i=1; AJvYcCV0JiSd0++U4FFOLRswvwLrhnz0vt6MzupBUozoOVBIJCI04XMpLZ3/giYQjH+q/efc4oUDozGlSqk=@lists.xenproject.org X-Gm-Message-State: AOJu0YxzQvrnExFUx+ku3uN9qZVmRkZioNZBiK7LBTV0aXOWK6KztUow fOZCYZLmIZ+eM6qGAUHGlfpzDNu9EyCPb1a4Qa7GBdjvP1ytIPEp4Nevej2t7hE= X-Gm-Gg: ASbGnct9MbDO7K5oT8cYUo3/mRDBzh3CAVEJYIkhODTzUTQBItHsTG9IvvsOKYcgFcB i2woGKDq6vtZwV6notUMzPa57CHyXgxNk4/PSsBI/yVGqWTzjfNGHkPzNXluv2MqcAf7ceHHHlJ DVWQZAi5I21Uy377r0wGr9CO+4uW9o9UIyzukvIWVUj4j4KL9r6IqTJDpfg+ns+kGQDkscrdPLS FnTrfoyhQO88GAbYx0Z9ouyM4jkMh4SpZspbgc6Q279DXB3z5AjdC4PAtjf8YhHVJX6Oxabq+iO OxkQNgphNYfLhsk60Oq8S2ddfgwXqwCGbVSHCLWTp99Q X-Google-Smtp-Source: AGHT+IE3Vl9B86Ve/DQiaAua/ITAo7nczT+bEsdawDqXZ5VAclVm0x5zL+4TIfw0f3xRMRf28fdfZw== X-Received: by 2002:a05:6a21:516:b0:1f5:709d:e0c6 with SMTP id adf61e73a8af0-1f5709de3e1mr11267027637.42.1741666146178; Mon, 10 Mar 2025 21:09:06 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 08/16] exec/memory-internal: remove dependency on cpu.h Date: Mon, 10 Mar 2025 21:08:30 -0700 Message-Id: <20250311040838.3937136-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 100c1237ac2..b729f3b25ad 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -20,8 +20,6 @@ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H -#include "cpu.h" - #ifndef CONFIG_USER_ONLY static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) { From patchwork Tue Mar 11 04:08: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: 14011065 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 CA3A5C2BA1B for ; Tue, 11 Mar 2025 04:09:31 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907020.1314355 (Exim 4.92) (envelope-from ) id 1trqvY-0001if-D6; Tue, 11 Mar 2025 04:09:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907020.1314355; Tue, 11 Mar 2025 04:09:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvY-0001iE-6M; Tue, 11 Mar 2025 04:09:12 +0000 Received: by outflank-mailman (input) for mailman id 907020; Tue, 11 Mar 2025 04:09:10 +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 1trqvW-0000fJ-LS for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:10 +0000 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [2607:f8b0:4864:20::629]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 94fa46ed-fe2e-11ef-9ab8-95dc52dad729; Tue, 11 Mar 2025 05:09:10 +0100 (CET) Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-224100e9a5cso93337485ad.2 for ; Mon, 10 Mar 2025 21:09:10 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:06 -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: 94fa46ed-fe2e-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666149; x=1742270949; 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=lSQnGpOqRDw3w//OvJparnGxlKjvigYzwQgvxmVvIU4=; b=vwhswb70kDtQlFPKC9I++M8tJjjMHilSKefbsKS/dXt2QXnGizMLGQlzi3qY9/6Ec3 fyEEVD/NtCFPdXL5B+dIOOEpD89vIywTy5pTUXGNuQkzTjmgLFRTV+STn1bTmNP1SbAG HvhcSAYTdbvTmQqXN48kGRtZlhO6pEuJoGTTi5fgjNhRSuN5KSnf6wFTbv5YtOQ4iy7a dlF542+Er+k7oWD00JNhEz2QoIiX27eZKIn0oAmZpJyZRhygjK/Ds/eq3HAXzJL4ybTT ko6nplOiOhoh75JLiT1fmrKEeF4aWBAUbcxsJrlRLOXN9V6R/Zf+SLxVDbb1OOxPkVFW KGww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666149; x=1742270949; 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=lSQnGpOqRDw3w//OvJparnGxlKjvigYzwQgvxmVvIU4=; b=otSdoGtHLPy06v6b4RLy1E8iMvKY/r5QelVeJeZdyJq9cSNP8QdtCunkqRuZnYy6pm OVFblhK0Bo8f7cwau0K9g4TIDeCZ8Oek1JMJu7Vo7OhpBF7P9Gp/7JuApWRsWXNX4BkO FJXySfFC9xmr54u1OaA1G32Bkcxmf8nZycGaItsjpdt2QpXQznfDFkrwabXE12yprs9O WdFA3Sd4ZWCnNLXfU+QZBDk+6w5VRQLYx3NSFyAvZ7yUq3W0XbGPJrteLfcdJ6wyvrcb 5xN6nNd5capu2HH2CUquqf57D3dypv6N9mzWq+WRE1OIAxE27Ex9BmV+zNTMzHTWngNG +Aug== X-Forwarded-Encrypted: i=1; AJvYcCVhj8voQMIEu9zUs6RU2ueEMbDK/vc/T4fFwdF9HpnrVTYEObcgHzVRzCQMke96fu1AGgCQ8qUMNQ8=@lists.xenproject.org X-Gm-Message-State: AOJu0Yx4OqS2l88GfufPTYE9LPph0qvo9ZUMeBL03lGDqrCAbKNtT6sH 3PVTCLzHKT2mlkMefrns/50ZgPS14hvY8L+0dACU0giflWepG/N5xKPrHMT1qa8= X-Gm-Gg: ASbGncs4YkdcG3wRKKREwvl+tjQIfc0V5DEwEIYWNZtIdDDkr82OjSWili6wZXBtQsK sstrWV5WVFN7RXZHA3MaxGqOTcn+pqlKT/EisEYk/WCyQaroogVH26rtnRgsHR7IrjqxYUSpNRf +RMxMO0b93wk3XQYKN0q++7c3BnBYCxuhAjacwoNkClH083ej9hk9p3LDbqkiXYL4Iif73RohMA YJoL5uooQGUei4bAfDrd/5BAyiDiwyLyL11E9T44mrKX3tbADvGjAMZ//LXhv9Fo7G4CiYzgieS Bbn0Ty68gMBxjYRU9r8kioC/0hQZrtSSPiZHcgFlDvy/HpWym2bGeAQ= X-Google-Smtp-Source: AGHT+IGAtyqJ8JwUWzZUpShXBSvpRNbrwAinE/LFxHiM0RsFVnA1TPY911KWPkY4EkoTDg/0IjRi5A== X-Received: by 2002:a05:6a00:23cb:b0:736:55ec:ea8b with SMTP id d2e1a72fcca58-736e1b3e670mr7549220b3a.24.1741666147270; Mon, 10 Mar 2025 21:09:07 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 09/16] exec/ram_addr: remove dependency on cpu.h Date: Mon, 10 Mar 2025 21:08:31 -0700 Message-Id: <20250311040838.3937136-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 3d8df4edf15..7c011fadd11 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -20,13 +20,14 @@ #define RAM_ADDR_H #ifndef CONFIG_USER_ONLY -#include "cpu.h" #include "system/xen.h" #include "system/tcg.h" #include "exec/cputlb.h" #include "exec/ramlist.h" #include "exec/ramblock.h" #include "exec/exec-all.h" +#include "exec/memory.h" +#include "exec/target_page.h" #include "qemu/rcu.h" #include "exec/hwaddr.h" From patchwork Tue Mar 11 04:08: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: 14011068 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 5229AC28B2F for ; Tue, 11 Mar 2025 04:09:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907019.1314349 (Exim 4.92) (envelope-from ) id 1trqvY-0001f3-1J; Tue, 11 Mar 2025 04:09:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907019.1314349; Tue, 11 Mar 2025 04:09:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvX-0001eu-U0; Tue, 11 Mar 2025 04:09:11 +0000 Received: by outflank-mailman (input) for mailman id 907019; Tue, 11 Mar 2025 04:09:10 +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 1trqvW-0000fJ-72 for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:10 +0000 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [2607:f8b0:4864:20::631]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 94ba1b05-fe2e-11ef-9ab8-95dc52dad729; Tue, 11 Mar 2025 05:09:09 +0100 (CET) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-22580c9ee0aso23111055ad.2 for ; Mon, 10 Mar 2025 21:09:09 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:08 -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: 94ba1b05-fe2e-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666148; x=1742270948; 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=l9OL+HSsU20FBz6Rn+inDNzpv7yBRsst2fq1x6gPUv2lonFCNnmadQObLUFsNBP4E9 4+vDgwYL1PC86BlPawV1hY7T2C5MLZ6p+jY+Kck9LsL5t59b9bwHCJRo2CB64/WlRCDo KIylmdgHX6MhhxkQv9l5Xfomx+45hdpqIdZQ23lBr+0S5eQzyGbsFl5eOi7U35iEz8a/ HW8gkRZwDE3M0T/J/Zi0WxBQEBGeSspwHbLfoIX6E0zPdxF9hsYBoBUJ0ISLFIO5Wf7v V7/Rlv1mj96fiUGKKyg8WCbX0UZ6nvEYXQADJoD8tGDFvOysPw5ZA3MhJJydfQAA2+Yd vU8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666148; x=1742270948; 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=eRP0f+zmPJVL1O86BW+LiDv7Ed7dvJ5z11tsAb8oMq1wwAQyjicIepVETKH62LGIgH ZATWu+8yCrgLFX8Soo/SBG2BvxkVtu6xgE4rMMLrxJhYw8FvQtI+tzmZdUa+ssrmemYT kLaDGc+rX7BdqLhcJZc/hrMxFupaksFcje9c1P/VMllppGf2e87PMlXHoCTQUCxdQUid 2umFEr/1IBSwFnRjC8pSMRKlsy8OdUdhwHwqpFWZZDG93TSIrp/4UG6wBaJseKzkQhIb MnI4MQpt8zN0yNzzVc24r1cIW3HAu8A1Ut22ML9BErq5SiVbNCg7OSV16rIuNEhWYHY+ MtHQ== X-Forwarded-Encrypted: i=1; AJvYcCUTyq2WOHoPQcFbaIEYDNf33l5RMOmj1okYMXo6+G/drM3tA2+o6OkHTHcr9HRZtZhTlQHaiHpgZLk=@lists.xenproject.org X-Gm-Message-State: AOJu0Ywr3P1jaqGDF5OFnOsSlIx+YO/TSrevhX8YTIVjAk4Yg71Lg5X6 I3xH7uElR5OCFsXYz391kdGUr6brD4t+ISMY6xbKYmn7KcNfHIOkf745gFd6dKI3uG/Y3WhO9fB GpuE= X-Gm-Gg: ASbGncscz4tWZkcpF58g8L6YnCi3efCiRhs+88+TGHwMQo8A1PWyDdcJCi4dLVgswdC zOfZ/L7K8QEeNLypt78e5zNC7Ry2RJV1DOsY8dm0cvDW4skOWsOWvB9evcd66Vn0F3KH4mq8zQr JJ4imROe7S0ptp3cUkfLtTx/rKRamHdseIR0Id+xv+E0udXJdBUXgbTvwTEWp5D2jNNvnH5W1dT EqpSaQj4Y7NzDjvCh9fCQ6qRU/CBub7tOu4Nlg4BuKvEbva8zt9YVkQZcXVAgpf94BGz2+/GVUD 1mvPoZ5H9De3z8G0fwqpSSWMmZN5Q+NG+/g/ONl7xW2Z X-Google-Smtp-Source: AGHT+IHS2PJ+/kxwhPkSsqZSy1Lcoi2dOdo4gLmR9Sx1nH5mZxTPaitClYNterYld+kjauOZ34q9lw== X-Received: by 2002:a05:6a21:164a:b0:1f5:60fb:8d9 with SMTP id adf61e73a8af0-1f560fb098fmr15311166637.33.1741666148378; Mon, 10 Mar 2025 21:09:08 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 10/16] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Mon, 10 Mar 2025 21:08:32 -0700 Message-Id: <20250311040838.3937136-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-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 Tue Mar 11 04:08: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: 14011071 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 38768C28B2E for ; Tue, 11 Mar 2025 04:09:57 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907023.1314369 (Exim 4.92) (envelope-from ) id 1trqvb-0002Fh-0K; Tue, 11 Mar 2025 04:09:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907023.1314369; Tue, 11 Mar 2025 04:09:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqva-0002FY-QJ; Tue, 11 Mar 2025 04:09:14 +0000 Received: by outflank-mailman (input) for mailman id 907023; Tue, 11 Mar 2025 04:09:13 +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 1trqvZ-0000fJ-7e for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:13 +0000 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [2607:f8b0:4864:20::630]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 955f930e-fe2e-11ef-9ab8-95dc52dad729; Tue, 11 Mar 2025 05:09:10 +0100 (CET) Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-22337bc9ac3so94536975ad.1 for ; Mon, 10 Mar 2025 21:09:10 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:09 -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: 955f930e-fe2e-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666149; x=1742270949; 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=d9PU2mUUZXceFgFF8NURkIZqXSTxuLUTW3yG3F37dHQ=; b=IOG2QTMNqRWn+Ud6DGiA4tXppTa8kXM9y4VunJCbsvr+cRxUZFZ69Oeq4G6D3LhLjS ncT3+UlpEutjah1xojH8e7LkRzQVDqdQLtewHaUYEooLeZ9axwi2mfvnmaz/qNnELi2I IneJ1wEwNOnZhDv5bSIVuo/dPbLQixTaZXYbQsBTObP+1PvxM9QkcMGRF03wSlydL43j N492cDMHjURn+GhQyzGbifXhTdffzABX+7UjnUh9GNhRst7Gb2E4mkLQhyM9ikQgrIZ8 Rf0is/kxWCjTp663UQq2lno3u+ZKPXWx19I26JoXKyGMnA0mRVHqmnxgjgh93hS9r7h5 k7nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666149; x=1742270949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d9PU2mUUZXceFgFF8NURkIZqXSTxuLUTW3yG3F37dHQ=; b=i40w/IeZqKGOrukreyCi13kqnZj3ha1QZMxWKdUIa6++ZWcMLLNQAMXstw0T0e2bNk B1L+u6Ip4WLbg7m+5VfhU85nxK0hqQYgar3MBol8h5PdkBWG0GjwK2cWGlvbqoFsvs+M qFDZcei9VpIj8L/CXt5blAVhd1vZVJmfwJgH4qlWBox7VYdkE0ZZApocAWYvyYdffo0U AjpdwePP9TAQhKI3FBnUEgydgbTMSnNRuOMV6p7/2kI1ZY1PJywfUWu41sWu4HpShuTu Q0uO2jyDaRh68apzu7Nru97eFgK+wuU+v/10f5FphhUe+3T+8CEE05ynKN9l3xlyDHpv Cwgg== X-Forwarded-Encrypted: i=1; AJvYcCUv+oT7p15F/Kj3wa27TDUN5JV1FP4i22CUCYsir+fu5XpckWOAvc3qeGwGQ+dqG7xgMm8ZSO87NGA=@lists.xenproject.org X-Gm-Message-State: AOJu0Yz4uvzxvZCNA1Q7e8svYxPqppxApsl2atbSYzIFb0msvY/705cF yMPwfRG2FDCzXwZYy5VLxufOZ0mCN4w+pxjf7hD/msd32UG+ACbr1quPS/6Wfv0= X-Gm-Gg: ASbGnctWBIfApktvPXJGtqzBOVReNRTIGRP4s3r8VR5+NubxPbx35d0R4LtBUob8hoZ trwSRE4ICZf4TDZ6m3kbujFKLkMYTv87COebe4xlst0UF8eaQeg3fdcUcFvVjO9zve31fD0Y4lh HgIj6KCYIHZpAh9taUjaWkO9+CYzlIhekrflS8DK3enyDbFbQ7QARh82akdSMMvqTzbo3vJyVeS JYTSaFtUmiVye+Ikom+xL9QfrMP0xxHaKUL8FD9nC7myBXHrB7sR4W96TZYnfUl9KXlgiVGoL2E 58G2HUFeLzhDCJT3i49VEuOmjd19CziaR7jb3Q7QuUgFZY+wn/XT2nw= X-Google-Smtp-Source: AGHT+IFhjhUd2vTxqYR3Z5nzc5K52WwhbsgB0wgjWXiu+XeofP+aLrA4dkvuyGbgnmdnOjVQzIEANg== X-Received: by 2002:a05:6a20:160c:b0:1f5:75a9:5257 with SMTP id adf61e73a8af0-1f58cb1ba63mr3462589637.13.1741666149439; Mon, 10 Mar 2025 21:09:09 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 11/16] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Mon, 10 Mar 2025 21:08:33 -0700 Message-Id: <20250311040838.3937136-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-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 7c011fadd11..098fccb5835 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -342,7 +342,9 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, } } - xen_hvm_modified_memory(start, length); + if (xen_enabled()) { + xen_hvm_modified_memory(start, length); + } } #if !defined(_WIN32) @@ -418,7 +420,9 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, } } - xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + if (xen_enabled()) { + xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + } } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; From patchwork Tue Mar 11 04:08: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: 14011070 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 34685C28B2F for ; Tue, 11 Mar 2025 04:09:55 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907025.1314379 (Exim 4.92) (envelope-from ) id 1trqvc-0002Vd-9u; Tue, 11 Mar 2025 04:09:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907025.1314379; Tue, 11 Mar 2025 04:09:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvc-0002VQ-4e; Tue, 11 Mar 2025 04:09:16 +0000 Received: by outflank-mailman (input) for mailman id 907025; Tue, 11 Mar 2025 04:09:14 +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 1trqva-0000fJ-7o for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:14 +0000 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [2607:f8b0:4864:20::102a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 960e8f4e-fe2e-11ef-9ab8-95dc52dad729; Tue, 11 Mar 2025 05:09:12 +0100 (CET) Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2fee4d9c2efso8346082a91.3 for ; Mon, 10 Mar 2025 21:09:11 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:10 -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: 960e8f4e-fe2e-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666150; x=1742270950; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YZcwoIie6BtZ5Bqo8BYW0CKBTK95znA0iA8YHmiy7v4=; b=yP48ViHxS8/edxr4ykFVatkvDHwQWsRuSWRstFDHkoyz+EnmEWRS5WYIfZDxHhw+eI /OP+vdStl4B5kcaZ2a41nwK4ZvdGuhjyNcbPDTraPaJO00RZrNaAqMoOCkEj2FamHiXt cINA428SchuiR4SCdrWhm4WTV555PYQhl8MunXa5mvcBlNjwv3mgx8EWM9KhjgisA6v4 YJSjd5iU2Nm34VB4+HgMEz1MytRLwVQqzDPCtOFgE7Mj9u+WS0+2vzqEjBrs119cJpZV xqIh7aJ7Kzm/MGwQo/5YT7b5GoRMlJ8vKKgIRRmbNIxhrg1J/Te+hvGt4sSoORO/wb6Z jolg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666150; x=1742270950; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YZcwoIie6BtZ5Bqo8BYW0CKBTK95znA0iA8YHmiy7v4=; b=c4v3atunsyY/2zZkZ8xkgLTFbBA6WluZ44FhN2b3oEMtNvu6oIMOOXUoAXEQS7PsFx XV827pXze+2/HJ7v9cJRKCKSxC/GwE98A265A9A78sxzkRufJqOKo1buLxIUswOcD4qp 5w6VQcbjEfCIuiQK08sX/c23Q4F3e/MVqRp8hjfceurbCpSjxmtWodWwvbEVtWHlYoP7 FdSOnSZ5f1v41djZmuPZ604ISoa7K8tV3CqIKkGm5OXWtTr99ug+KRnygqIBFEGmudg0 QDuqlQbLKScZPIXlywfhWmf/mWLL0WOuOvQ08bEnJm62bVO2zz4nbX6t2mZiGBu/wvup oq9g== X-Forwarded-Encrypted: i=1; AJvYcCVDeOYsrTCxd4sxulR3IB6JMMzIXvtcU6Z8nA+m617XLfdz5XloGKTA0+VICVsb7Ag8vh+kVw/d+js=@lists.xenproject.org X-Gm-Message-State: AOJu0Yy/KI1Ki9aLljDJNbakn2J7LNEPcIED2x3LzcgLv94VrLgJAGGB Pb0KQVWVXh7a9+9V0VtKqr+ehWkpZxE/DUUHNAj2x+aeh0LAMMgj0G1BmWy9gNs= X-Gm-Gg: ASbGncsaFPcnPpNe9C/8GepwFkIBxiagQcGxp502oWZHFjH9YwmpdBVxVOu3eJP8FHc IkfsN5nehlCgu2feC4zXuxAHBBuEu256e5fXEutT3YL1QqOzBigi9Ky7Mz3LZl+6u3l8Hrzo4A4 BMmjHW1GdU6E4xH2mIDqjdjST9uvGy/ejsPMAZi3r0tPlY0XThM5Nnp/+t6XKHPx89O3tKRV0Pd 80RxbbHFKfpfP09TM63OWiGN7QMZOJU2MmF+3t33NL3GrnPwtZDxVnNWxt/irj3+IOnJge1FaJ9 ge4AkpsIFdcUmxIWMwsJO81x4kVYL6JEaQXcKb8K5fhL X-Google-Smtp-Source: AGHT+IHJmCe2dJrkKZuUg8Hp5UUMBrSHtlgnmpF6Gn789stb7ihIio5wxKC4BVHFee5F9pMJvA7mBw== X-Received: by 2002:a05:6a21:3941:b0:1f0:e42e:fb1d with SMTP id adf61e73a8af0-1f544c7fc7fmr33091101637.36.1741666150581; Mon, 10 Mar 2025 21:09:10 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 12/16] hw/xen: add stubs for various functions Date: Mon, 10 Mar 2025 21:08:34 -0700 Message-Id: <20250311040838.3937136-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Those functions are used by system/physmem.c, and are called only if xen is enabled (which happens only if CONFIG_XEN is not set). So we can crash in case those are called. Acked-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/xen/xen_stubs.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ hw/xen/meson.build | 3 +++ 2 files changed, 59 insertions(+) create mode 100644 hw/xen/xen_stubs.c diff --git a/hw/xen/xen_stubs.c b/hw/xen/xen_stubs.c new file mode 100644 index 00000000000..19cee84bbb4 --- /dev/null +++ b/hw/xen/xen_stubs.c @@ -0,0 +1,56 @@ +/* + * Various stubs for xen functions + * + * Those functions are used only if xen_enabled(). This file is linked only if + * CONFIG_XEN is not set, so they should never be called. + * + * Copyright (c) 2025 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "system/xen.h" +#include "system/xen-mapcache.h" + +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) +{ + g_assert_not_reached(); +} + +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + struct MemoryRegion *mr, Error **errp) +{ + g_assert_not_reached(); +} + +bool xen_mr_is_memory(MemoryRegion *mr) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache_entry(uint8_t *buffer) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache(void) +{ + g_assert_not_reached(); +} + +ram_addr_t xen_ram_addr_from_mapcache(void *ptr) +{ + g_assert_not_reached(); +} + +uint8_t *xen_map_cache(MemoryRegion *mr, + hwaddr phys_addr, + hwaddr size, + ram_addr_t ram_addr_offset, + uint8_t lock, + bool dma, + bool is_write) +{ + g_assert_not_reached(); +} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 4a486e36738..a1850e76988 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -9,6 +9,9 @@ system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files( system_ss.add(when: ['CONFIG_XEN', xen], if_true: files( 'xen-operations.c', +), +if_false: files( + 'xen_stubs.c', )) xen_specific_ss = ss.source_set() From patchwork Tue Mar 11 04:08: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: 14011076 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 53531C2BA1B for ; Tue, 11 Mar 2025 04:10:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907034.1314399 (Exim 4.92) (envelope-from ) id 1trqvm-0003mf-W6; Tue, 11 Mar 2025 04:09:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907034.1314399; Tue, 11 Mar 2025 04:09: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 1trqvm-0003l8-Ry; Tue, 11 Mar 2025 04:09:26 +0000 Received: by outflank-mailman (input) for mailman id 907034; Tue, 11 Mar 2025 04:09: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 1trqvl-0003IE-C4 for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:25 +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 96bbfb6e-fe2e-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 05:09:13 +0100 (CET) Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-224191d92e4so86287485ad.3 for ; Mon, 10 Mar 2025 21:09:13 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:11 -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: 96bbfb6e-fe2e-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666152; x=1742270952; 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=Q89mBu4b5JYOE58WB93/V2zR/jXmfpOvKMtRO3aXK0o=; b=hqc4QmMdWFslc1XO32nbv/pPRGynF0WaOpCJJdSUi10UwTHxcHcbbisZjZQRrVrQrt mwCWtT3JBZX40N45xxNDd3WWYLsG1w9DSxrVpzdDatnxrDwM2NUQUeUAsixi3I3EWrAs Uqy5gTYBjRxNPlTRlHzBNzxODe9zFQJy0TfL1HtSGwQb4EHR+oZWzza43IMyuN7Dx81w du/tbvGKh0ebYoIRDLjskq3o5yo6dSsTLX0IRRve+sezG6sdJtl7EwzK31uVgCQimGgA rWVZdTMKKdpQHkBMmlB6zBSW6zRwNwFLcLb8zDzTMSWmV9cVumyc3unD+V27phqTHa1P 0L5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666152; x=1742270952; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q89mBu4b5JYOE58WB93/V2zR/jXmfpOvKMtRO3aXK0o=; b=EeEUZn206JXyWLQgFg1W2X8+JjkmZNc/G9gWRR5QtxUm2fq1/55w93tfY3azXw9bOK baRmoXhzFlfbBdj7rOfjbShc6Whi6PvaWC1O96KnILVz2Nlm68BmQ0Vm61iqhVf9WNu9 UxgFvbdArqBxKMoUGU1uh16qc8KBzj/bjJr4OSKlzTbUQFsRJyChB3m36E4kUn+5GZq7 kRt3XmgwxtZAT17F+XKIqNYR05EXhu0tuVXsSEi1ptgMf8kgdmCqiazVz1ifRat68Ghi CyKFRLOB96KnBAQ2fr1HQz9L7ebnVXe8n4mpiDFUZCpp+x/HVkx2j7BRhG9+V+7cdt++ wuUA== X-Forwarded-Encrypted: i=1; AJvYcCVqsU8i3H1js8K5KmR7z5m5FLsPNIK9VWjUmoDwWa5PoeySs7K9j0ikuGO/ecRMxYB3RmZwygg0CFg=@lists.xenproject.org X-Gm-Message-State: AOJu0YyQ5k0po/kSe2jfCvcHOzG6FbULAJcIClee2Lc9DlFHJ6VOHZUD 4AJ6V2Y6OeK98aQ1WW728gkpTGc3orpRT4Ub1SLo55a58EdHhBtc9LMrHIapD48= X-Gm-Gg: ASbGnctxxNRmEOg46FFf1Kat+9nXixvUomr4UC94FcJZyDCyMqBEIX5+0xnpVSETFRG 1JXOOhVrkZS/b5UI8j+xmfeeEsmtGHRwXcEinPJCRV8tIDMboH22amlCVPWFFzW9Q8/nWuuWWB3 eNOVFMvPK3UQi9hodi2M1h5dHUznaBv5q/BfjoUe0PZwSYUopvo4ssUWM+k/51gF6vPMdIKrN5X u6DCTL6sJRwKzQk1ppX1oZ8gHq05lzafXmzKE2bFBKReTdraanJWiv/689O2xXgiv0hLVP/gsNU lLRvQVGwTY0AnjO/fz2HFJIrvLocFqzGo+iMeAPBzHFs X-Google-Smtp-Source: AGHT+IE7G7QimFDknOZtg96uV2bamM0fTFqFZY88Y5t1E8IfrTFu2U6cjPQap3/Vq7WYgH3pY/scbA== X-Received: by 2002:a05:6a21:3944:b0:1f3:321b:4f8b with SMTP id adf61e73a8af0-1f544b190edmr25270834637.19.1741666151748; Mon, 10 Mar 2025 21:09:11 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 13/16] system/physmem: compilation unit is now common to all targets Date: Mon, 10 Mar 2025 21:08:35 -0700 Message-Id: <20250311040838.3937136-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-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 c83d80fa248..9d0b0122e54 100644 --- a/system/meson.build +++ b/system/meson.build @@ -2,7 +2,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'memory.c', - 'physmem.c', )]) system_ss.add(files( @@ -15,6 +14,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'physmem.c', 'qdev-monitor.c', 'qtest.c', 'rtc.c', From patchwork Tue Mar 11 04:08: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: 14011079 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 3F6D3C28B2E for ; Tue, 11 Mar 2025 04:10:31 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907042.1314440 (Exim 4.92) (envelope-from ) id 1trqvr-00051L-MO; Tue, 11 Mar 2025 04:09:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907042.1314440; Tue, 11 Mar 2025 04:09:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvr-00050C-8U; Tue, 11 Mar 2025 04:09:31 +0000 Received: by outflank-mailman (input) for mailman id 907042; Tue, 11 Mar 2025 04:09:29 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvp-0003IE-FH for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:29 +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 9760f55a-fe2e-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 05:09:14 +0100 (CET) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22359001f1aso119439535ad.3 for ; Mon, 10 Mar 2025 21:09:14 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:12 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9760f55a-fe2e-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666153; x=1742270953; 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=LEAQ9wvxViIwfRRF7MZBxVkXSE0tKicEinIFunB945A=; b=e7B1TpjeCg/ErBImGbfk6MpwK3S3fMFoxord7abVhnWVndkTmJclfG0wagCGOaUHh2 /Ph8UA8U5Wgj5djqXeAjGH1TWka9sKJFO116B1Jw17ap/Ad/+sNGMJU8ag90yzbTvN0S AUN1W5JCbfiQUfeu9UFC+/Tx52sRdN9y/VX0z8KntM+1yTyHCWVFL8jQJyod2Ddi7QA9 qW40eo7MgFm0tNW8FjUMdpHZYtIHJAFUjJalzTPCRKxhuOijpQ//dNlbgYp+rGpr8CRe RVYmFFzZ3gwsP3gMufTlRZdWvJUdTMzmj7Ze0qy/85BXSEq8MpGw3VFAQqbwvAFPpf0J BeHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666153; x=1742270953; 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=LEAQ9wvxViIwfRRF7MZBxVkXSE0tKicEinIFunB945A=; b=TdSTlLSsgo+YuMflH3VgECTnkCV2AH3w2AQ1YNGH99u0huoWb8iTDxYq8BzzFTE7on Rckb5LrIgFudhuXh0yVef188O8YIZoSt0FJjGRaxokIvxEAw24ZDeCpLpuCUXWXjNZOA bP+r8KHWd0Jy8ahsXnuaKsIATkOsA4xRia7LU4WiqYzT1cVMAkA3709uPX8TtGdFVYmk i9xmYN4zYMBOIXi83+U7LG4iqQ1jtHKIFMQbkO+EMIWYro6LbvYZdDQHgWEzWHC3Ush8 jJ43t8VLlOJitmkqmvgcKAO+Lr49ndHerq6kAtlf+hF8z3JyOjoqN6OXWqAZ6Zz+S4A+ I1OA== X-Forwarded-Encrypted: i=1; AJvYcCUnqVgMG17q9IR4twfo8tg2yoIgouwYcg4u/RlAiBEagGHEEJMjV1H+Lidq2iN8q7chGtc531UjEc8=@lists.xenproject.org X-Gm-Message-State: AOJu0Yw37/A94MjI5InC/XCc1F9kApkViUONQPGgI1+Np8t5N7pZQhVh /UrvSckqgaPDDlA+FWU8q0nZHFGtmp5JRZaSQqyxqUHcPz3nf9wkEynAWU1Kc7c= X-Gm-Gg: ASbGncv86DFXemVyH+/JXB7mkuTvj400BsNJ9mybOvrBmVPgYYbpH0Ges5ArQtAsxUy Z2Z6kYC5Sz0+usaN3YL07eFjM1JMkZrYB8muvm1gWejOoetP4mqLLZq1BP+EwtAVZ0t0JRI8y6S ljEgNU79OTMGQwGsQDzE7ZVIhFi/4RTUGhXAuQS8iXMhbIxIL991Ccq+MWemimSEzOsKIhc9Ybu rSpmMSigOO9LAyccahAeE+aKJfdw0FzXVgGqRwGCYfKvBUc7j9VO+IjdVQ4Cr20LNQqVDJee/PI dJK9G8LdbqiLqnGsjMir9Hm1wKxwBjwXTQ1+ZCqwZGBR X-Google-Smtp-Source: AGHT+IEEBIqVh4ZJ8rHFVsra/zLBqrrO/2Z7wqCz/tbRxr6Sh6SkveOkvqyI/KznC/OO1HDpbbusNw== X-Received: by 2002:a05:6a21:4d17:b0:1f5:6e71:e55 with SMTP id adf61e73a8af0-1f56e71100cmr14244196637.6.1741666152825; Mon, 10 Mar 2025 21:09:12 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 14/16] include/exec/memory: extract devend_big_endian from devend_memop Date: Mon, 10 Mar 2025 21:08:36 -0700 Message-Id: <20250311040838.3937136-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 we'll use it in system/memory.c. 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 60c0fb6ccd4..57661283684 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,16 +3138,22 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - bool big_endian = (end == DEVICE_NATIVE_ENDIAN - ? target_words_bigendian() - : end == DEVICE_BIG_ENDIAN); - return big_endian ? MO_BE : MO_LE; + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; } /* From patchwork Tue Mar 11 04:08: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: 14011119 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 AC11EC28B2E for ; Tue, 11 Mar 2025 04:27:06 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907129.1314468 (Exim 4.92) (envelope-from ) id 1trrCb-0003p1-VJ; Tue, 11 Mar 2025 04:26:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907129.1314468; Tue, 11 Mar 2025 04:26:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trrCb-0003ou-Si; Tue, 11 Mar 2025 04:26:49 +0000 Received: by outflank-mailman (input) for mailman id 907129; Tue, 11 Mar 2025 04:26:48 +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 1trqvc-0000fJ-8N for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:16 +0000 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [2607:f8b0:4864:20::62d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9804f499-fe2e-11ef-9ab8-95dc52dad729; Tue, 11 Mar 2025 05:09:15 +0100 (CET) Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-219f8263ae0so94074805ad.0 for ; Mon, 10 Mar 2025 21:09:15 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:13 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9804f499-fe2e-11ef-9ab8-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666154; x=1742270954; 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=v3CzVNwffqVfXfk4NE2Z+/4EFEG8FprDV2OFnBt+VLQ=; b=lHYcu5UR+CRlsq8ONACNAtRNYpVMz0JUMju0IMGdHhSXscP4gZBkaLsFIKp+kVXbxb SYg2j1EW0nPvNI7xE7Nq9L1pIgRwO7Qyu90IocE6V6OW44TuO/t7R2qb0vlFN3EUTkRo oaR8zJ5zaac9oMNV92hXfFYCZCMw3d11IXJc5AuvD/EHTJvroz9RBa9OHqIZBdw0fLL3 8wLple5wL/ojs8CmAT/WOt5lkW3T6BCvGnkcDAhV00y/+6Z51qu1bQpETMRIBXqx7Wbl gjzC0ZJMtKQ71vgbCNwxSRH4SE2BN/49E5iwpvEp9OeLXKtW3rrSc4Tqj0HeKYVpOw4J BATw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666154; x=1742270954; 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=v3CzVNwffqVfXfk4NE2Z+/4EFEG8FprDV2OFnBt+VLQ=; b=RxezKDUSC3dgHW1N0kTRpuSc3qXKVZMNvYQL2kT4C3uVr2B6pXxaznxQ7Z2UuuVTSU /tZGu+Oh2MOu7JRRbXzrlE0dpD4aEtDV3eDZ7APHlWSpAkhdg/Ch2oXrb2Z7PyooGaV8 oxGJ1FqNKFGvrfKcB6nscbIhNfsLtY3h81oir995o6RWSrpjVoNC9D9QUB2UwAZG9wq0 gViEQOprY8LWlfZO6IF5fq1vIwOuiunDLiQV4K+0cwipNnKQL2DnD6OT8AgQ5t/a/eEP iAe++l8omL80WHdfNGJEWU98ZKT5C+34eh2nnN3Q2zzQMEpNCcvsdnoIFbL4pBlhaNNK HDjQ== X-Forwarded-Encrypted: i=1; AJvYcCVKTNUMHbKMLEP7L6O6KjirQ7N38p6A28AeEIHDvrloMBdDZyQ3Bem+z5TyzRKNAzIKUuJCx6dUsv0=@lists.xenproject.org X-Gm-Message-State: AOJu0Yx6ca1YI+WWv30p8i6hljRPwraom0SsG6+pQVvywGP39x49Dp1j m3SjvfyUxkcx50axZVMOXlmvhBhcY5S+OdXohpoSxNDP7K2Yk+J4JNlGVB8NILk= X-Gm-Gg: ASbGnctj7I688k5/FKVHZIBDA4V1tEhDbtbyQn5aENtvk/vB8wI1GQpSBRHUhQHrGH3 STJwZWjB1csGkvHhlyBR0YKXp0sRBrEvLH/wV3Y/Br5HFWfXjWkWkHFe+hYaXTAFWnXbbbWJWoZ 0/L/ChkWSrxMxHSOnh8/eQeHbsWwvDTChY/R5WfWu8Km/SYrQofIndqrpXCnvoUAX6ebIxVIcWC YSbluyWuaouExj30WnPacbAR+6cdIuuhnoGw8c7kQc/HP+Y1VTPJZ/AVa15XC/M799Oji5FO33x tg1/YyyKoal0EHjZ23ceK1f4pigzJ5C4/+k4JZE44MLS X-Google-Smtp-Source: AGHT+IFvXFjaslvNGXJjltHn8NjSjDrKRDjnKt7uWKtRausP/KT3hgu5XPa6ctrl8hlKzv3rih4ocw== X-Received: by 2002:a05:6a20:c6c1:b0:1f5:59e5:8ad2 with SMTP id adf61e73a8af0-1f58cb40fa8mr3753307637.24.1741666153903; Mon, 10 Mar 2025 21:09:13 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 15/16] system/memory: make compilation unit common Date: Mon, 10 Mar 2025 21:08:37 -0700 Message-Id: <20250311040838.3937136-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- system/memory.c | 17 +++++------------ system/meson.build | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/system/memory.c b/system/memory.c index 4c829793a0a..eddd21a6cdb 100644 --- a/system/memory.c +++ b/system/memory.c @@ -353,15 +353,6 @@ static void flatview_simplify(FlatView *view) } } -static bool memory_region_big_endian(MemoryRegion *mr) -{ -#if TARGET_BIG_ENDIAN - return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; -#else - return mr->ops->endianness == DEVICE_BIG_ENDIAN; -#endif -} - static void adjust_endianness(MemoryRegion *mr, uint64_t *data, MemOp op) { if ((op & MO_BSWAP) != devend_memop(mr->ops->endianness)) { @@ -563,7 +554,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr, /* FIXME: support unaligned access? */ access_size = MAX(MIN(size, access_size_max), access_size_min); access_mask = MAKE_64BIT_MASK(0, access_size * 8); - if (memory_region_big_endian(mr)) { + if (devend_big_endian(mr->ops->endianness)) { for (i = 0; i < size; i += access_size) { r |= access_fn(mr, addr + i, value, access_size, (size - access_size - i) * 8, access_mask, attrs); @@ -2584,7 +2575,8 @@ void memory_region_add_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { @@ -2619,7 +2611,8 @@ void memory_region_del_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { diff --git a/system/meson.build b/system/meson.build index 9d0b0122e54..881cb2736fe 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,7 +1,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', - 'memory.c', )]) system_ss.add(files( @@ -14,6 +13,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'memory.c', 'physmem.c', 'qdev-monitor.c', 'qtest.c', From patchwork Tue Mar 11 04:08: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: 14011078 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 EF22AC35FF1 for ; Tue, 11 Mar 2025 04:10:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.907043.1314447 (Exim 4.92) (envelope-from ) id 1trqvs-0005BX-JC; Tue, 11 Mar 2025 04:09:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 907043.1314447; Tue, 11 Mar 2025 04:09:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1trqvr-00059f-Sw; Tue, 11 Mar 2025 04:09:31 +0000 Received: by outflank-mailman (input) for mailman id 907043; Tue, 11 Mar 2025 04:09:30 +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 1trqvq-0003IE-FJ for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 04:09:30 +0000 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [2607:f8b0:4864:20::1032]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 98aa313d-fe2e-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 05:09:16 +0100 (CET) Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-2fef5c978ccso7465377a91.1 for ; Mon, 10 Mar 2025 21:09:16 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:14 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 98aa313d-fe2e-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666155; x=1742270955; 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=/jGKe5PComzh06JRRSjyC3R7ujh2oauOlO5efOCu+zg=; b=omXTfMAStrbB9H1XbOzwI+p8VSuhEkGl4a+Yi0X8mjG1m0wKwD8dXv0HVsacXFaGZX XQxeyTub0FC82D0gFwvK9J80NHMg0WHIwkwUTAR2Pk+3sZqTxdNKTZgBp8992THxagBs wr4RA5REXMTl8WTfir3bmsL+Ojz8I1gvRiwlxhovmkvuIfn8CqkxLvnix2b768We90rH 6CYSlTFiMgNbE/ISOX09IQrvS6no3733j6weg2pv4ScOugNDvo8JbBaMy17bl3xfjYkE YzBFyvwd63TUNWJO7KoEPA77lcLrf/+5ALhxhplCSNg1KkWROLB+k5W64j+ED0oPWRYG 4COw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666155; x=1742270955; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/jGKe5PComzh06JRRSjyC3R7ujh2oauOlO5efOCu+zg=; b=pKvR3j1k/VeiYufB6H8H0Tn5LUxniBhIA4dtPmPyRMEJNIRfkxuZCH5gYfivl4F9wO exRSX3t1vwjh+fsISDGvTr2t5SdyqULaDN8p6erICXTgQaciFd1wytO26HrqocfIKWx7 cOFDH+EXFoY84w8X6o4qZsFQoRWvbtK09o+B66VEQMks4NCF+aru/fHN2eFozIkw/xVa Gu2k+lJIsNGqq80b7++1CGVmJZXgJtiiEEbiJy8HPxwgyJKFHb/+s57BWialmPrg5Qnb yadqFP7yH5RQh+/qMjKHlLhUyAsdooksjI0AJNPQ1A8Gqfx/d3bA5CbNRwpkqVxYoRCA VPbQ== X-Forwarded-Encrypted: i=1; AJvYcCXCiyGEkEs4LprsgU/xkVvDSSlpDyNZEZiuidZ4eA3+mEhHorHayS/cckjcI+t9p7MrdfA5UDX9ihw=@lists.xenproject.org X-Gm-Message-State: AOJu0YzMUp5yTlOkf9KUiTS3tKTiBnOZP6IMa+JVAize19nGZuzIeRAv xzg6c9VbnAklCtoKwuBrDlKoG1gR0IH50Qx0vKONy8O7wwIyQjWNoLsRWhJvQxw= X-Gm-Gg: ASbGncu7NZANZW05s5T9WCWLD69O7A7BTbLV0ttVH/TKq2dOGTuawawh9wCcmAHBk2f NIlhcavikTU5t2IqhmKLW9uwQPpKMrHoqqhgw/mB+SEPgShkXehn/amHK1plXoEspYWE4KdDnGR o6jBFLu0O6W28z/3+F66/X1IxsIWmkEUbHXlr3xgyCh9zzlqewPKXrdlvQ7UyuoXiogHezTwk2e ROhO45xocud0OWIAhCz0kbVici/P9IfeJRANnLl21AR8HMkKgv2kkYYbqnPlu7wlC8Ci3EaYGpH BIdcAdJWqqnyxlUT1EcThMiRF9ZXKcl2GgBrVmByT7m1 X-Google-Smtp-Source: AGHT+IHyNZlPl+mr9I1Abk1OGoyMfz7g2vsqkJBEqYSKDsIrZops7PpVKyQRnmB7QqPJXfOnNuaTjA== X-Received: by 2002:a05:6a21:6f8b:b0:1f5:8b9b:ab56 with SMTP id adf61e73a8af0-1f58b9bb025mr4529566637.18.1741666154964; Mon, 10 Mar 2025 21:09:14 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 16/16] system/ioport: make compilation unit common Date: Mon, 10 Mar 2025 21:08:38 -0700 Message-Id: <20250311040838.3937136-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-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 881cb2736fe..3faec7e4dfb 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,6 +1,5 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', - 'ioport.c', )]) system_ss.add(files( @@ -12,6 +11,7 @@ system_ss.add(files( 'dirtylimit.c', 'dma-helpers.c', 'globals.c', + 'ioport.c', 'memory_mapping.c', 'memory.c', 'physmem.c',