From patchwork Tue Mar 11 19:57:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012612 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 AA20CC282EC for ; Tue, 11 Mar 2025 19:58:36 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908966.1315991 (Exim 4.92) (envelope-from ) id 1ts5k0-0006Xk-TO; Tue, 11 Mar 2025 19:58:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908966.1315991; Tue, 11 Mar 2025 19:58: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 1ts5k0-0006XY-PJ; Tue, 11 Mar 2025 19:58:16 +0000 Received: by outflank-mailman (input) for mailman id 908966; Tue, 11 Mar 2025 19:58:16 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts5k0-0006Vp-8r for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:16 +0000 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [2607:f8b0:4864:20::634]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 29b67500-feb3-11ef-9ab9-95dc52dad729; Tue, 11 Mar 2025 20:58:13 +0100 (CET) Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-223959039f4so120348505ad.3 for ; Tue, 11 Mar 2025 12:58:13 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58: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: 29b67500-feb3-11ef-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723092; x=1742327892; 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=xyIS890yvKZtu5TQSl53iEAb0SldLni82RUKLtE1cXqYlvD+kNRbQ5/aoz+t9EM/D0 DldSlHWLO/Gx9/qSi4s6HokjNLim31Bp8WxzqU+zLAOl4lVOAAFGrd3va8zEA4hF3RmJ 4Kjrhc10Vy/XeNf6kDuxxqWRD1yIiCGE8xkvSvyguJV4ENcZV4Hj0xezN4bZHm1IRtni eznBWjwDnPff3l2j8JlUThryp1agL88eD4kTD8zAT9a+lqaWWP/627zjVRxOsVbHxNl/ Pip+dUoSxsxSxtFAc7ZdPs8l5nNXMK2M/P+0/GPDeDBukBIfVtqXEc40e0m/SgE5AGD5 JPjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723092; x=1742327892; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=949DeBQijWmgHqYCdDdupcSTn3rDdND8nLqwkILEwEI=; b=suMncCLtRtkqWxOMNKQbxr/fhPHrEzCsIthSjHDX3FNy4oHbwqM1aDkugbWsQMxa94 rTewfXIM4okbD0NNxB10MuPOY1tz3fJ4i9SbquVzpN4vqPgR1bGmekBLLP599a491Cgb X6dVS6Gu9eWuR2BPayYGkheCi24xq5FLagmTARVSd8uyeUiIDuFA0+PfmhzrbvrTajVV AziHkYu2pHFowh+7Eb2v8IhzSQOAQ1LZt+lBxfT+V/xNlGJTApwKQ8qiBt/n4bG5Wn8k xJu6x/gMq4FBfAI4xmvuJBlD4EwmMxRC+AFlpEbKlvpheijPYL4mB/IaRfw2LfjC85+b vzvQ== X-Forwarded-Encrypted: i=1; AJvYcCX2AXN7kGbfpG/HQ+Wfi2dFfDz21f+47zyxs5+az5jP/QqzEjbzjEBJp2qJ3b0bVe1xVEOYncCRVQY=@lists.xenproject.org X-Gm-Message-State: AOJu0YyDhvKPA8Z9/pEsxhzZLW/G8l1gqb9Z4mgU4vGCK0Gg1xeZdHM6 8O5Ym7toPDksxy1isPDo6TwJ/kSS9aSCjSYjxGgxZWJQ0Dkt/H/U/HKjVbv1U6g= X-Gm-Gg: ASbGnctbEosqa+geEPH8R9Xg7mBfnqU43bmE6/jLMN92iywCaE/FzDeYZZea+nI+rCX WjET0YIqdgOjzxraMT6gvQ2vX9TQN3eFr/njk5C7CXCyUfzi5KwviWop7SaWNd+GAX9VWUVkN0I GSU97dOzfHPT1PviwG3LR9KIJ0iFTFRl5unVOuqz8szrwCOHUpXjq3akTdk8UgjQAPb6kyDVpit wTcvEWOdpR6/gwP80Pr3HseYBNAQYQefeZ6zcGDE6GN5hBosSm3Hy9aTuPcsyBeA7/O3AE0UqtX Q48x47YglWj13XL2tH9KCxLC0O1uh11yXespMQIVfhcloHpgCleZl7Q= X-Google-Smtp-Source: AGHT+IEdn0vUjdqWf+0ft6dtNABWq7WqhDB4TNeuQtg0nIMIUQeKA5OeniZU9oewAupJBz+i092ynA== X-Received: by 2002:aa7:9e43:0:b0:736:d297:164 with SMTP id d2e1a72fcca58-736d29703d5mr9263457b3a.1.1741723091837; Tue, 11 Mar 2025 12:58:11 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 01/17] exec/tswap: target code can use TARGET_BIG_ENDIAN instead of target_words_bigendian() Date: Tue, 11 Mar 2025 12:57:47 -0700 Message-Id: <20250311195803.4115788-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/tswap.h | 11 ++++++----- cpu-target.c | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index ecd4faef015..2683da0adb7 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -13,13 +13,14 @@ /** * target_words_bigendian: * Returns true if the (default) endianness of the target is big endian, - * false otherwise. Note that in target-specific code, you can use - * TARGET_BIG_ENDIAN directly instead. On the other hand, common - * code should normally never need to know about the endianness of the - * target, so please do *not* use this function unless you know very well - * what you are doing! + * false otherwise. Common code should normally never need to know about the + * endianness of the target, so please do *not* use this function unless you + * know very well what you are doing! */ bool target_words_bigendian(void); +#ifdef COMPILING_PER_TARGET +#define target_words_bigendian() TARGET_BIG_ENDIAN +#endif /* * If we're in target-specific code, we can hard-code the swapping diff --git a/cpu-target.c b/cpu-target.c index cae77374b38..519b0f89005 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -155,6 +155,7 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) abort(); } +#undef target_words_bigendian bool target_words_bigendian(void) { return TARGET_BIG_ENDIAN; From patchwork Tue Mar 11 19:57:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012613 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 C5B43C282EC for ; Tue, 11 Mar 2025 19:58:40 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908965.1315988 (Exim 4.92) (envelope-from ) id 1ts5k0-0006WD-MC; Tue, 11 Mar 2025 19:58:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908965.1315988; Tue, 11 Mar 2025 19:58: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 1ts5k0-0006W6-Ix; Tue, 11 Mar 2025 19:58:16 +0000 Received: by outflank-mailman (input) for mailman id 908965; Tue, 11 Mar 2025 19:58:15 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts5jz-0006Vp-K2 for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:15 +0000 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [2607:f8b0:4864:20::633]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 2a7004f3-feb3-11ef-9ab9-95dc52dad729; Tue, 11 Mar 2025 20:58:14 +0100 (CET) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-219f8263ae0so113519475ad.0 for ; Tue, 11 Mar 2025 12:58:14 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58: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: 2a7004f3-feb3-11ef-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723093; x=1742327893; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fjQjYNlvDIsMbe7+veFF5h4s6vvln32m8yANkT1fS5Y=; b=vbVp4dsNToGMVrDhoBatcBUBf1bpDRAGTd5lG3yKXmKFrR1tqHo0lgCq+XOcN7Q7Np uVNjfQFi/ED1hT8+vUM1GG5WEjUasqZHnrIQtI38nvSRQSJQUzVwxAkGrKqfdzHMPbMC 2VHilX5fHGyK+cMmrrUEj4qovYYesf8e0RDkFrRt7/NaT/4m5tXpmQz3ujEtR3DCTqn9 jSDwOud7QqCEXC5kfXhNjdp+Cw3atjyyTS5O/Qel9MKIi1cNZzejiptC2UIdfYuhUdsO tPbiNsp2I2ne9ig9qCvAdn2XlmeFl4uotqL46rjz/jXDY0RGXdJBR1e3vsnhGerbL4QH 7XDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723093; x=1742327893; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fjQjYNlvDIsMbe7+veFF5h4s6vvln32m8yANkT1fS5Y=; b=cwKPShV1sDu8Mmc08eNFU/+0XKysJC+6XQ2b4QN8rmO+jd+mNf3eeyiuxq3ErL7rxz 6/r1xThfCKQunSIros8Y9FpxCr8Z3t2N8Ir5D+CKdfZmt3PZomKoLVD6ahjFCcuWKWzd x+3jkCuAOGLvOKs1UEsGUgJnkqC6R8lleYMSx84Fvv71L4tzQC+2K56BPt5+vein7b/3 rzijq/+MZXGf/76PPRsoB1bEUHhTZpDldIrVnfHHsqif/cANq05rnM/YeDa9XCfULAsc NTLU15lQCQVxXeoeZqwAHDjZwEbBJLlDQ1M/XcsjlCKeMXoIS28ty8+qrlcvcVh2EyOj TVCw== X-Forwarded-Encrypted: i=1; AJvYcCVKoIPnG9iDx/NC7gmTFRzgGlGcvDxVEdqWBN+j11jdb3hbc0hi+i7M489w1DdKXC3xUXemHHYzGPs=@lists.xenproject.org X-Gm-Message-State: AOJu0YxFobBoqZ92bPtIk9R6+HnNvP6QPKZvFIvYAnTQU/FkLOGpCz3G kpczWPwyDtKdNaRcEQt7mABtvT7nMAP9gkV+d+IrMJVFau7xer+ZpY6Tcf9tV0E= X-Gm-Gg: ASbGncsikKRNAIcUAWWnnk8SKLw8V7PUj5w9MYQAV0/hR5VyWeKfrZRdFs/Bsgzs/fp 6zQonC+kk5Vx7pEaJmSKFhfuurs9BueG4fr1EzIESV1e9YtFBwDFFj1Ka7Sqvo0Cn1LzGk5IgsV YQzEOwcQNDJJGPIVNtmIA2AgB4ZYeq2MAURk3jRCpaRCjy1kDPHJEyuGnr5JwvuvJFdcvzOrOi4 L9zLeATy2Wif2JoyrY9HDetW3xaXrtQWvkvty5bCzXElsi7gQ3qMfGf1NZeTxCdrvxWdUveQDAw zQQCW8e8PeOx3KeetJY4dyLTUT0linrT2pTnsOt7wS9j X-Google-Smtp-Source: AGHT+IF/o3Z1voLQASAUjPWBawCvXOSnOMhb8Nk2igLOMO9aCbEfuSVrBfikbaQLM80fsMV5kN5HDw== X-Received: by 2002:aa7:8892:0:b0:736:a540:c9ad with SMTP id d2e1a72fcca58-736eb8a17b5mr7090307b3a.20.1741723093074; Tue, 11 Mar 2025 12:58:13 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 02/17] exec/tswap: implement {ld,st}.*_p as functions instead of macros Date: Tue, 11 Mar 2025 12:57:48 -0700 Message-Id: <20250311195803.4115788-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Defining functions allows to use them from common code, by not depending on TARGET_BIG_ENDIAN. Remove previous macros from exec/cpu-all.h. By moving them out of cpu-all.h, we'll be able to break dependency on cpu.h for memory related functions coming in next commits. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 25 --------------- include/exec/tswap.h | 70 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 8cd6c00cf89..e56c064d46f 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,31 +38,6 @@ #define BSWAP_NEEDED #endif -/* Target-endianness CPU memory access functions. These fit into the - * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. - */ -#if TARGET_BIG_ENDIAN -#define lduw_p(p) lduw_be_p(p) -#define ldsw_p(p) ldsw_be_p(p) -#define ldl_p(p) ldl_be_p(p) -#define ldq_p(p) ldq_be_p(p) -#define stw_p(p, v) stw_be_p(p, v) -#define stl_p(p, v) stl_be_p(p, v) -#define stq_p(p, v) stq_be_p(p, v) -#define ldn_p(p, sz) ldn_be_p(p, sz) -#define stn_p(p, sz, v) stn_be_p(p, sz, v) -#else -#define lduw_p(p) lduw_le_p(p) -#define ldsw_p(p) ldsw_le_p(p) -#define ldl_p(p) ldl_le_p(p) -#define ldq_p(p) ldq_le_p(p) -#define stw_p(p, v) stw_le_p(p, v) -#define stl_p(p, v) stl_le_p(p, v) -#define stq_p(p, v) stq_le_p(p, v) -#define ldn_p(p, sz) ldn_le_p(p, sz) -#define stn_p(p, sz, v) stn_le_p(p, sz, v) -#endif - /* MMU memory access macros */ #if !defined(CONFIG_USER_ONLY) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index 2683da0adb7..84060a49994 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -80,4 +80,74 @@ static inline void tswap64s(uint64_t *s) } } +/* Return ld{word}_{le,be}_p following target endianness. */ +#define LOAD_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + return glue(glue(ld, word), _be_p)(args); \ + } else { \ + return glue(glue(ld, word), _le_p)(args); \ + } \ +} while (0) + +static inline int lduw_p(const void *ptr) +{ + LOAD_IMPL(uw, ptr); +} + +static inline int ldsw_p(const void *ptr) +{ + LOAD_IMPL(sw, ptr); +} + +static inline int ldl_p(const void *ptr) +{ + LOAD_IMPL(l, ptr); +} + +static inline uint64_t ldq_p(const void *ptr) +{ + LOAD_IMPL(q, ptr); +} + +static inline uint64_t ldn_p(const void *ptr, int sz) +{ + LOAD_IMPL(n, ptr, sz); +} + +#undef LOAD_IMPL + +/* Call st{word}_{le,be}_p following target endianness. */ +#define STORE_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + glue(glue(st, word), _be_p)(args); \ + } else { \ + glue(glue(st, word), _le_p)(args); \ + } \ +} while (0) + + +static inline void stw_p(void *ptr, uint16_t v) +{ + STORE_IMPL(w, ptr, v); +} + +static inline void stl_p(void *ptr, uint32_t v) +{ + STORE_IMPL(l, ptr, v); +} + +static inline void stq_p(void *ptr, uint64_t v) +{ + STORE_IMPL(q, ptr, v); +} + +static inline void stn_p(void *ptr, int sz, uint64_t v) +{ + STORE_IMPL(n, ptr, sz, v); +} + +#undef STORE_IMPL + #endif /* TSWAP_H */ From patchwork Tue Mar 11 19:57:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012618 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 A4887C28B2F for ; Tue, 11 Mar 2025 19:59:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908972.1316047 (Exim 4.92) (envelope-from ) id 1ts5k9-00084N-Cr; Tue, 11 Mar 2025 19:58:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908972.1316047; Tue, 11 Mar 2025 19:58: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 1ts5k9-00083H-8e; Tue, 11 Mar 2025 19:58:25 +0000 Received: by outflank-mailman (input) for mailman id 908972; Tue, 11 Mar 2025 19:58:23 +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 1ts5k7-0007Uu-J5 for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:23 +0000 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [2607:f8b0:4864:20::62a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2b1e613f-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:15 +0100 (CET) Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-22401f4d35aso106632935ad.2 for ; Tue, 11 Mar 2025 12:58:15 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58: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: 2b1e613f-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723094; x=1742327894; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fcP4MFj0H7Fu3AxOxTbJlPG2KgbdJwiBtz5sSPdKZDU=; b=RjxedlZ+LW41z+BebQ4BXMVeF3VJ5Ei1rh961kAkVbOMN2hI83W/ET8I2lfir2hfsz aKIkH2Cq9h7pN5YVvGTkfqSrlcJuElxS8j/tbUbRHgy+8s5b1kL4x0qL66yPKF4djurI EOaqaeh9XNI2lKYJGs2S1LQJolhiUiMDsi+4SyubEY+3tBXqDiyq258G5Pdt1CkDNluG s0G+FA7XUdbyD8qx9/+5WV9GwpceU2LLo4UDn2UxJqtPkCM3yY4jD+xSzU8plkWa9fCW JfsMyJ30uepyxe1wFxHMnCQYbsvQw9ol20d/aor4aapLuB6dz2SLrZ0bFm7uNJxi0lX5 dcEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723094; x=1742327894; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fcP4MFj0H7Fu3AxOxTbJlPG2KgbdJwiBtz5sSPdKZDU=; b=oPxDILh1crm6Ta796d3j8QvgQhd4rl1/ssPFQUpVsCGU3dnAy8gESjjlQhox4qk6n0 /QF+9SkyaEYXFyv5P7ipYHvT6t9TVuvpmET3grux0SHW+KMGqmtApFiVwIvMqkBGbig1 bGIsWgI0KZ/51rDjFr70qD0TLtY6Jgq/q8g5vNbfxw9az1p8TuKGWsiovRCXXCsmpSC8 abL4tfjU9k4ilj07QFMf+fcoBa6KVwCf+3G4dhrqYeUX9UdhIKqTUoeclof07LYOA24f juLVYRDv1sz+2es1hj+0KBgIX3Tb9A+szEXwsYq33KLP2XIAvFwZpdYR9OAfnMd0A5JH 314w== X-Forwarded-Encrypted: i=1; AJvYcCVGUSZhEM1N+BZvWAq6PfCHWHMUsd4mhFJoE/dzHtwxlWAdE1L3ClJ1M4rQT9Y5bYfMqPaUoCilWDo=@lists.xenproject.org X-Gm-Message-State: AOJu0YwyozfjsNAGwjPXkinDmPhnxUgn6kODf6LiPouls4rec17R2n1l KMHB7Y9lOQOUtX0/7cObZ1DPVdWDZtsz/Gu/2EiR429GhExYP0cgihUpVFxOq/E= X-Gm-Gg: ASbGncuxmS2q1UEj0KMiS+Mmf8y4N5E4aOrll8xpaT6oiLTkEtcPILuCCyGVHQV9hXR Q99K8u4PuYvvf4EL2DBTmEB3wIMEbO6cHns3eazQ+1tNuDWlNxSKrZMFeU8mEeGujOKx8ELxI0M UXxC5Im1Bnl/sqzSmeGkinaE3uXdarlEFMDxVxFAQF2lZ1dhD8ntdQLWQLZT/EfZf/5XhwL0yA2 ea3qaMvJLMsgoTp1GDfkrwuCmZ6BLnyub6QnqG6EGRdyFLUYb+lopx4WYgsaAPYH+g32jWQVjwh wWjYCkJIr+eq8bKQCuOL5I5evFUmdzb/dntEV9Q/33L0 X-Google-Smtp-Source: AGHT+IHtn3wjueX80hXlhR3WWJLzlWQ/GjOadBaAC9ISUpU84/t/abdjw/+6bEkcmiHY0rapbw+ALA== X-Received: by 2002:a05:6a00:189b:b0:736:755b:8317 with SMTP id d2e1a72fcca58-736eb8a15femr7017121b3a.21.1741723094173; Tue, 11 Mar 2025 12:58:14 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 03/17] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Tue, 11 Mar 2025 12:57:49 -0700 Message-Id: <20250311195803.4115788-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 12 ------------ include/exec/memory_ldst.h.inc | 4 ---- 2 files changed, 16 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e56c064d46f..0e8205818a4 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -44,18 +44,6 @@ #include "exec/hwaddr.h" -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - -#define SUFFIX _cached_slow -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) { address_space_stl_notdirty(as, addr, val, diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 92ad74e9560..7270235c600 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, @@ -34,7 +33,6 @@ void glue(address_space_stl, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#else uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, @@ -63,9 +61,7 @@ void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Tue Mar 11 19:57:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012615 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 3CE18C28B2F for ; Tue, 11 Mar 2025 19:58:51 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908968.1316013 (Exim 4.92) (envelope-from ) id 1ts5k3-00071w-H5; Tue, 11 Mar 2025 19:58:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908968.1316013; Tue, 11 Mar 2025 19:58:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts5k3-000715-CZ; Tue, 11 Mar 2025 19:58:19 +0000 Received: by outflank-mailman (input) for mailman id 908968; Tue, 11 Mar 2025 19:58:18 +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 1ts5k2-0006Vp-9T for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:18 +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 2bc930c6-feb3-11ef-9ab9-95dc52dad729; Tue, 11 Mar 2025 20:58:16 +0100 (CET) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-224171d6826so18620055ad.3 for ; Tue, 11 Mar 2025 12:58:16 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58: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: 2bc930c6-feb3-11ef-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723095; x=1742327895; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G6OuFeXnonCJBRRaCKlE2hD3nLeAbwsquVgoLJADjfc=; b=WpuoPihMRMWrkVQBNjGQPnYo/jH2kb+d7qiiBz3VVnnX47fUwlpUzdlYoTdG1C8RPp qjjq9C1OajdubFUsehFC1pwmTWieQ2d3CvwRG+O68o2HeAXuvRbbVcdjc/k+LOyGPV6u iiOdcLQeP1OXEYUIteISVOkO7vshd/5YSnj0WpBOzEuLW6wVafDcbHpEV1hdAn2Rl2Db 0jSazE1cUxO1l5VZQcgA0aIA30fNYgNOqCs0Kr5BvPZIjoJSi46hBDZVzgztifKBhGRK xn3ErySzKASOj6vZwTHTDaHRfyiq342cyU35VVrpMsSjr3T6psEBCJ5A5DoXH80tCrmH D6oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723095; x=1742327895; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G6OuFeXnonCJBRRaCKlE2hD3nLeAbwsquVgoLJADjfc=; b=bSjO5s2LDVUkxIPrR6FjSZ+U5U7owNuA9XsZONcvngUYpGU5VT2B+oL9x5kt+AYjcO GRdw2DYY0zuSZ/bHiU0ZIo6Bh5LhEvnuNc8H1N7MLh+4h7DofGPH2cTPFu/18RjmNPZx I+wL+QqqOE7q+5sGNBTkaid9ZMPSDHALaQ5uK7PZ7tIhc5UeEICLNuutG5VHey192yCc iek9sdX/PTueB/g9ijqAsVEeq/9cBXM6xZsisij4eE2eLusQ4eeHStSjP0Z86sdXNx9d Rj9z+m3/0s+ynu+W1yjM+Xv2gD7m8uBeFZnYX87cBmNDrNkHWHszm9FZ5byGEiQln1UL YEbA== X-Forwarded-Encrypted: i=1; AJvYcCVTSuztSLtGOQ7gKij447HK51dFXVdTFGuS25FoCktVoo+JwOpeWIEO/BBL8z3ghv1XInX0WsTN3zA=@lists.xenproject.org X-Gm-Message-State: AOJu0Yxwpg99iECUkUKmm7jE574q/Ud4WicFuMjax9RtO3ux6vRvc5hI SoKtQo7bYrzWzSsyF2pAwkDGkRdH3UREiIJ5VZ20Q3DwaG9yknJzU8Wkv90jUNM= X-Gm-Gg: ASbGncvmUJofnjrukt5Oe0rzahbTzypGLtlGO6RqWaRay1Epj+aU3v/c7lt/Bw7hmBg QhBS4w6rhmzQjiz1VJo9zH85TCLVC9l84WLhdh/ZUJdgd4lH3HpWLkwuwSidWvxH9P3IWjTTMuV 1GHhHdOW+TSrSANSSv7dV2up7g0e88Unt/0fSJYEJBc91LvRkg0nzljWyqWXKav3IPb1JCGE0nJ j9+s1dYTFfHW48hBHKBYXV/68yrdOyTjmvFml/6K1GcB4cKKf6jLN/pHt9XeWML9Y+VGAhvwvEI rmTjrqpwuHkWNQ8Fd7AZCrbzM8IjGO5VGJ2Sk7K6sEag X-Google-Smtp-Source: AGHT+IGNWEO4mZBHpAmOvbPEdLBPlFyMCMG4ZRJsA2UNTnkEr6ujtHjiyajOo8ag/l99JEaYOKJfOg== X-Received: by 2002:a05:6a00:190a:b0:736:31cf:2590 with SMTP id d2e1a72fcca58-736aaaad27fmr26132051b3a.16.1741723095319; Tue, 11 Mar 2025 12:58:15 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 04/17] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Tue, 11 Mar 2025 12:57:50 -0700 Message-Id: <20250311195803.4115788-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Move stl_phys_notdirty function as well. Cached endianness agnostic version rely on st/ld*_p, which is available through tswap.h. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 29 ----------------------------- include/exec/memory.h | 10 ++++++++++ include/exec/memory_ldst_phys.h.inc | 5 +---- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 0e8205818a4..902ca1f3c7b 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,35 +38,6 @@ #define BSWAP_NEEDED #endif -/* MMU memory access macros */ - -#if !defined(CONFIG_USER_ONLY) - -#include "exec/hwaddr.h" - -static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) -{ - address_space_stl_notdirty(as, addr, val, - MEMTXATTRS_UNSPECIFIED, NULL); -} - -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" - -/* Inline fast path for direct RAM access. */ -#define ENDIANNESS -#include "exec/memory_ldst_cached.h.inc" - -#define SUFFIX _cached -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" -#endif - /* page related stuff */ #include "exec/cpu-defs.h" #include "exec/target_page.h" diff --git a/include/exec/memory.h b/include/exec/memory.h index d09af58c971..da21e9150b5 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -21,6 +21,7 @@ #include "exec/memattrs.h" #include "exec/memop.h" #include "exec/ramlist.h" +#include "exec/tswap.h" #include "qemu/bswap.h" #include "qemu/queue.h" #include "qemu/int128.h" @@ -2732,6 +2733,12 @@ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, #define ARG1_DECL AddressSpace *as #include "exec/memory_ldst.h.inc" +static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) +{ + address_space_stl_notdirty(as, addr, val, + MEMTXATTRS_UNSPECIFIED, NULL); +} + #define SUFFIX #define ARG1 as #define ARG1_DECL AddressSpace *as @@ -2798,6 +2805,9 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache, } } +#define ENDIANNESS +#include "exec/memory_ldst_cached.h.inc" + #define ENDIANNESS _le #include "exec/memory_ldst_cached.h.inc" diff --git a/include/exec/memory_ldst_phys.h.inc b/include/exec/memory_ldst_phys.h.inc index ecd678610d1..db67de75251 100644 --- a/include/exec/memory_ldst_phys.h.inc +++ b/include/exec/memory_ldst_phys.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS static inline uint16_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw, SUFFIX)(ARG1, addr, @@ -55,7 +54,7 @@ static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val) glue(address_space_stq, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#else + static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldub, SUFFIX)(ARG1, addr, @@ -139,9 +138,7 @@ static inline void glue(stq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t va glue(address_space_stq_be, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Tue Mar 11 19:57:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012619 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 0B81AC282EC for ; Tue, 11 Mar 2025 19:59:08 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908973.1316056 (Exim 4.92) (envelope-from ) id 1ts5kB-0008MZ-3a; Tue, 11 Mar 2025 19:58:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908973.1316056; Tue, 11 Mar 2025 19:58:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts5kA-0008Lc-RB; Tue, 11 Mar 2025 19:58:26 +0000 Received: by outflank-mailman (input) for mailman id 908973; Tue, 11 Mar 2025 19:58:24 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts5k8-0007Uu-Iw for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:24 +0000 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [2607:f8b0:4864:20::62d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2c7bcf48-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:18 +0100 (CET) Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-224341bbc1dso80069125ad.3 for ; Tue, 11 Mar 2025 12:58:17 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:16 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2c7bcf48-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723096; x=1742327896; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wT5ohu0Ui7xrH+jgYqMJMpKemGPcZNvy7jzdyuAyzEs=; b=q+LietHmiMkGO68RvjWenF1AoXzdEsM7f64rE+0g5VtEW5issuYqNKsPwc9Udj4Apx Fgwhd43Upm106seMw99n1aqXkRaKfSylOMr5PuqlZatTkAvrZjobtzYABx6CGvNYl5yW w/3I6T3L0GlsikGOPLNmK0N5lTpstl+bxXuInTA9buaa3hyn04ZdKki0HSYmDJxprFki 21FTMhS+A2GqaSExVzqMIK+JRi3e6UuH+a7P7p/PT+coBTTXZ+4XRwwRSOwAfU0eE9Th kp6Qn+CreF4XmXgyiTvx5o0440WOkGoGp4i1dsnr4L+HKXp/50vVAQKuJACb3BhSwj1t 4Lhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723096; x=1742327896; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wT5ohu0Ui7xrH+jgYqMJMpKemGPcZNvy7jzdyuAyzEs=; b=sGAUCGQmNH+F/tdT551grvcmjJ3R8dWxay+O+9su0Zg8gExh3N3TReCJCPJIzoDft9 e6VBETnHvXLh42V9ynb8+eqrTmlJQo3x8kIZ0RwPN5r/KcP3N2NPMLMv4iXRfgO4tlRk yB43KNHIPyWXWJ84Gv7cVq/15pQUXsLtTL3WRkUkmCLxu2emzB6MNsVF8nii2fZR3NVk efqkNGyH39hxXNenvQopZXG1WFxRAYhRhbmd0DHQL/cZxoCr/trRXBsGH/WzmQdGdhmS LFxebVfr2zz9coy6mDDzrh3SRsWzLGQcK1u8ePIzpnC0yBUVtivnDrsG0uTGkxOF1gFz F+Cw== X-Forwarded-Encrypted: i=1; AJvYcCUJdxEQiPZCEHJlIYfLTef7ckpUfAqwLjuREOcuCfDbqTugo8x+D+5vJ516ukMhs7A4WWwyb8H3bvc=@lists.xenproject.org X-Gm-Message-State: AOJu0Yz9CHoJrRkfRE0hsGB1GjPRq1W97AwSeZwgMqR5ZGtEXTphCjWC vKRoRv3CF2hFYxBWBwj2GpPtMGvv08Bus7uYZh9lyTAUGlgU2h/84cGPCHowanU= X-Gm-Gg: ASbGncukUyqOoHNZAd8PIgTzn/ZJmz+avj1wEyt9NkD4iikleugz7Ha3oErOyeATCwz VLzLN8I300I1dxPnQ3Cqx+D+aPQ+zClZwAJNsrBeSASVKdWjixGUtENWVpMHIl+QUDnfaOCq6rm 7Ctzo+TVPqKRY+T3ags88X2Vgh0jb2NqUik21xJOU2ZVGeQxeHjJg5h2Oez3gZ4y7N0lT6BRjGB yQUPSSN2R2dXnVBkXj02u/hZ46/FgWo2iKobchX/PqjvQgXz6zHKngw4Jg9Y7HuVvHeOU110o3B SYagOQEhlpmdz/WeIfMFB3Rrwfrju8lj7M8vwtZrrlcU X-Google-Smtp-Source: AGHT+IFol9xcK9Mza8BcbJc/CzML1UZwkH32uaLlj+5vumcl06S67T5kaVFtBRtM8pv/UzBlFhWjBg== X-Received: by 2002:a17:902:f691:b0:215:bc30:c952 with SMTP id d9443c01a7336-22592e2009cmr58302965ad.6.1741723096508; Tue, 11 Mar 2025 12:58:16 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 05/17] exec/memory.h: make devend_memop "target defines" agnostic Date: Tue, 11 Mar 2025 12:57:51 -0700 Message-Id: <20250311195803.4115788-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Will allow to make system/memory.c common later. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index da21e9150b5..069021ac3ff 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,25 +3138,17 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -#ifdef COMPILING_PER_TARGET /* enum device_endian to MemOp. */ static inline MemOp devend_memop(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); -#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN - /* Swap if non-host endianness or native (target) endianness */ - return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP; -#else - const int non_host_endianness = - DEVICE_LITTLE_ENDIAN ^ DEVICE_BIG_ENDIAN ^ DEVICE_HOST_ENDIAN; - - /* In this case, native (target) endianness needs no swap. */ - return (end == non_host_endianness) ? MO_BSWAP : 0; -#endif + bool big_endian = (end == DEVICE_NATIVE_ENDIAN + ? target_words_bigendian() + : end == DEVICE_BIG_ENDIAN); + return big_endian ? MO_BE : MO_LE; } -#endif /* COMPILING_PER_TARGET */ /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., From patchwork Tue Mar 11 19:57:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012617 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 28D12C28B2F for ; Tue, 11 Mar 2025 19:58:58 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908975.1316062 (Exim 4.92) (envelope-from ) id 1ts5kB-0008O7-D0; Tue, 11 Mar 2025 19:58:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908975.1316062; Tue, 11 Mar 2025 19:58:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts5kB-0008Nc-4K; Tue, 11 Mar 2025 19:58:27 +0000 Received: by outflank-mailman (input) for mailman id 908975; Tue, 11 Mar 2025 19:58: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 1ts5k9-0007Uu-JG for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:25 +0000 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [2607:f8b0:4864:20::62e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2d24adc0-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:19 +0100 (CET) Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-22359001f1aso140554015ad.3 for ; Tue, 11 Mar 2025 12:58:19 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:17 -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: 2d24adc0-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723097; x=1742327897; 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=bdZecelYaEvd+aGIJaZvtG1mNhnUBGkmlB4X9p1O1nhGjayi25f4JSs/EOVd53V69z WzBwpRwmOdAdgKpS0ps2XlmC1DaIZr8C8ex6INA7LkCETLq6DBL8hJn3HARnjtA55/3a erRD0DISmjfw9ulLDUXB424ggSftIBS89Nk9Tp36rCCZhLEVmZA60pwaxNilzVOMtqLk /8XJDgMz1QnADG56XqpupL1ZIXkGdofUOWkadRrwUCdNDynrGVZ83dnIXYMXQhbBlSMY 8e5m8Ox9xQsLlAT746wzTYFwkVpsQc1fVDmY3o4gTivBfoq0HqqooA8iTgxK+7ReSKpN 5BXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723097; x=1742327897; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wYUY7egDw13yHwOIShpp+yHE9Lg9eeptR3FMaPhbw5Y=; b=hoWz6uk+WAAG8tqUqyItnH/n2yNBbNnryZHajI4b4uJMihEddfk0xwBUiW/prv+KGS 3wsBxlyV6eVoehiABYWqx27szZGcpH7FycgU//S83SvjdslN68qAOWtvrDQuxuKGeQts 9sAQeoP1zGJbIvgn6t5zgQ3lu+M7A8Lz+xhJe7ExFT36Cnmc2hS6MfHAmyOR2VBCBj5G QvxUH5HNe1rZPqirEXZ22z3z2IrGVaKRjldbsEU+P816xBugWTESZCgtnxumyJygITV6 6jKWZL87GPjDznJ8FrmDyoj3xT3+vb+ig++KNUiV3hY1c8VM39RlFE5DkthD5KmW4Z8z y6cQ== X-Forwarded-Encrypted: i=1; AJvYcCWl835NQH0aWF1JGmk6WsCi3QyeASD7UksnJsTNCRswdf6cnWX6fauPlN79MMf450Ydh7Yq+wGCidk=@lists.xenproject.org X-Gm-Message-State: AOJu0YyIJMxZ8dWBjoZs7gzckxT2B7HEKWwAEydyi6XKVRi0U7HyBsJG 4owv9hNzsSnQo4foTa67JnuztZG6KG979lze1BZzFb9OV4HdtgMdhywJzkS7XrI= X-Gm-Gg: ASbGncvKjS4D7Ji09KM+wYCkfJzZ/4tzAMe5LLWM2gXZ43gt0j4W6YfmhstSN2/dHKV SrqH+Ccq3xYgQ6t1O9DRyV+tdVCONSosVgAP2zUlBIkwqmuvl9XTbusWMKzexZqzNqOeul5I7U3 ivYYSGy6jB2yiTUdyF8zn61GYus359q4A6Lu5a4OaOpl8pcumChQMbYo7xAR8mC5xHWJGJ+UuM/ SfpfplNbplwnbA1aHnzdYs33C3FWRXKQQOUiVuyOgauOpJ97QIJWjROwg+pda/24fvhzO+VrV+R ETtt06FWC6JQD07ystgulHIJfNSFrSsVVlB9Tae1k0Wr X-Google-Smtp-Source: AGHT+IHUxq5bEYzFkU8q2EMgwzHdCRPdTyU3cSt/scNg1CwBg3gT9IGXS4Ltng7xzXvu5gfwiPtTEg== X-Received: by 2002:a05:6a00:7218:b0:736:ab48:18f0 with SMTP id d2e1a72fcca58-736ab481a99mr17386794b3a.1.1741723097629; Tue, 11 Mar 2025 12:58:17 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 06/17] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Tue, 11 Mar 2025 12:57:52 -0700 Message-Id: <20250311195803.4115788-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/tcg/tcg-op.h | 1 + target/ppc/helper_regs.h | 2 ++ hw/ppc/spapr_nested.c | 1 + hw/sh4/sh7750.c | 1 + page-vary-target.c | 2 +- target/riscv/bitmanip_helper.c | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index a02850583bd..bc46b5570c4 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -9,6 +9,7 @@ #define TCG_TCG_OP_H #include "tcg/tcg-op-common.h" +#include "exec/target_long.h" #ifndef TARGET_LONG_BITS #error must include QEMU headers diff --git a/target/ppc/helper_regs.h b/target/ppc/helper_regs.h index 8196c1346dc..b928c2c452d 100644 --- a/target/ppc/helper_regs.h +++ b/target/ppc/helper_regs.h @@ -20,6 +20,8 @@ #ifndef HELPER_REGS_H #define HELPER_REGS_H +#include "target/ppc/cpu.h" + void hreg_swap_gpr_tgpr(CPUPPCState *env); void hreg_compute_hflags(CPUPPCState *env); void hreg_update_pmu_hflags(CPUPPCState *env); diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c index 23958c6383a..18bbb1403c6 100644 --- a/hw/ppc/spapr_nested.c +++ b/hw/ppc/spapr_nested.c @@ -2,6 +2,7 @@ #include "qemu/cutils.h" #include "exec/exec-all.h" #include "exec/cputlb.h" +#include "exec/target_long.h" #include "helper_regs.h" #include "hw/ppc/ppc.h" #include "hw/ppc/spapr.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 6faf0e3ca8b..41306fb6008 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -29,6 +29,7 @@ #include "hw/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" +#include "target/sh4/cpu.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sh7750_regs.h" diff --git a/page-vary-target.c b/page-vary-target.c index 3f81144cda8..84ddeb7c26a 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "exec/page-vary.h" -#include "exec/exec-all.h" +#include "exec/target_page.h" bool set_preferred_target_page_bits(int bits) { diff --git a/target/riscv/bitmanip_helper.c b/target/riscv/bitmanip_helper.c index b99c4a39a1f..e9c8d7f7780 100644 --- a/target/riscv/bitmanip_helper.c +++ b/target/riscv/bitmanip_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" +#include "exec/target_long.h" #include "exec/helper-proto.h" #include "tcg/tcg.h" From patchwork Tue Mar 11 19:57:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012614 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 994FDC282EC for ; Tue, 11 Mar 2025 19:58:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908969.1316028 (Exim 4.92) (envelope-from ) id 1ts5k6-0007Wy-TB; Tue, 11 Mar 2025 19:58:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908969.1316028; Tue, 11 Mar 2025 19:58:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts5k6-0007Wh-Nv; Tue, 11 Mar 2025 19:58:22 +0000 Received: by outflank-mailman (input) for mailman id 908969; Tue, 11 Mar 2025 19:58:21 +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 1ts5k5-0007Uu-TP for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:21 +0000 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [2607:f8b0:4864:20::62d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2dc86ca4-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:20 +0100 (CET) Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-22113560c57so111409135ad.2 for ; Tue, 11 Mar 2025 12:58:20 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:18 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2dc86ca4-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723099; x=1742327899; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bYYGOsy+zcSjxVOnigwMonGaAhWbZB7W76ZyOX5Jlgc=; b=MrBjC14IbrRjXfyDaHlpQgUSOS+1ZWWkDsY7WQ6vPwqn6+/gZMK/fIaIBHu1LmOrz6 vHd9uH33Jwrr+Q/d0AEQzRplk1PVAt7Da/M0OLeDMSMPb7lHtRA36uRL0dXYN/UsitJH nP0cDqp0w095eM+PB18C17FeQ+iFk2PuoV8S+sF//QqB+ewVp/dtfkTgrBM1aWBJ/5ti CEupD/zVfymVMx64xXrd778/XklLbUpwRMv0MwfVmcElIeolgOLUaZOE0CeYgrNDmPW/ Cet3J5CWdgQjGU7XGMO4G5NZH6qPIkFv8UjNbbM5VCTExriLsfbmQFtVTAbUJ2/SGKwi OEOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723099; x=1742327899; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bYYGOsy+zcSjxVOnigwMonGaAhWbZB7W76ZyOX5Jlgc=; b=b1oHNBINq7L7tPiDM3hJ2KL2hQZlvLdj9jagya42GsF0K0NjCPFpmAuoAiYHT8GcLI 8rh7011KtpYOWe3J2qaCHZWB86Q4OKitNOWQCICESabJ5esQ5gq7n1sYWipXsuQYTkYy 1iIcw7qKgAsVzqg7jR+Wt3bjmAK9lwX27JMdWCHkRKFynB9Nqh5mSjSqMGaOpxBbXhIl OMpw1qKhj7BzTTvbKgxfMclJsOzsw7FiGsSE6P3qDnJ883TA7O+zDFhWQZr3AAWX/chr Dhb+heVCK7Xa9XuEWIutexZOIJV8sODTfNPp1NQQOu4xmhxNBhPj3qI6IpKlj1E6ZDNv l4eA== X-Forwarded-Encrypted: i=1; AJvYcCX5DjEuMjzFPfP4hrLcDuUI9mR+xsqXlypF5+Tb3CrYMDbVsU8uF+VwY8LwqTnE+fsVoCXVcVXSYTI=@lists.xenproject.org X-Gm-Message-State: AOJu0YzvFvWGh8JQStmYJLeC+d5/oLGj9OCYOmU3WKa5Z0O0ObhD2w0z 0E13fp6ECZxxTfkUCL2KIb2mwtCLG6qz/lt417V85DW7A4PNCDFHG+WX8SXapcM= X-Gm-Gg: ASbGncs7GWmpLf/nfnKBH1lBGogYqKs+BzgNyeY2e1r07Jxmy944TmsS7bslN6m/Dph SOAuvADDReWpyFPUoQP8ld25d/TBOTZRHjO4aR1ZQ6CKSDKB43lYjzJnHbGCM99WqUqLzpvJOr4 TJb+UqDnLPqqYT4HywVQTvEROWSe9lFwC+JMFEH94/mb9H+hMVjm9kHruA3jRguYx+ywgijozoU PfeFPsd+0DMB53AmqE8lYSIQWvp8zvNZgQX1xxwdd6x6v0v058T2UvVXWCRyp3/kl4+BdKfTjQ2 yQkcacZovQ/TE6CreZzedRKCt6o1aOHCQvPfLt2DqFpCHizizH6t41o= X-Google-Smtp-Source: AGHT+IFbL/EikEqHmQH7/+hOB9jflYFjv2fXkewmYVpLTsSrUYTiBJ9zTgGhdqBywi26rV+yUM0nVQ== X-Received: by 2002:a05:6a00:1708:b0:736:43d6:f008 with SMTP id d2e1a72fcca58-736aa9f0b0cmr27815913b3a.12.1741723098739; Tue, 11 Mar 2025 12:58:18 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 07/17] exec/exec-all: remove dependency on cpu.h Date: Tue, 11 Mar 2025 12:57:53 -0700 Message-Id: <20250311195803.4115788-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Previous commit changed files relying transitively on it. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/exec-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index dd5c40f2233..19b0eda44a7 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,7 +20,6 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H -#include "cpu.h" #if defined(CONFIG_USER_ONLY) #include "exec/cpu_ldst.h" #endif From patchwork Tue Mar 11 19:57:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012616 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 5142EC2BA1B for ; Tue, 11 Mar 2025 19:58:53 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908971.1316038 (Exim 4.92) (envelope-from ) id 1ts5k8-0007nl-4W; Tue, 11 Mar 2025 19:58:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908971.1316038; Tue, 11 Mar 2025 19:58:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts5k8-0007nV-0R; Tue, 11 Mar 2025 19:58:24 +0000 Received: by outflank-mailman (input) for mailman id 908971; Tue, 11 Mar 2025 19:58:22 +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 1ts5k6-0007Uu-Lz for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:22 +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 2e77400b-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:21 +0100 (CET) Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-225477548e1so64746335ad.0 for ; Tue, 11 Mar 2025 12:58:21 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:19 -0700 (PDT) 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: 2e77400b-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723100; x=1742327900; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Rp8GQC6vA5rTxSSazblnkjuLZPjrJAYUOFg9uGM493s=; b=rqT+31mIV+vPr03qoENe6CuMOe8gLU4c+/GqGRI21EM+dS3Ec2fPRdbewPKTUSbooW vRycV7B6RVOK1vhZOIXBYxWOP7VQ/EXiTO/D29r3I6EmdnNWcOutxwiBGM8vMiYXePGQ 9vghG81+GFDPEdj3z0WVnSmOfuqcysl4xJsE8N0eqOJn584n5DIwfc+Z5hBSG90OBQY+ zOai0wydV9wQOFixpCT1IFZrKwkO5b8TgExMwkS1LiOcKish8VTxYsHezoZs4yScwP1t D6ahQSVvrawIsZpWSYB5XB1YSLx/nHvZG83PYP/l2YfQo63W9CdbcbxyTYYMbsMePt2k JLhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723100; x=1742327900; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Rp8GQC6vA5rTxSSazblnkjuLZPjrJAYUOFg9uGM493s=; b=KmKL3GHvEJVVWSxx0rebhShS0w4wSZYif8BdGLBtPqGZfb1ZuZE7v3nV1P2lM4+L8p JXXJTmL9slwSQA8P45IMHfL3ankA9eH4zGRRj2JJq64MYOxFCkvk/1chRSfP32DRVuJi PqIz69/lc42InhMWlXRW5LeE0MTbaJxnManjR2yKM/QxVp2Pq4Fb4T5GqMZaggJzS/Hc HUk/FOPer+iIM1bXAyM4WUfXSfxtd7ImJDW+gCaSR3G/pRi9+MEymNKDd10XWPM2jbaW zu2qwq66Y34V6EQP+3PUx5ufkVuYCzmJ/YXS5Hx772AlMG4SZtrx72lQMjFPlACnJNqI gLsA== X-Forwarded-Encrypted: i=1; AJvYcCXSfT5w2shCNE3K5hy8w3GmPAvTxV9Xv0tuxaE+2vlpbF4D+w19OSeu2CRNwpTGFi0bR7/Ey52kDF0=@lists.xenproject.org X-Gm-Message-State: AOJu0YyBNXckCef3yO31LOZ8Xv07QjQwfgBIsxruZId3HbwrHmiraI9L oqZ9hCLIcbXQXmw2B0SHu3gKjCwZCAVF+ZRLLbb3Pv68+/YQEV6FSDDzlWcelfs= X-Gm-Gg: ASbGncvaSgxx/ufFinL8bbPYzy3QWL09aX5R00c4FeC+QieOdCo5XT+RnHvlihrAhiL nNEnXbSMWSuLr+eDrW2QubNj38j0AV4ZU/DdH0IcnueotVEcH/d+pw5RV6wyd+pnm6cbLM4GxgV EcE8OntkWQvvwboS/pcN9icTNEVC0GLgRvRjFu/Czl49bYbpC6zVhQjz4ZxU7NLWqYh9wn+qpVT xDx+9gbYTYG1BLQoIhCNQE3qSLeaDkrMRudKxpgIyEf9hhVkMo8y2e3MOO3oD8iXQNK694C2uzT opfF8lmE4S7198FSvarzScjLxpYs+QFhIZYfScyphnKffsPW2/TlqMw= X-Google-Smtp-Source: AGHT+IEBCxz8tAPvpmfBsP3Ukq6OIHQbs/5ODtSLSGAs7fop1NjSulQH4pEJZaQn/aXi1ghSaJLALA== X-Received: by 2002:a17:902:cccd:b0:224:256e:5e4e with SMTP id d9443c01a7336-2242889d3a7mr298318035ad.16.1741723099862; Tue, 11 Mar 2025 12:58:19 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 08/17] exec/memory-internal: remove dependency on cpu.h Date: Tue, 11 Mar 2025 12:57:54 -0700 Message-Id: <20250311195803.4115788-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Needed so compilation units including it can be common. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 100c1237ac2..b729f3b25ad 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -20,8 +20,6 @@ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H -#include "cpu.h" - #ifndef CONFIG_USER_ONLY static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) { From patchwork Tue Mar 11 19:57:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012620 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 D4452C28B2F for ; Tue, 11 Mar 2025 19:59:11 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908981.1316079 (Exim 4.92) (envelope-from ) id 1ts5kD-0000bf-Vt; Tue, 11 Mar 2025 19:58:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908981.1316079; Tue, 11 Mar 2025 19:58: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 1ts5kD-0000bA-LE; Tue, 11 Mar 2025 19:58:29 +0000 Received: by outflank-mailman (input) for mailman id 908981; Tue, 11 Mar 2025 19:58: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 1ts5kC-0007Uu-Jb for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:28 +0000 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [2607:f8b0:4864:20::62a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2f22a42b-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:22 +0100 (CET) Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-22438c356c8so78188185ad.1 for ; Tue, 11 Mar 2025 12:58:22 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:20 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2f22a42b-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723101; x=1742327901; 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=s8l5XLcA1+OCzVWAzWmOGo6RbdXUAYo+RpTNM4YWpKg=; b=KmXXheOrzCa5dem65+UrsjR+5EWcf1k2dHYaaChtVN1JW2yLb29+KmXIxtoLZWPlW0 UBzETkJpBYm5YljUkENWuFMVGJO2cyXt3LSgEg7n1GyxG8XH9ei5zUuw6MF6PRL6PIgK fmUip/MD6D8v3ah8yRDu5cpvdirJsClihMtER5hTFQgNwdzvNLK7PaFD4QwSeFRI2w5c 1OlkSO3aYqRjIfZoWpelrtgcZogVk2/4jg33uaDTt3ugzIcTXjIJyOyxT/adwuvuuG9n Aeg7YEek1eelCRDak1kFAlMcfMcNZGutfhm9FZBnqcukwhruLyMldBzSlqb8gT72OkmH jFxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723101; x=1742327901; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s8l5XLcA1+OCzVWAzWmOGo6RbdXUAYo+RpTNM4YWpKg=; b=UBuEbX9JETQMxLOnknpAXQ+cdScLVblmDhEuR5QY8NZhwQZiLh8xpVXCQ9/ofYv+a6 +Sb3HpwhtRm5KpXVfATnVPatE8HEY5frILPHHyHHosFTHx0tdZIc5DGrvi//saytGr2/ VtLp3NVh8yzLWXn1QFaUeAPtki3rlJCPQXphFLICVzMjyxuKl9SW7MdJ8DIXSvI6Dh9m 3kesDf+JdvWuQ/2VCXTWtIy7p1tH39sApLgRqaVMZ/OoO2H5zj+TRsBWPPiSpue08Jaq unw6BjzhK28nCrpV2OhTL+PG+HLk//kCM5m/xqgmeX04bjlZkGpuL/FQKstPhDUr1yWh +mrw== X-Forwarded-Encrypted: i=1; AJvYcCWNMfTj42z00kxSdhXJIyixcuZBMCTEjVfwdXzPAVFVVuKgxcDiChq4F7jolnGr7EzxEgq7ao2gcA4=@lists.xenproject.org X-Gm-Message-State: AOJu0Yx8Kejjcx1D3LmH867epjLa+kdza1myut/N1XOcovIAokUriaz4 vEBuybeTtVQeKVRPhWvkeNhWmyb6AvOtVN6w1ligkhcZ8Gnc1ohvaRoe6gNBJBw= X-Gm-Gg: ASbGncsG57Bn4X4lUTtuwHWY5zhQk0Gh+G4w/8P4HcV5ZK348Uyo53vFYyaAtVMKbcy cvo4dmUzzBlZOeqbhZKgzVfiVyRGfyysbRZm4S12aOikNllEm/Tptlx/zj2EYYPmqvkg+vZUEl4 i5AsWy+KMR9sSmCOUDjMvCJCKPVBVWorfVEI/Dw2eIV2RCf1lmWA9DOxJ1b9QlAVG6AWQh6UGuw inDhfK5sW7no9pnXho5CjUG2lnHO00IGIeHClBQhOel/HyBTNXXcv8w/etIxv9Q+VHAsK8D+xL5 KhzFKhwtMyX43ltzrb2N19Ym3VBVf2m+rn5W5PvS9XHk X-Google-Smtp-Source: AGHT+IEgYvc9dMvCeCMS1wOBfk7GI8sssnnWj2guiDlIPD98ekjEveZX8r3rPhR4gVsvHIzZwJ8+qw== X-Received: by 2002:a17:903:1a05:b0:224:1294:1d26 with SMTP id d9443c01a7336-2242888bf0fmr253744785ad.13.1741723100980; Tue, 11 Mar 2025 12:58:20 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 09/17] exec/ram_addr: remove dependency on cpu.h Date: Tue, 11 Mar 2025 12:57:55 -0700 Message-Id: <20250311195803.4115788-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Needed so compilation units including it can be common. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 3d8df4edf15..7c011fadd11 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -20,13 +20,14 @@ #define RAM_ADDR_H #ifndef CONFIG_USER_ONLY -#include "cpu.h" #include "system/xen.h" #include "system/tcg.h" #include "exec/cputlb.h" #include "exec/ramlist.h" #include "exec/ramblock.h" #include "exec/exec-all.h" +#include "exec/memory.h" +#include "exec/target_page.h" #include "qemu/rcu.h" #include "exec/hwaddr.h" From patchwork Tue Mar 11 19:57:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012622 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 56A01C28B2F for ; Tue, 11 Mar 2025 19:59:19 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908983.1316090 (Exim 4.92) (envelope-from ) id 1ts5kF-0000oU-Dw; Tue, 11 Mar 2025 19:58:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908983.1316090; Tue, 11 Mar 2025 19:58: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 1ts5kE-0000lC-Pw; Tue, 11 Mar 2025 19:58:30 +0000 Received: by outflank-mailman (input) for mailman id 908983; Tue, 11 Mar 2025 19:58: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 1ts5kD-0007Uu-Jt for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:29 +0000 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [2607:f8b0:4864:20::1036]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2fd56c7b-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:23 +0100 (CET) Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-2feae794508so8962715a91.0 for ; Tue, 11 Mar 2025 12:58:23 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:21 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2fd56c7b-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723102; x=1742327902; 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=JWxnxbYcPjz/Z68peTnRDKwzZo1lExFgxMYf7eC2/2RfEiQKTS00Om9Ml/ZwNd0BTg oYsq9wuzAHQTmurDr6fOGseYtvFWvCtvh8fLwekIGZ7Z4F9d8fAct0RtnxjgeyN1CunZ nRSzB6ByKD8g86J8VfxHHdpjd1XIliu7Qa1K7bq477/yZvTFrjwam9QWbd0n2pvKAA1l oCl3/jJAx7/6t0kvCFF9Z+wM+363EVt+2y8ZDmiITyg6YbHT2M0aws1JhmeTfaWXlUH+ 1aAgrpTvcrXIafnYtKhCjf2Z0Epsm3EFnvt/jL7MDZf/kXwOhTn9BOkaYfCxTJQk6pXA KhOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723102; x=1742327902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BsftdeZcZ0LsVJ43Vlgc1kB7SrUHDvnjwuIeYSteybs=; b=KC71ZJg6zFJ7IjA0psBs0U3dJMsn+k8kfF3vRPoe5ozZ6WK1klHXi++L+0dXBcGK3r n/CwQEkLT7zmmcXSWPm14VqpqbIiAiYc3R8/olJDGn2rKz5+eVh9lXtQePCzz+iQfi37 b+jgxe5/+hPU0YVgOaCmHJJnhc+xDMXGNDaN4u1S3APni5H+0EHG5koBXi0/wQnSy7tC UXp78e1YghLJcPUGXMnmcdukj2B0HmJWXSijHdIZms2qFzlw5GN995roGBCV5stHAfkv jU0D62Frr02ApeEvZHYoVqRVnBdTDRbPKsdSsG+nS7vSaEuzwG5s28TRh9+ezmZ/kmuY rAYg== X-Forwarded-Encrypted: i=1; AJvYcCUGLY8IWXFok/Pto1qg/YN5lZX2JBWfGZDtlSLYhI8w99UaFN0JFDoeXgd3P2+FVVgCRDtYXoO6W7M=@lists.xenproject.org X-Gm-Message-State: AOJu0YwM9HaoPhQcubaIxs1rlxOf+9vl2bo7wET0v6UTt75ZwSpr1QHi T/ScdBxOIVTq1ocYxhwbxh2CyHdUmbdbpyZsM2WwyXw3Ez4evTVZ0yD1IqEt8Ew= X-Gm-Gg: ASbGncv556S6+diyH7YakDmrH05VJRedrh0VWhH+LHcpAnDzdKJLE1CNuLOAxzAhckd PpiAu5Pha3ahq1KWzvNIF90fXK3KU8ABGLQjFnw9GDJs7GV4VWhfIFiKJUOhu/Kiigi1sMOszBg SP1AR9ryjpHVU99tOZHyOFfhgAOqemyE0Ks3KkMOb/LgG6+x6PmExBhfH7PMcJ7nK9T3a3RpBkv 6LDURm4Cgz21sJ5M4K5JXuUO0hvA8lp2O+vmEkEJmn0dKcW/3vACVuLVGvFc1CSB+gGYYHPhGqE 8K2tLp+6StWqvrLMFTy9ETPfSG6Ap8AYOrKJU3eRvkIt X-Google-Smtp-Source: AGHT+IFuSUSQsgKDn+cb31pnjdNEblE2NjRflSuEeU68kg8s8JFfsQQJsGkDTEhj0ycbJp3/pjIRHA== X-Received: by 2002:a05:6a20:6f90:b0:1f3:397d:86f1 with SMTP id adf61e73a8af0-1f544afa185mr29488018637.16.1741723102158; Tue, 11 Mar 2025 12:58:22 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 10/17] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Tue, 11 Mar 2025 12:57:56 -0700 Message-Id: <20250311195803.4115788-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 This function is used by system/physmem.c will be turn into common code in next commit. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/system/kvm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index ab17c09a551..21da3b8b052 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -210,11 +210,11 @@ bool kvm_arm_supports_user_irq(void); int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); int kvm_on_sigbus(int code, void *addr); -#ifdef COMPILING_PER_TARGET -#include "cpu.h" - void kvm_flush_coalesced_mmio_buffer(void); +#ifdef COMPILING_PER_TARGET +#include "cpu.h" + /** * kvm_update_guest_debug(): ensure KVM debug structures updated * @cs: the CPUState for this cpu From patchwork Tue Mar 11 19:57:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012623 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 D0A10C28B2F for ; Tue, 11 Mar 2025 19:59:23 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908984.1316103 (Exim 4.92) (envelope-from ) id 1ts5kH-0001P7-Cp; Tue, 11 Mar 2025 19:58:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908984.1316103; Tue, 11 Mar 2025 19:58:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts5kH-0001NR-3X; Tue, 11 Mar 2025 19:58:33 +0000 Received: by outflank-mailman (input) for mailman id 908984; Tue, 11 Mar 2025 19:58: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 1ts5kE-0007Uu-K4 for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:30 +0000 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [2607:f8b0:4864:20::102c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 30851c3e-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:24 +0100 (CET) Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-2feae794508so8962748a91.0 for ; Tue, 11 Mar 2025 12:58:24 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:22 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 30851c3e-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723103; x=1742327903; 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=ySlCDSlw4C2jJRBJVMlBfDoaYGpEn5JPYzGeJv7wwcI/8GCULmhksm7AnZbbXZRp78 RL3VfSN1R6Pbtjj/p4oelMSIHRDWuhRa11Up2c/VFV/pzJ8MQnEnfUOo6HU5FarJ9uaD 2AtB9Zw/5qWnJC1xnJT+9MNxZwMHKT9P8nu2TZ4sh1Ehd+eocmrF1R9Ldc6yEfIOCxX3 QAzdFM0ioBiVY6a6qIFN0v5fah9oaUFccQoeLtu4PzlQBQJTYCeWNCTan5nqsPk3XGda 3CONSYKbW3GxOVwBN99AQ1soKR/N+23s2yU9DbDmVcDgJcjId1UxT3vEhHvG1pAma/hU 480w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723103; x=1742327903; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d9PU2mUUZXceFgFF8NURkIZqXSTxuLUTW3yG3F37dHQ=; b=cdIoP2s1Cm2TRi0UoZ4N7FBxBq1O2JVFznx3IQZfuzckGW3IlbnFnodBQWfUBBnQLM W+BENAhexDEtjuPHcQ3TNsejY4J76xb7R5GmxpdkKd2+IB3WyEyDimDhmVV6wBR+1sd2 A4JRAOPTSf5fSDZbSAhI/fpUqJzQR0OFTYpTKjWGBiIW1ycEQffTnYxHtSqv/aIYTr/p 0yOI4AV0sjTrht0kZUtjyweKFuvDu+UtwcOIQEe/cEKGo1sHvGA5dj2YPnFK5L8mCxiE 60kAv647N63wLr2e7mDChILRVx9ILHQk463tbqbGyAtXBuQozl1h2FKsftFWkEuWMcnf U/Mw== X-Forwarded-Encrypted: i=1; AJvYcCXQIZDIW1QZ379nKMFg2ogGNztydx1+lbDB070DPc+pEL8NORmVIKnAXRO1YUjpCfJg8B7C4/ZAwJc=@lists.xenproject.org X-Gm-Message-State: AOJu0Yxdhkamp6zm1dPKxNu4T0AFkJ5mqeFjZCdyznXTjO1EDsVDTIqV DVBoVCmdww59eWbCxV53C2BYWpwAY3cjmJABSnVuqnHd3lVtQZ5eKZ4vUPa5IpM= X-Gm-Gg: ASbGncuehiAP7nycboJZHcfTLMFWIcnBphw2tszUTK71vi48Xe+I0078FxV3n4x6fa7 uRwTqujhmwpWCZH6oG5ulqqZhnfKiZ1AslnYqNXBbeSCCSeqNDhBpFxNMoSH6YneVggRDiboAhf W7ueTe0na1jKh6KTOzOPTuspd4XTnysm5WyJrnHTgWSbfD8hBRB2TaYtKRgH+oALDaHJ9lledug PIZSM5vTTRKQhlM6f2d4qT66X6etERENp/Rtuyx4FTE/odgU2xsuwaYF+J93xqxcRCjwvH3Y4wk OBbQCZzmI49YMdM5x8jh3dJ1KAkjJe9qZB7Vi4FoPew2tvvu8Gnw8a0= X-Google-Smtp-Source: AGHT+IGg+aQTZ2xq9SQi3eRnsIeXjPhQ74pTHWyL4E+moWnFDewPnn2zGKzm8djm9QcS5fi3hNfHgA== X-Received: by 2002:a05:6a00:c8f:b0:736:34ff:bfc with SMTP id d2e1a72fcca58-736aaab7d8fmr24949384b3a.19.1741723103280; Tue, 11 Mar 2025 12:58:23 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 11/17] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Tue, 11 Mar 2025 12:57:57 -0700 Message-Id: <20250311195803.4115788-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 7c011fadd11..098fccb5835 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -342,7 +342,9 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, } } - xen_hvm_modified_memory(start, length); + if (xen_enabled()) { + xen_hvm_modified_memory(start, length); + } } #if !defined(_WIN32) @@ -418,7 +420,9 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, } } - xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + if (xen_enabled()) { + xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + } } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; From patchwork Tue Mar 11 19:57:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012694 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 91E06C282EC for ; Tue, 11 Mar 2025 20:22:34 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909174.1316191 (Exim 4.92) (envelope-from ) id 1ts67P-0005pt-6B; Tue, 11 Mar 2025 20:22:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909174.1316191; Tue, 11 Mar 2025 20:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts67P-0005pk-28; Tue, 11 Mar 2025 20:22:27 +0000 Received: by outflank-mailman (input) for mailman id 909174; Tue, 11 Mar 2025 20:22: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 1ts5kF-0007Uu-KQ for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:31 +0000 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [2607:f8b0:4864:20::632]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3135caa4-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:25 +0100 (CET) Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-2235189adaeso4054675ad.0 for ; Tue, 11 Mar 2025 12:58:25 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:24 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 3135caa4-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723104; x=1742327904; 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=Ja+6odzn4Ez24VTaE4XHZXCJRxg+WvFcMgJghams3Ge5p9PoA23hWWCvagyxZ+YKeW JY9Ht6yoI4ygfNTV4qq/iiMwBjv4RFzectNS8jKYk2oDZnOO83DSTWOKP1yr4jWh95D2 8jM8FCPTFsdY3IHIW7wNbGzO+0bI9Non2iSIK9LWX0iJMivuz0h1/5Qq1tn1f0/bMep1 uLVZFWk5bjhpQakoeF49bl8+cKjv+mk45lpiePHeyiGj6QPzejbVLFZbXMybDPJPagSD nZSuFhJNBmderX7dPHB2ATIu5JBNzfrPtuEaa1vesqHniEhyYS6be4VrcbcMJc5plIKe 7hNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723104; x=1742327904; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YZcwoIie6BtZ5Bqo8BYW0CKBTK95znA0iA8YHmiy7v4=; b=DHnqN10v3AsrLIkjV5CEaKWA/gml7L+kidakGFbHYz5QC2qnLYqUi9xKhGeE4LDExc LLsy29EmUXime9mwlUfYi5cHoIXcBl/YEunffOzuYs+hiNxjYds6i1zfJxZ62/zJd7ob lLu1r0N+r1pRs2vU5wtIMeypNSAEbEuqGQVW8Duio14IqLRGKtg5prjhfRWHicBfHRcw ajYqDglcYR4VgA2vSChVwe+hWugS1BxP3uujowFErCFq8bxuvoj4E1RLNgxe+wZxIBwj 3ivH0nkc5t1yju+ZLDsQGN6b4UNbHkl6W+Nqg4JGhtYuogO5kTL9lZYCAGXfHeikq7Xt 8g4g== X-Forwarded-Encrypted: i=1; AJvYcCXaQhHtlIkMyYuqZk9VgrS9AzgpJ1TPXwCL7L/3Rs1uMMkMORWZDdcfy3ViWmwZu7EzexCti8Mm6O8=@lists.xenproject.org X-Gm-Message-State: AOJu0YybRmVQCQK6EegKNofzPGUkC+E3L3tPxPVpDxKYZKnh/P2XzDjg q5QTgn3N5hH2cIrPUgyANiaL9zhWKrrb0FRIwymDHXOKXVdXk2yK/8XjqF/UEio= X-Gm-Gg: ASbGncv0dUqRv6CA/kDYlMy7Jy0CRpyIUe82xOBHp6iGYXbGRnmcGQ2b54UogW1dEQI wmVQqNSzAivauX0E+zyAY/2sXPWGGgQpsV9Zz/6G25u2HCZygkUF5U0sW4USpqgYnzaMLpNqY8e ZGzVa52xZJTi+8GCQVHHEnbvbpXVGFuqGTyHHJM2QXbxmrdUIsz028NRNu2Ry1ABEio9qbBmTUQ ZY+Q9+eRhyX5KAmssIjhxqPcO0nYAvb67aVED49lkegLl42xZsc17n/j9D3nj2tRURkSYE0G5v5 pPn9pBlxXNnZ6AauweRi3FpnUrn/SpngLuz/aZTr3NXS X-Google-Smtp-Source: AGHT+IEToni6mHy+/TOd0EQfFDFUNLQyZb+aNmkKXcJNYvCuHB4nuxbuNFqkwEKNu7S4yPPDELKJzQ== X-Received: by 2002:a17:902:eccd:b0:21f:5063:d3ca with SMTP id d9443c01a7336-22593dc5076mr68139055ad.16.1741723104414; Tue, 11 Mar 2025 12:58:24 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 12/17] hw/xen: add stubs for various functions Date: Tue, 11 Mar 2025 12:57:58 -0700 Message-Id: <20250311195803.4115788-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Those functions are used by system/physmem.c, and are called only if xen is enabled (which happens only if CONFIG_XEN is not set). So we can crash in case those are called. Acked-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/xen/xen_stubs.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ hw/xen/meson.build | 3 +++ 2 files changed, 59 insertions(+) create mode 100644 hw/xen/xen_stubs.c diff --git a/hw/xen/xen_stubs.c b/hw/xen/xen_stubs.c new file mode 100644 index 00000000000..19cee84bbb4 --- /dev/null +++ b/hw/xen/xen_stubs.c @@ -0,0 +1,56 @@ +/* + * Various stubs for xen functions + * + * Those functions are used only if xen_enabled(). This file is linked only if + * CONFIG_XEN is not set, so they should never be called. + * + * Copyright (c) 2025 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "system/xen.h" +#include "system/xen-mapcache.h" + +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) +{ + g_assert_not_reached(); +} + +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + struct MemoryRegion *mr, Error **errp) +{ + g_assert_not_reached(); +} + +bool xen_mr_is_memory(MemoryRegion *mr) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache_entry(uint8_t *buffer) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache(void) +{ + g_assert_not_reached(); +} + +ram_addr_t xen_ram_addr_from_mapcache(void *ptr) +{ + g_assert_not_reached(); +} + +uint8_t *xen_map_cache(MemoryRegion *mr, + hwaddr phys_addr, + hwaddr size, + ram_addr_t ram_addr_offset, + uint8_t lock, + bool dma, + bool is_write) +{ + g_assert_not_reached(); +} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 4a486e36738..a1850e76988 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -9,6 +9,9 @@ system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files( system_ss.add(when: ['CONFIG_XEN', xen], if_true: files( 'xen-operations.c', +), +if_false: files( + 'xen_stubs.c', )) xen_specific_ss = ss.source_set() From patchwork Tue Mar 11 19:57:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012689 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 D9134C282EC for ; Tue, 11 Mar 2025 20:21:15 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909106.1316162 (Exim 4.92) (envelope-from ) id 1ts665-0002Ui-B9; Tue, 11 Mar 2025 20:21:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909106.1316162; Tue, 11 Mar 2025 20:21: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 1ts665-0002U1-52; Tue, 11 Mar 2025 20:21:05 +0000 Received: by outflank-mailman (input) for mailman id 909106; Tue, 11 Mar 2025 20:21:03 +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 1ts5kG-0007Uu-KQ for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:32 +0000 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [2607:f8b0:4864:20::635]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 31f0f0a3-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:27 +0100 (CET) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-223a7065ff8so18598585ad.0 for ; Tue, 11 Mar 2025 12:58:27 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:25 -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: 31f0f0a3-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723105; x=1742327905; 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=dsdnGNSEYje4UEjJnscMMBnu65Bd60XmcOVP67m7D7ORX2nLRiliplijRaZ2VOSF8N foGeNBdFsIwbwpdVLtFPrNwPgfnFII72zWtp7d3QEvYve7np82C+URjq3XEZsUBybJG7 iv3G6V/06ra4lJODBjrcH8J15nlSQduFhQoXU6SfKsfZm8uYNg+FfGOrWZpVmFlzF8nM q6bOUH8ufsEmw1CWmGiikwHKuz1R5KCDtyrK2iDZN1vMwCqCCaopM361tri93MogrBlg Zf1a5eZUXpq0+7pvwZ8kuQe91OdhrtCQVzhVmk+h0Fp1Ksh+BY9zT6FkPE61CZ68OenJ hS1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723105; x=1742327905; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q89mBu4b5JYOE58WB93/V2zR/jXmfpOvKMtRO3aXK0o=; b=nxw79/3YsLMmMCp5/1AWhPZ7247joxd2wv4ZZlHVUz5OWwG2UKLvARf1N3I9gI/JJ/ xXfcaC7EudjH4WgXiPijd1GV9Rkfa3cX1MktQyzfGFMO0/lzjyXZpf9m5/h8KW8B9T/T 5hrxX6w4pptPc8nXVPs76qen+89Y2obNSyvKPgfKI0kPZGMmf9r5V+im5Lfb0AhF0LjK Ywhkkwgi62ATdr0bbpPcgM+keno4GMNjkUcT2LZODo8qD6QEBbtHbieEQ52fQF8ahV+V dm3BqmQmwLNvSPucErRxbkX6z5h8zlcAasCJ+xn1lqcUlxsIzx6GFvK6eFZ14ctrX4U5 PWuA== X-Forwarded-Encrypted: i=1; AJvYcCXve8DV3H/JO8oYp/kbcTor8J5UWQmvEzadWICx24PPg46f8X3yyjMiXeVEUtryqX3xG8ADxgsu2xA=@lists.xenproject.org X-Gm-Message-State: AOJu0YxawJpc9JVY/zs99epblXo4Evhl8BjOQbOoWdctHS+9u/z4Pb7G BWH543MQ96mwKUuoZskn5E9+erwfPmYl9BDuQ09XdLxIx4X0tg7YKhb5OnfNfkE= X-Gm-Gg: ASbGncush5SozhbASmrH4bOxL3tuLbI+9BVNRrgDaXZuhMhh5yRqeD1UWUG1be8wUVd ZPK35mqgr1vkr11f96qcZ87ZWO07ErIUqGONgKdiatfH7L/gUD9w2t4Vb3x9VG43Fqaxp+UX5i+ KiQCICaxkAXsjOFoaBsXtYzx+hU1s++iUJp7H7uAM2G/+WqrgxJMD8g8U1E2nPNiDHXCFzN/+eP IR4U78cq1e2zGVDc45gkNOoD93gcCJ6nnLTgQdMn1ZrWb7BmXXBFB4jAMttsjWedbgtxKJa/2W2 jrdTsNBR3Zjd0PzSwKiypc+WdfZb+ACiv1a7s6FammsG X-Google-Smtp-Source: AGHT+IGPxcxao/HSElseyaTLTAghrvJ2csxsBfbQ4Udwa0eEZtZIt5xFFqgWZBrC6WgJmJp7FceqHA== X-Received: by 2002:a05:6a00:4b4a:b0:736:5c8e:baaa with SMTP id d2e1a72fcca58-736aa9bc0e9mr26082176b3a.2.1741723105679; Tue, 11 Mar 2025 12:58:25 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 13/17] system/physmem: compilation unit is now common to all targets Date: Tue, 11 Mar 2025 12:57:59 -0700 Message-Id: <20250311195803.4115788-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/meson.build b/system/meson.build index c83d80fa248..9d0b0122e54 100644 --- a/system/meson.build +++ b/system/meson.build @@ -2,7 +2,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'memory.c', - 'physmem.c', )]) system_ss.add(files( @@ -15,6 +14,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'physmem.c', 'qdev-monitor.c', 'qtest.c', 'rtc.c', From patchwork Tue Mar 11 19:58:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012621 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 6E3F3C28B2F for ; Tue, 11 Mar 2025 19:59:15 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.908982.1316082 (Exim 4.92) (envelope-from ) id 1ts5kE-0000gs-GV; Tue, 11 Mar 2025 19:58:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 908982.1316082; Tue, 11 Mar 2025 19:58:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts5kE-0000fj-5C; Tue, 11 Mar 2025 19:58:30 +0000 Received: by outflank-mailman (input) for mailman id 908982; Tue, 11 Mar 2025 19:58:28 +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 1ts5kC-0006Vp-QM for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:28 +0000 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [2607:f8b0:4864:20::62e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3297a346-feb3-11ef-9ab9-95dc52dad729; Tue, 11 Mar 2025 20:58:28 +0100 (CET) Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-223fd89d036so116505725ad.1 for ; Tue, 11 Mar 2025 12:58:28 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:26 -0700 (PDT) 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: 3297a346-feb3-11ef-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723107; x=1742327907; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0vI16NHb2tKWbIxjnq/SoVUTdY/Lep770BkCc47k0Rc=; b=zsJToNs+z8zlYUDRNaYdG93Aoahs67Nvz/bwYb3gP72C/faXRwSnY6OeKAyF7lx9m3 vPG2q4AjbL14H503k2MwfHUZUtMdgstFmHGMbzpBommdfvUgdXy3sMJbuhxDEYmx3lRN NUAWXjWF1ImEDyRH5gU1CIU5U1J6DizxCgDsT2lfitDAzqQvbyecP+fth20Oc7BWNnVZ 5Ukgv4auv37S/FHKFovwJOtPlaTCuS50ifENeOOn04/zaS9+gvSq/9uGQMqt4XpUqApl DvddAAcVjqQSB3EjBJy67foROUSY1eWmXrPl7DvCpBjgikIJU9z/nynHdcfsVzWMH4un 2Uvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723107; x=1742327907; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0vI16NHb2tKWbIxjnq/SoVUTdY/Lep770BkCc47k0Rc=; b=Zhyw7t8yDNsegUC73d7aVtVa+cEQ2fySJ3OU2vcRjpf1RsbdrzIVykYEEj23p6XCj5 ODxPFOWhh6kjFgd6qjipdxvyK68z1PjeE/eM+zpK+TcGA1/jQU3ERNON6FycAAWDFR3s LnCTjbv67ArpsJ+Pdo86Gl9WhOp6kjdsx8s06F6yW18v8JOJo5NcE+ODcJ1yB5p4Iex0 ODYMATJqVuswEaA85ExpVK74HjlsMD4jYLsBz6GTkdjra7NAx7Vz6NSh11fQEAhVQPdQ R6hlnq7D+xYwQcsShx4JA8bTFVxEcil20iGutjxZxOqmeJyNIG8HOHU7UJC2lP8kA4ub ht+A== X-Forwarded-Encrypted: i=1; AJvYcCUNNVjRcUS7IpNqqa35YwrU2e8ULCBw0hkKN/DmD6U2b8BDeunrvlHr+UERYi2MT3hmfTm41Y7vZdk=@lists.xenproject.org X-Gm-Message-State: AOJu0YyYP13sOXM437kpkdXVcTORVwxFdlKgJMsME5c1sP/T9i+I+djn swL/Z2Uwi9jdkmlCYyniRJYQ0zjOGj29mnUqL9LIamBzHHFgar+Bzjgt3Z+zY1M= X-Gm-Gg: ASbGncvvzDmkpXRKcL6cb+lBdNntgTNZwKQzWWVTr9IsOulGnsVmmMiFKQiu+4YxRRX Q62lEE3pr2YCrfBqsTz236W7ISpZuDo7xJOjWEsxN2SUH8U3fxFzjARyoPAWEUonbKPpl/R2EDw ymBCBwXfrciPCIC54NByBipzchTmTa2mWZgjOdpp6uuBjpdKx3+zoOHgJ50uVxXs+c6aBPylsw5 76Equ0xm1l3sItxON7m6mcuonYC/bDibMEFOXj68fa31/NIyKq8hBwK9nKRfr85pjrdtLk2zTJI iAAGSBX1gmmBzX9XY8Fq9bVSgxX1S3tQE6VSIDm5bFzo X-Google-Smtp-Source: AGHT+IH4DZQtwoxJlYICmsHBrM9aJbv4mOOcZipSBsnLFw41tHWuGL9LYWyAZtn5lP/0QysRh7Mo8Q== X-Received: by 2002:a05:6a00:928b:b0:736:5dc6:a14b with SMTP id d2e1a72fcca58-736aaa1ace3mr27769096b3a.13.1741723106807; Tue, 11 Mar 2025 12:58:26 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 14/17] include/exec/memory: extract devend_big_endian from devend_memop Date: Tue, 11 Mar 2025 12:58:00 -0700 Message-Id: <20250311195803.4115788-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 we'll use it in system/memory.c. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 069021ac3ff..70177304a92 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,16 +3138,22 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - bool big_endian = (end == DEVICE_NATIVE_ENDIAN - ? target_words_bigendian() - : end == DEVICE_BIG_ENDIAN); - return big_endian ? MO_BE : MO_LE; + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; } /* From patchwork Tue Mar 11 19:58:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012695 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 03F34C282EC for ; Tue, 11 Mar 2025 20:22:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909190.1316201 (Exim 4.92) (envelope-from ) id 1ts67b-0006n7-Cj; Tue, 11 Mar 2025 20:22:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909190.1316201; Tue, 11 Mar 2025 20:22:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts67b-0006n0-8z; Tue, 11 Mar 2025 20:22:39 +0000 Received: by outflank-mailman (input) for mailman id 909190; Tue, 11 Mar 2025 20:22:37 +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 1ts5kL-0007Uu-LS for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:37 +0000 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [2607:f8b0:4864:20::635]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 33586e4c-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:29 +0100 (CET) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-22185cddbffso3407005ad.1 for ; Tue, 11 Mar 2025 12:58:29 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:27 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 33586e4c-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723108; x=1742327908; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/B5foK4Qy0OvFQVWNYpVAAsAF+tVTKpBxl4Jl8CdPFE=; b=anOuByKI5L2vCHBUc81Z0qcxDNcka/KqaPYuJtBxbhnSesw5eSbcrnsIbNDMj42zqH oxE9dLsjPytS0BFA1EcNdoDlgPiaRqq1+ByvQQ39cjRV+L3NnM459aIg/bNn/9MSSzOv jv1Nll5jy5g+O+LEQW7MGcGv73JFg9F1a41XKuOv0PfRDtk/weJiNWDeAzf7HG7e+u5j DKZ1eH83fGRNIkUM0fDjidAmWk8+/zcQYvYDVNiZMHKJJWDait4cUCOuD9ObmWRuz3Ge JeUdLAJl6ZyKYFAOb6DMfHJATTVb/e7gnwE6TiiklAWibddd1c2EHfBjGU/Yare7lFgl OiBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723108; x=1742327908; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/B5foK4Qy0OvFQVWNYpVAAsAF+tVTKpBxl4Jl8CdPFE=; b=A8KXhbjEhGlk4Z766k5n6NGSxI7KdWN4Z3WQKV6QDwNXa2yKCucayVSE3uWPl9VkNZ 957tMYZIYk1HBB/TTeVgdTYzhgTtcEroKcO7pAu8aiW4l6Ko+Yl2lh1f3lrHRtNsoupg tIMwZQ30sG3wG8YbSAjk1xjjx+BWe9vkjG5Sj8OAD7s44Wbt/pkh65q1xBDqlNvajjiq a2XJKXeg+Yw6jy6MHzTYk+pQItP7NQ8/13kE150y1KHDz32BQR/lMD/qDmVpga209yJ7 bVlHUUNrQ8ksiw8FKVnqQwKQG8qwH7tu2lVISLCXJYc0gpLVU0qTgU8/zh64wa9xPjOt voJw== X-Forwarded-Encrypted: i=1; AJvYcCXMwJbteUifPSJTKA+igXg2NnBz0jEJeTIcpEZPESjOSCFrad/oJtf1qGBNF+uo/tBWXAwDpXD/JO4=@lists.xenproject.org X-Gm-Message-State: AOJu0YzhAxa/ILz83LWQoFWTnedFOtGRhDeGS3PadDXJRX7taFpyeQvn eVe8Ot/eTwXTgw/VOBvk3Hc04AwtaDpUuNwMuH3a9IkgdAuiXUtftBN2XhvZO1s= X-Gm-Gg: ASbGncvBrvhYHBPLvaUJFxUuFil+hraFI3+aoALtBRTXJpyBmeRlFZnPvhNK8MVdk5N 8H5IDHCi29FkAxeBxoi20BD2ZmFQoel6AD9mBE7bmKQMpyxPlgTm1+EsQQi1PKy71ay4Yh7oMza SVEvR7ojsSvZWoIGbhk9Oc0g1y8s3+VrmTI0RVg6rXdo0CeS+R0LahsTVQekcxSCqGjtobJPsAO 2fTsY8n5uO+cBt5yiCG9HYwobJP62dHo1MK65agUEPPTLh2uyeNEr/vomFLWW86eTmSkTQZDCts eYzeR84cOpi9hbYkFB3FlvFCKYlaVqnkbHzV50lUhiUh X-Google-Smtp-Source: AGHT+IEFWhkhOunU64h5Vgyk432uXoYWcCQsdf3Qo3RWjfxu/zqVxr3PiSl8C3ffFvP7C/aGeequIA== X-Received: by 2002:a05:6a00:638b:b0:732:57d3:f004 with SMTP id d2e1a72fcca58-736ec5f1748mr5532672b3a.6.1741723107984; Tue, 11 Mar 2025 12:58:27 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 15/17] include/exec/memory: move devend functions to memory-internal.h Date: Tue, 11 Mar 2025 12:58:01 -0700 Message-Id: <20250311195803.4115788-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Only system/physmem.c and system/memory.c use those functions, so we can move then to internal header. Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 19 +++++++++++++++++++ include/exec/memory.h | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index b729f3b25ad..c75178a3d6b 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -43,5 +43,24 @@ void address_space_dispatch_free(AddressSpaceDispatch *d); void mtree_print_dispatch(struct AddressSpaceDispatch *d, MemoryRegion *root); + +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) +{ + QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && + DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); + + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; +} + #endif #endif diff --git a/include/exec/memory.h b/include/exec/memory.h index 70177304a92..a3bb0542bf6 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,24 +3138,6 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* returns true if end is big endian. */ -static inline bool devend_big_endian(enum device_endian end) -{ - QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && - DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - - if (end == DEVICE_NATIVE_ENDIAN) { - return target_words_bigendian(); - } - return end == DEVICE_BIG_ENDIAN; -} - -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) -{ - return devend_big_endian(end) ? MO_BE : MO_LE; -} - /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., * to manage the actual amount of memory consumed by the VM (then, the memory From patchwork Tue Mar 11 19:58:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012692 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 96520C282EC for ; Tue, 11 Mar 2025 20:22:19 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909158.1316172 (Exim 4.92) (envelope-from ) id 1ts678-0004o8-Mh; Tue, 11 Mar 2025 20:22:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909158.1316172; Tue, 11 Mar 2025 20:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts678-0004o1-IM; Tue, 11 Mar 2025 20:22:10 +0000 Received: by outflank-mailman (input) for mailman id 909158; Tue, 11 Mar 2025 20:22:09 +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 1ts5kF-0006Vp-GO for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:31 +0000 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [2607:f8b0:4864:20::62e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 340a6615-feb3-11ef-9ab9-95dc52dad729; Tue, 11 Mar 2025 20:58:30 +0100 (CET) Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-2232aead377so19364785ad.0 for ; Tue, 11 Mar 2025 12:58:30 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:28 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 340a6615-feb3-11ef-9ab9-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723109; x=1742327909; 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=Z06CcN5pABW+zUVUk9wuBNFYUJo3O9KfWdv+N0a9H8A=; b=UKK5ULX4PGc1su16XTflG3SNOD2+yxjyQlOB3bWnaKz9IhnRAqATtfdxCpD+epOOW9 d0CF+wYR2zAm+iKQVhmcf1CnKu73NwP1oMtkV8NXf+52HggorcMrFKbrMEDwTbPruzvK 8ZTVNtjVYakYsaztD6kYZequpiSWzg8KLH9uVJkt6OEdVl/Kj00353dU7/8ucTCYEt+a nkEHvZEF2Mzu9NlmWAcTzQpwrYHZ5gBFbpEE7TnO3tLP9B6uB/wrhGu/cMZO7PV8SNRj 0LKA9tg/mJxSJWB2UEMpP0L1jVl0O9i57pknmmVxm7lN4qfWYhQpwMgcUUuG4ifghobr 5igg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723109; x=1742327909; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z06CcN5pABW+zUVUk9wuBNFYUJo3O9KfWdv+N0a9H8A=; b=l00cf7WqCNzI9uWx9sT9iLiKzRNNXdfXSgd8xjbEisiSIq19Fpropufs85ppYm6t3t FeLKQgVppPtxRNesE1DQmjkXpFG01L3LES/LD/I+l2opiqHJetHaQIvjOUr11HRxCRl0 Uo7ktswJD61uycLwruFY265ZvrAjqwRhx93q4EOEtO90PA1M7GeAzLG3ANmdoiwAq3NY 0ZXm1bz8ySAuJM12oggbU5CTgEYI71qEdglsjEg8VrmR0psGVw0y0VmyGgcJocmpJWK0 3YReSKjocVY34kPXjl6GGY7I06IAmaKC9iz/XHiALlRCd44C55JdNd8LTcq5B0BxG9Ju 3VHA== X-Forwarded-Encrypted: i=1; AJvYcCWJo8b3zwMmB/iQ2BzQSJIchFdVo7QW0sPp/2OHaeZjXPF5eyQNL0AYSmf3ilFYi9idy4y/E0T5e80=@lists.xenproject.org X-Gm-Message-State: AOJu0Yxodq+WGsO4EseIbdqiQ/pC0fxVDIWMiMZcYuvLJy4vcwgW6Rjv IbsRtVT5JRMwkyHaGuGeKfP0WMMzaaGDdkc+i+WG0EIUK0fwaP27fhprZcCVwdM= X-Gm-Gg: ASbGncusDCFLtRwi6LpC8EsP9SqdRyAmztchyR0AnxzQt3wjlUWkH1hDNjLp+tezEjF VIYRC9b2W5KRsKIisG5pIr+FvcuglDCEDxeg1uGa8EuxPzAKW/2GgCEdIKljaMDM6LVmbLWcHj2 r3ZOBqL6AeQzLslNUwgYA3/PAfHO2SEQFxGjBQ9mNqqcFBjDxuoMucfN8TyvtI1kW1dFgI2ocSM HjjadUdOBbDCBBcH6wgyEQvZmwDIcnVqYqlOKblnh54sPZ/EvnTqFu1PgkFSJhbhYVSh9qI5i8i ba28KS2rISk27PFgKUUsGg2FElPE1DC5Mkk8BGg8uX8O X-Google-Smtp-Source: AGHT+IFWZfAhxvvEDgAAce92ETlma5STi2t3r8z3LElksShqNyxmTswS//w9tvWqHBQDxaqLnsB1Kg== X-Received: by 2002:a05:6a00:2e17:b0:730:95a6:3761 with SMTP id d2e1a72fcca58-736aa9e745amr30276190b3a.3.1741723109168; Tue, 11 Mar 2025 12:58:29 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 16/17] system/memory: make compilation unit common Date: Tue, 11 Mar 2025 12:58:02 -0700 Message-Id: <20250311195803.4115788-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/memory.c | 17 +++++------------ system/meson.build | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/system/memory.c b/system/memory.c index 4c829793a0a..eddd21a6cdb 100644 --- a/system/memory.c +++ b/system/memory.c @@ -353,15 +353,6 @@ static void flatview_simplify(FlatView *view) } } -static bool memory_region_big_endian(MemoryRegion *mr) -{ -#if TARGET_BIG_ENDIAN - return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; -#else - return mr->ops->endianness == DEVICE_BIG_ENDIAN; -#endif -} - static void adjust_endianness(MemoryRegion *mr, uint64_t *data, MemOp op) { if ((op & MO_BSWAP) != devend_memop(mr->ops->endianness)) { @@ -563,7 +554,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr, /* FIXME: support unaligned access? */ access_size = MAX(MIN(size, access_size_max), access_size_min); access_mask = MAKE_64BIT_MASK(0, access_size * 8); - if (memory_region_big_endian(mr)) { + if (devend_big_endian(mr->ops->endianness)) { for (i = 0; i < size; i += access_size) { r |= access_fn(mr, addr + i, value, access_size, (size - access_size - i) * 8, access_mask, attrs); @@ -2584,7 +2575,8 @@ void memory_region_add_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { @@ -2619,7 +2611,8 @@ void memory_region_del_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { diff --git a/system/meson.build b/system/meson.build index 9d0b0122e54..881cb2736fe 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,7 +1,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', - 'memory.c', )]) system_ss.add(files( @@ -14,6 +13,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'memory.c', 'physmem.c', 'qdev-monitor.c', 'qtest.c', From patchwork Tue Mar 11 19:58:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012693 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 7390EC282EC for ; Tue, 11 Mar 2025 20:22:28 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.909167.1316181 (Exim 4.92) (envelope-from ) id 1ts67K-0005Qq-Un; Tue, 11 Mar 2025 20:22:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 909167.1316181; Tue, 11 Mar 2025 20:22:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ts67K-0005Qj-RT; Tue, 11 Mar 2025 20:22:22 +0000 Received: by outflank-mailman (input) for mailman id 909167; Tue, 11 Mar 2025 20:22:21 +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 1ts5kN-0007Uu-LR for xen-devel@lists.xenproject.org; Tue, 11 Mar 2025 19:58:39 +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 34b5d030-feb3-11ef-9898-31a8f345e629; Tue, 11 Mar 2025 20:58:31 +0100 (CET) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-22398e09e39so111122405ad.3 for ; Tue, 11 Mar 2025 12:58:31 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:29 -0700 (PDT) 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: 34b5d030-feb3-11ef-9898-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723110; x=1742327910; 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=mVAIedqMzMgG1xjzSs+2Hz0l5dbDT1JQ51IgPlqJJ0OJn6xcUgDunPeF7J/O53LKwG 5k2FmBrYebRRX9Dzg5mvwDagBOawzlHV2ew0zMHqgMlYkZBrj1gRPLBYUwDyhJ0TaC44 VD0WalkH8qJVqSBUKB6piwvOmEVPkbL8kTjOWOoNO4tud308y0iBP8Ac0jUJwch8t9Wz m3jU9hM0KmnhrLGQ2rQwHclhHdl8RUau4b9pr1cQerjCrQ1AaV+zaw+e8YU5TKOrAH7t 9bGaA38+QWvpj02tgsEJPCqzi3OlfTI38D6eGPlfFnYMbfIh78qUSH9yQqlG5POfyD0p nXHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723110; x=1742327910; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/jGKe5PComzh06JRRSjyC3R7ujh2oauOlO5efOCu+zg=; b=q6drK6hZAy4bdmTSqGSaXezUrvxB0fCupFpMlKzHeUIaGJUUfMlzc/iebwFuzoz8FW p6Z/NIIqD8hO3jh5FqLwgvycYXSAwXQwAM2kMCwUV1r2Dn11Y7TtqHH3QfI4tJdUOfIJ 9gNd+DyWpV6kWVF8UaPdtoP5flNaLjnINEmZEiJxcOORmumj1hXUL/yeNuEX1ALoqSiO U3QQJJ4uxxNmL6pbh+fk49r+ioFDSUa6YOntVrAAXpVXrptqD+A5eljlrfJHFB/xI7RV 45N1q4+/O/bbg5MpSbE0FTfPwt+khUvLpjkgDH12WOiqFvbsdppcbOhXBrWnBvHGhk/j 2rMg== X-Forwarded-Encrypted: i=1; AJvYcCVHTbPVBI5iTkbCMG/JtluHFhwTwpqvvb9zYppZILDk5ouJo1wme1p7DZqH4F3s9SAVXdguCLaW/1w=@lists.xenproject.org X-Gm-Message-State: AOJu0YwLt3VrgXyLfr6EoZgDk26CzmGV9yrm0NcrWzHZjx089bo3uCf9 zJB7moBhLan3RfrZCL7ak0KAEtUzixftH5qgEW1vsfWF1ioZBGV+jJZedxOmTFQ= X-Gm-Gg: ASbGncscIuXqdraIzg+PqD9SeSV5ssXM1BbMyS+GiUN5R7628/phrdJjmbGIUBWRQD7 Qu9lThBamt+SlSRkaa0BcgLj/yI73RMbh9Uj3utKQWi7XtYDFxdjgd5gvebf1nEIVnGec9CzzmQ bdFtVDYgpd9Ds2vTm+5pueI93WRBC3r4oXM1ogWLWVMURSBP3v04nOxxXCwCZJ++MG7IsKUfUnN tF8Jaz2M96PHANODXnRoSQCThoocR7OgcZHCDS3J75OVR98WFaRYcVwKOlJ/ivsKGoAxw7bInRW 7XvkQ+PADpGvyJNiWObMUMliZtCdVZudg+xHtt9GoJ6o X-Google-Smtp-Source: AGHT+IFWRSSWAAZ74eVr+KcVmFNEyBuYNdoBJPeRpIUKcbNy7sibb5A9vNOWSCrzmBmp9nxRDwlIAw== X-Received: by 2002:a05:6a00:b86:b0:736:50c4:3e0f with SMTP id d2e1a72fcca58-736aaa373b8mr22374606b3a.10.1741723110296; Tue, 11 Mar 2025 12:58:30 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 17/17] system/ioport: make compilation unit common Date: Tue, 11 Mar 2025 12:58:03 -0700 Message-Id: <20250311195803.4115788-18-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 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',