From patchwork Fri Mar 14 17:31:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017231 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2D692629D for ; Fri, 14 Mar 2025 17:31:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973508; cv=none; b=V/0kmRyzShZuGOQQ1RYE9SLGOZcOrdhWMpvDAxcpchhuZjhSjAPZ4TnJHLUTZpkPYr0JtIXaRKJPngWj6x2IB52ymzWKACryHTiDUuAmo5kIT7qaVe6yMSCyeizCEN5hUirB8FYILr8Jp06Isy27S/MY1o6TfjcuCZyDb/MiSc0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973508; c=relaxed/simple; bh=D7kAKGSn4zAKkiSs1hQlq6vEceALs33too5mFmMr30Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JTMUYYUysnddYT/ar2/CRBOGa+LEwXUWKrYmO0f/FO2JKpsY0ul0S9Q9iEtr9eFfer2sZoQwfzPc2kYcGAbH46paRlLO/1jEhITIHI933ij8B+g+7FSELP6IWTqDYnEEhtskebfrKGovKwK3H+cj+Z109jqk8rD/FhK2dg/zpjY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=uV9IrwiU; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="uV9IrwiU" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-22355618fd9so48786885ad.3 for ; Fri, 14 Mar 2025 10:31:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973506; x=1742578306; darn=vger.kernel.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=uV9IrwiUhNl1Q0gvrwlyqXmv1hLHBVnuq8ZzJW69WeLtR9eUyOck5GcS3fvUjoVj+i lvPcZYVhciJzc40eB31PqTXOFLJLVguAYlHLfVC92/iBv4lxsmYTWLcCxU2PCs9/d57E y5MSGDqqoAHVb51DcVXMmYa5rnV3HAIJpUdSFb6ODYWflzS2aKnqVHDv7AuFplmfunhQ 6kglRFfFzZ0lNopDwWb7Sh4Pr7x3zc7yVsLMm66hBqI44hKw44GkUOuhvRoXsRnsjC65 /fm8nMZNFA2WawXiwe4n9eoqZXtHvWvp/ICJOBvTX7U4LxClzY2u/WqG2q8YxKHVeQ/w mgAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973506; x=1742578306; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=949DeBQijWmgHqYCdDdupcSTn3rDdND8nLqwkILEwEI=; b=Z24KhC4wampJbvjGxSJy/kVA85goXK4ApPMFry+4d1eW1fQfZC8Rr2yE0aVGMgyQ+U nNfcmAYfZqZVqizQTb57lrEcHhZn6x2fU7FJdzWuTC8oiOjQyPtEd+/DBkPM/D+UbacT dfQyaNIbkLGz2SDkxo5sSteFDgIbA4ZOcimGlU9sTuhW3TOTgaBfq2JDUeVnf1fRgik8 YVq+2/FZTj3Pflb5lML/T1LBPG7nfEM910MuEBtMmopCfGYwUXCUU/A+WzTVQMJhw3Nx 3oFapxUgysiVoaKMu+EqVwjsIQ8j9woe8gtYQHWsbk3/i5H2178wWQEZym3YVo3tE47d /IFQ== X-Forwarded-Encrypted: i=1; AJvYcCWPdpCsgZnvmt7lPu4nqbIvtMM0Tn0yxjXz1lnwHIYStlaU3ySJEOIYMUcWgApI+FFLZwY=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+BLa6urjIFQbWBPQHCKaQTGxJUTMMmlMtTOZzkNmUuvKtqm2I ID4M/Ei1MtYND2IY5tLxj/aKhLhg+SH00IXlYuuUdYLYj3ja6hljOYTy1lt1FrI= X-Gm-Gg: ASbGncvV0ljQHw1txChBlidj78T4Fimn2usbB4i3ibPB0q/tUREI3F5LPo01AKF9QHT NAGcU8js7PGG7SDqFnKyJd1iDeZCgm513/0gVlcTYdLIA/MPvPESoRWqeJOtth4cl6nA4FVLD2F fSq1KPItFl1jQ1+NbDC6Pt+0ZHSlPNZvq/Xs8Erwx2QACG54nBZ2lEYT50cWaOg/WHtVqOS7ds/ NycqW+ngQsmltIzRnrs4UOX0XU/GiPv5IHQLhLffM/2U3wVJWMz2xwbXMBQ1Cm1bEqEV9LG1p/6 5RsktCgH9qxI3N+n/sfyTuGkXdMIZhsRWZ8DNlGT83zJ X-Google-Smtp-Source: AGHT+IEjELEcHkUSgYSyUpOQLSDQBfR3q2soKgt+mWzeI9X+HyRoUAOICNrXniu51BG9jWIge0MJZQ== X-Received: by 2002:a05:6a21:168e:b0:1f5:7f2e:5c3c with SMTP id adf61e73a8af0-1f5c113795cmr4514154637.1.1741973505987; Fri, 14 Mar 2025 10:31:45 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:45 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 01/17] exec/tswap: target code can use TARGET_BIG_ENDIAN instead of target_words_bigendian() Date: Fri, 14 Mar 2025 10:31:23 -0700 Message-Id: <20250314173139.2122904-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/tswap.h | 11 ++++++----- cpu-target.c | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index ecd4faef015..2683da0adb7 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -13,13 +13,14 @@ /** * target_words_bigendian: * Returns true if the (default) endianness of the target is big endian, - * false otherwise. Note that in target-specific code, you can use - * TARGET_BIG_ENDIAN directly instead. On the other hand, common - * code should normally never need to know about the endianness of the - * target, so please do *not* use this function unless you know very well - * what you are doing! + * false otherwise. Common code should normally never need to know about the + * endianness of the target, so please do *not* use this function unless you + * know very well what you are doing! */ bool target_words_bigendian(void); +#ifdef COMPILING_PER_TARGET +#define target_words_bigendian() TARGET_BIG_ENDIAN +#endif /* * If we're in target-specific code, we can hard-code the swapping diff --git a/cpu-target.c b/cpu-target.c index cae77374b38..519b0f89005 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -155,6 +155,7 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) abort(); } +#undef target_words_bigendian bool target_words_bigendian(void) { return TARGET_BIG_ENDIAN; From patchwork Fri Mar 14 17:31:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017232 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AF422036FC for ; Fri, 14 Mar 2025 17:31:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973509; cv=none; b=BLb+7Y2dfOSXZYYDp4WEfqhmO1O0gcvN8PRxdEr14f/6yfzaIEDX+s3irNNZqn5tqJuik8ayt6OSjBglQ86ffTWgp8uhnu0SqJ8fKqzVCXiF/evr+3+TZPyRybQwtmHClaSi1wK2QasrvkSuNaYGL67ym/RFeZMzQ2REPM8bRv8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973509; c=relaxed/simple; bh=6cdUkgilZ/OtUG5CSqfjwssNSd31+3Bqv7Sh94x+Hkw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HXojEI3CCIg3CJyAP7N6OyNpSmIuxaKAWOsI2HvedSbHF0tqv/xjGJapm8901Q7YEJVuGi10Vhd0CppvubPYcaHxaRpZ+HZvzgvXmW2bbkc6gwitNpSdF0R1EWHyqh6364HqX+/gQF58x14SBFbysGnYwd9DjPeURd46uQiVfSE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=kg+IpBsa; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kg+IpBsa" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-225e3002dffso12996965ad.1 for ; Fri, 14 Mar 2025 10:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973507; x=1742578307; darn=vger.kernel.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=kg+IpBsaHDKr03OktMXVQzoGeKaEed1TtX5QuUdV1jHFonKVmyJgERNogkU4u2TivI uf+tVYNh0c0ifxemwvQGKPWtVwRdm4TZFB/3+NRB7/BHF5kE6NmNP75jnhK6tTP6tqU2 iX8UU8MCOKwQOj/ua9jbHP8glLOpngS2rYNycl+sHmgwz+kQaggJz5Y6ter2oY5Y3c2N qIpHzuUzpurRmrNy9+Z3xRABz5BFyMJV3wuWrdKJrStBkhA2k9RMMyBNGHl+zklVaAb8 8z0iqOvdaDhfxOcwLy8ZV+yIwmZiR1o/Yb+3OQnfzImcSWokqcd5kMzLxxmkKCqsMlQS TAAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973507; x=1742578307; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fjQjYNlvDIsMbe7+veFF5h4s6vvln32m8yANkT1fS5Y=; b=N+uWRyMighbEfNYsCf/wHYAAJJu+YEI+6iaG+skHCVteOitRxfB2evJfOexVp9Cpds lOCWNObzEwBJPT97fkjAcCoWVUODX1CnJBjxTZoW+9iqoz9PhqtgObIelCCaW8BSnElO inLaIGcfrC50BYECP727rg4mjfOS+DW+BOxvFAjKkVfCArgHaYb7RKuakZmpY7B5G7v0 esGSiZkuRyh4/ENjekv3+tuvxi05jtzjfE9zAfy1TwLEdNs4wavAAKoQLfqhECoG7+Wv 673W23vF7WWGnJdZKwknrRhrw29doqLf5Oc0cG8qIQNXIj8GXBJTx1/MWB2Lfm4wBvke /0NA== X-Forwarded-Encrypted: i=1; AJvYcCWhMnUIPRD0/aac9rp86oRg9/toX7N9nqDx6IkVAwKfySfq3Eich/F+zChXT4qM/Gv2dxc=@vger.kernel.org X-Gm-Message-State: AOJu0Yy51S4D/PZO0k6g/clPaTzYROankw+mY2s4nvmZLhJBXrAxrZdB oJ67okKzOr1LoE4Ar6J2tlt2QPu4iPa+Eq6kUPz6icZdy3fOk2xkcyoHD82xhak= X-Gm-Gg: ASbGncuAVE+rNJMBhOrIPwF83PEFc6swxi2X3cyGsoyzwp+dhh/9X1WUxFMCerI2Uyt oX5fShAeaTlcR5tnqcLEyM0Lzpw92Jwo1LbpUEVwvv9ytylwzB6V0BruJVT5gXg76rOfD/uwPgk K94zqgyGIry9twuVXf8FxPcae+llo2REc5LApKsb/YMasA2sxl90x4k+Zl8lflyi98htwyF2kHe jrpEZ+KVA+Xh585i1STWKMlWNZtCI0hudQvb0zRYXXpjJFPzSVXNNxB08sJWBvhXX0GDMKIninX Yr3/xAQ9dPkYWOfq4OnikGCJfMELV/p5kgKeDyDWQzrW X-Google-Smtp-Source: AGHT+IG98FFUYfg0sUj6szpvN+iBBsyjmwTHoAxx0itmB7R9pQNc8XnfcIaBUehzGw+xAOY05im+Eg== X-Received: by 2002:a05:6a20:c106:b0:1f3:47e2:80b3 with SMTP id adf61e73a8af0-1f5c11c3cd2mr3981620637.20.1741973507092; Fri, 14 Mar 2025 10:31:47 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:46 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 02/17] exec/tswap: implement {ld,st}.*_p as functions instead of macros Date: Fri, 14 Mar 2025 10:31:24 -0700 Message-Id: <20250314173139.2122904-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Defining functions allows to use them from common code, by not depending on TARGET_BIG_ENDIAN. Remove previous macros from exec/cpu-all.h. By moving them out of cpu-all.h, we'll be able to break dependency on cpu.h for memory related functions coming in next commits. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 25 --------------- include/exec/tswap.h | 70 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 8cd6c00cf89..e56c064d46f 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,31 +38,6 @@ #define BSWAP_NEEDED #endif -/* Target-endianness CPU memory access functions. These fit into the - * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. - */ -#if TARGET_BIG_ENDIAN -#define lduw_p(p) lduw_be_p(p) -#define ldsw_p(p) ldsw_be_p(p) -#define ldl_p(p) ldl_be_p(p) -#define ldq_p(p) ldq_be_p(p) -#define stw_p(p, v) stw_be_p(p, v) -#define stl_p(p, v) stl_be_p(p, v) -#define stq_p(p, v) stq_be_p(p, v) -#define ldn_p(p, sz) ldn_be_p(p, sz) -#define stn_p(p, sz, v) stn_be_p(p, sz, v) -#else -#define lduw_p(p) lduw_le_p(p) -#define ldsw_p(p) ldsw_le_p(p) -#define ldl_p(p) ldl_le_p(p) -#define ldq_p(p) ldq_le_p(p) -#define stw_p(p, v) stw_le_p(p, v) -#define stl_p(p, v) stl_le_p(p, v) -#define stq_p(p, v) stq_le_p(p, v) -#define ldn_p(p, sz) ldn_le_p(p, sz) -#define stn_p(p, sz, v) stn_le_p(p, sz, v) -#endif - /* MMU memory access macros */ #if !defined(CONFIG_USER_ONLY) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index 2683da0adb7..84060a49994 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -80,4 +80,74 @@ static inline void tswap64s(uint64_t *s) } } +/* Return ld{word}_{le,be}_p following target endianness. */ +#define LOAD_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + return glue(glue(ld, word), _be_p)(args); \ + } else { \ + return glue(glue(ld, word), _le_p)(args); \ + } \ +} while (0) + +static inline int lduw_p(const void *ptr) +{ + LOAD_IMPL(uw, ptr); +} + +static inline int ldsw_p(const void *ptr) +{ + LOAD_IMPL(sw, ptr); +} + +static inline int ldl_p(const void *ptr) +{ + LOAD_IMPL(l, ptr); +} + +static inline uint64_t ldq_p(const void *ptr) +{ + LOAD_IMPL(q, ptr); +} + +static inline uint64_t ldn_p(const void *ptr, int sz) +{ + LOAD_IMPL(n, ptr, sz); +} + +#undef LOAD_IMPL + +/* Call st{word}_{le,be}_p following target endianness. */ +#define STORE_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + glue(glue(st, word), _be_p)(args); \ + } else { \ + glue(glue(st, word), _le_p)(args); \ + } \ +} while (0) + + +static inline void stw_p(void *ptr, uint16_t v) +{ + STORE_IMPL(w, ptr, v); +} + +static inline void stl_p(void *ptr, uint32_t v) +{ + STORE_IMPL(l, ptr, v); +} + +static inline void stq_p(void *ptr, uint64_t v) +{ + STORE_IMPL(q, ptr, v); +} + +static inline void stn_p(void *ptr, int sz, uint64_t v) +{ + STORE_IMPL(n, ptr, sz, v); +} + +#undef STORE_IMPL + #endif /* TSWAP_H */ From patchwork Fri Mar 14 17:31:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017233 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FBBC204696 for ; Fri, 14 Mar 2025 17:31:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973510; cv=none; b=iI89O5kpHA5n99MGbXq+LpVqzfmhT/A+4crgkq4G2fqPGqDs85Zlgz8lTV+6+GK2yeuqhxU8QbYw/cHXFO89234hxNfDnK4H9HvvyIq1epCg0FFgSXJAjM0rpSJh2r0Jy9TrUJ4/tMgz6lRhCMIlVysuS+duJRPjR4K3RLMNHMU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973510; c=relaxed/simple; bh=oqW9tTQslkYwWgYQ4FVxpgiaLvEuigwHwZLhfUQTCic=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gxqzvjyztYN7rQ/PUBEXrrLptv8geBsOiOpxkSIho9Z6b8UQrakma8ZledMhL6TeKTHfwKHnbSiPuiRLJV2+lZqnpoP8Oh3YfsYRo+EdzYqAcoCNTByX3zaQdstP5Kx8DUI0HmqDa/SyyBf6zmvhp7fodE3/GKs/1Ij166Go36A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=cHy0kKIA; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="cHy0kKIA" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22580c9ee0aso45154545ad.2 for ; Fri, 14 Mar 2025 10:31:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973508; x=1742578308; darn=vger.kernel.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=cHy0kKIAe9Th4JpMd7/h4oOer4cwnArNfLxjbFGw4dM5jHeJ6H1T5W67tycetDQ7aP qQpbCWLTG/dMAGvXQJ8/uXjUOhTD7KKJiQ52OYEmuDLHEUG5Gbp32fF1EgyZedL3NZiz xk9viX0PmimPRdaIU/CANH0tvSVR1JvNqdCLdopk0Sq7MrzxLUKCevYumUYYCyH1pYsh 99XcuOb+QhYDcm/+OXt4m1W1vRJUt5rGTJ1yQ76/DhXpGtdOzfZHk2/ie15x63OnQWTa PG2L+fwdB84F9MnVnazyoLjxz5UJR66Y29DyxXjI9eoxteKSP0H7xWeyv6lpnUKYo52Q GEvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973508; x=1742578308; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fcP4MFj0H7Fu3AxOxTbJlPG2KgbdJwiBtz5sSPdKZDU=; b=cXU866YGBo+EpYYf5vo14E2Q6vEu8hUJp1hvXCPDTgHm3EfiffdR6nQ+0QVu9w70hd s/FdVjfdvsdolHSkmdTDcXEsgRN9/yjVcOy+GSr+h3V7h5DvwJv+jHgn6jDjHK/K7weD Znp/h3l0LCBJ1/aq6R4cFsuhbrOKuwensqb3B0lkaCZYgA/ASTCyL2i0BwGyCMzshxxR p4sRY04YubpwEgg8EeromWTws5bnqynn5axS4IoTReqzGSjVOs4i9j7JEslan1JqVh9H AWADMw3BNOcz7+8AzqhXefBStOI5hHY0dvDbkIRYFqRfGiDCXB5gW1RG6ozm0uvWVxmk 0Hpw== X-Forwarded-Encrypted: i=1; AJvYcCUCXF3lep5jQ02Z43+n8LsWCKNkBcGvuQCM4o+bOpDWYEYLtZ/8EpE7v51u8dndJXJVoz0=@vger.kernel.org X-Gm-Message-State: AOJu0YxXxu2DMWeA5Oc7bVhW7o8BSjOxssavQlsWCaaPFschivNIxoIY 3P03hGPQ2AbYwF2XRw+FHiEzYDHtXt+YbntTIar7U1q32s/bJNHpoXZGLqXSODQ= X-Gm-Gg: ASbGncvviu2zgAlSSazdKio8I9txbcSXGFTnEbUIRCzlEM/BvvHpBt5zfob9fU7Vj+K 8XBSTGQBy88RsJLfBYJM2hvXMhP7z/dGhp1rLm5GKg7DXJCo26hYJCQGc66Ld86/x7BxMSeMckG pGHvkbErHozeQn6KdpbZWwl2jyAFkBB8im7d5LOtxHkZxdC7CWTUgM4u/jOFAdiywj9HHwNQ8rc U0v7b2aJ4Y0vGTUW1WjZ/fZgESAiSRExkt0B/NkZ85l4Ex+0/QSzCMR9HPwuSwJ8a1RykRaAjqK WrlWkaPfm9uPvd761Epku5XoJnY0xC3LqRHOb2mzANFO X-Google-Smtp-Source: AGHT+IEybdH1a4UlSgUtF+/hwXdxnavqEZfmFC1l+XuioTIMcBmIgOmIQCQoptJbICxTDzesMl+Yag== X-Received: by 2002:a05:6a00:a1f:b0:732:5164:3cc with SMTP id d2e1a72fcca58-737223e7399mr3832395b3a.19.1741973508455; Fri, 14 Mar 2025 10:31:48 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:48 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 03/17] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Fri, 14 Mar 2025 10:31:25 -0700 Message-Id: <20250314173139.2122904-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 12 ------------ include/exec/memory_ldst.h.inc | 4 ---- 2 files changed, 16 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e56c064d46f..0e8205818a4 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -44,18 +44,6 @@ #include "exec/hwaddr.h" -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - -#define SUFFIX _cached_slow -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) { address_space_stl_notdirty(as, addr, val, diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 92ad74e9560..7270235c600 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, @@ -34,7 +33,6 @@ void glue(address_space_stl, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#else uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, @@ -63,9 +61,7 @@ void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Fri Mar 14 17:31:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017234 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 644DC2046AA for ; Fri, 14 Mar 2025 17:31:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973512; cv=none; b=oz+4/SlQ5CQ+3DqybmguNIovlnKvRVK4zojauD58GkgdYlv5gmOa9AAM6A26Ak9LlxnHtjpkMy17MyKb5KX3c1rvO8ApEBMIZIDcvdjqkFmqRYvp14aG7GsbIt6gADnE/ZzL4XVbvejCfAKkzfUdRjtXHeFU0jCcIn7Tq5T0OKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973512; c=relaxed/simple; bh=tsr8Vu0yCbhmYRJ+c2Olh9gVNG1abA5bAWFfRS2LzZg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HQH+uSaT5AIL3mxLPEJ2zuDNTfUhfFGHawS4WdWf50LnI761pc9ZNSs695iHC1MBMe9193biKG32ORQbdm2k+Ydx/vw0WOM8vxISPnlx06+O/e8B+6yH+SBU8lgCZ8SbJf5gK0V1PT7i0dg/E7JjRhmaFzy4rl+frW3bsSHrGzk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=s59pAnqg; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="s59pAnqg" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-22548a28d0cso69285805ad.3 for ; Fri, 14 Mar 2025 10:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973509; x=1742578309; darn=vger.kernel.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=s59pAnqgbzUa1qiojfCBzGS6z9p9S/tV6snWiJQNBI8birBMgDgvPVnjopwZueNn1U wle3socYmIJUvDe1R881JwtlebhC8JMJCFopYi3zRCsof0LV1/gYpG4siYZuxmQVrmdG NzLiXSUaiCh9NAmeBYK9LFwPbFdkLwZM8PyD9su/WcZxWPU5acyhhZYSDeUus2fP4EUx 669TYoW7BbRK0sn7K2ip3eXuKgV0LuvZmwDaT77tZBiD1hwKktEIri5qxdZmiGma7yT+ k4n+qt8ajV3vIcYxLymOa9iB8vf0uwP1q04l27pPFDBU9Qi+ipW/7L6k39XfKtTyPTT8 nzuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973509; x=1742578309; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G6OuFeXnonCJBRRaCKlE2hD3nLeAbwsquVgoLJADjfc=; b=MbWSiACd3XzLJNsNnrlp/uCth+dXXhSsslQHqTqqbcBdZJZMfj110FEQHnzt6YY50E hhLm8w0dE9DWF8ZJ6rlJP7m29xR6k4zAksUq8b8g0zJYX9lC4tF59uArJqTs3WDdGpU9 TbryiYnvXr2UD0rccGHLksV++h6fg0PFJFAKz6tqtQikWzbk+NwF0hm/qpRyFk1isiYv 5zrM5otPy/atYmn+ItXsw747NQZB7trRQmx6L8AYWHkzyEkH2b22mwcdMyQ3LnbWMknK zTKT/8Tw/3QfyXu+4kXzkCjrVc4LiY4p9c/g1CU9Z0vdsQM38MRmMeZwD2GIXH9oDZ+q ckFA== X-Forwarded-Encrypted: i=1; AJvYcCUgMgna0gSbcdNNBPmz8gNfB3pxg6WEvuwQU+DkWy/l8cIijxUkrvcX3KiZoVOXoLOfThg=@vger.kernel.org X-Gm-Message-State: AOJu0YzMr7DZkRLplQ9p9rqBZGY52AdQkQuG2gQAOyko9ti5zXOX807k Yclen8N29Xp8/qCcZqENFcweLLWtNJdWjWANvf5WD38yOXnx7NVzSx+m4n2rTKM= X-Gm-Gg: ASbGncsszfLrmxrutJdniMHXwxPQV/aLAHkeycv9V85Dda2oL6J84W2GjYpvKvv7nxV F1kMrymXHA/NM600OLdP4XoRFQaNVSpBKolMEij6+nac5sxx/TcEYUyMQ5jWBg8aIDAqBCX2/wf QiIeAuwIyklYg8v5ahP/+gNlIcUM+g92eP4jYgs9YvOGh6fDLVWAkD5z4XcduAy+qKByRTuhLZh mZKAQJu4ik0VXEI9rJ6oC9BJBaMhNPQ0H7tFpX4ot85ycxcrkYVATqhs3j6DM/KTpSUBl0mmC3J CfJ8xf6c6s5+gdS8fOlYYGiexytj5OKCNWUEx447K10G X-Google-Smtp-Source: AGHT+IFQBeqqn3ezA5En8rRFWwDRdkhHWJ51dC4tNWFcY4zpXwmWJXk93HseKx7PQbRLNq1zxfYk9w== X-Received: by 2002:a05:6a21:1519:b0:1f5:8a1d:3905 with SMTP id adf61e73a8af0-1f5c10f7d60mr6252806637.7.1741973509576; Fri, 14 Mar 2025 10:31:49 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:49 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 04/17] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Fri, 14 Mar 2025 10:31:26 -0700 Message-Id: <20250314173139.2122904-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Move stl_phys_notdirty function as well. Cached endianness agnostic version rely on st/ld*_p, which is available through tswap.h. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 29 ----------------------------- include/exec/memory.h | 10 ++++++++++ include/exec/memory_ldst_phys.h.inc | 5 +---- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 0e8205818a4..902ca1f3c7b 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,35 +38,6 @@ #define BSWAP_NEEDED #endif -/* MMU memory access macros */ - -#if !defined(CONFIG_USER_ONLY) - -#include "exec/hwaddr.h" - -static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) -{ - address_space_stl_notdirty(as, addr, val, - MEMTXATTRS_UNSPECIFIED, NULL); -} - -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" - -/* Inline fast path for direct RAM access. */ -#define ENDIANNESS -#include "exec/memory_ldst_cached.h.inc" - -#define SUFFIX _cached -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" -#endif - /* page related stuff */ #include "exec/cpu-defs.h" #include "exec/target_page.h" diff --git a/include/exec/memory.h b/include/exec/memory.h index d09af58c971..da21e9150b5 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -21,6 +21,7 @@ #include "exec/memattrs.h" #include "exec/memop.h" #include "exec/ramlist.h" +#include "exec/tswap.h" #include "qemu/bswap.h" #include "qemu/queue.h" #include "qemu/int128.h" @@ -2732,6 +2733,12 @@ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, #define ARG1_DECL AddressSpace *as #include "exec/memory_ldst.h.inc" +static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) +{ + address_space_stl_notdirty(as, addr, val, + MEMTXATTRS_UNSPECIFIED, NULL); +} + #define SUFFIX #define ARG1 as #define ARG1_DECL AddressSpace *as @@ -2798,6 +2805,9 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache, } } +#define ENDIANNESS +#include "exec/memory_ldst_cached.h.inc" + #define ENDIANNESS _le #include "exec/memory_ldst_cached.h.inc" diff --git a/include/exec/memory_ldst_phys.h.inc b/include/exec/memory_ldst_phys.h.inc index ecd678610d1..db67de75251 100644 --- a/include/exec/memory_ldst_phys.h.inc +++ b/include/exec/memory_ldst_phys.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS static inline uint16_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw, SUFFIX)(ARG1, addr, @@ -55,7 +54,7 @@ static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val) glue(address_space_stq, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#else + static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldub, SUFFIX)(ARG1, addr, @@ -139,9 +138,7 @@ static inline void glue(stq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t va glue(address_space_stq_be, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Fri Mar 14 17:31:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017235 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74E842046BA for ; Fri, 14 Mar 2025 17:31:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973512; cv=none; b=aPJp5YkPHKcP0TAAH8fUXm06SM+nQOv08DN9Ne0wg8GKzKDuKJr+ZZsOdBQtgsErIH8LvXmPlP6i2j/VXYY0e28T5yeP4ZTySZ3l0Cc1HsFQaECkn+Loar9Q0NtemaJOlxj4gihtU8usu/skZdgRd9EMN2OZ13gWMvc+q2n2Z4c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973512; c=relaxed/simple; bh=o5ngxEogoPE4wzfGJK+6GJ+kqB2vK52Q1QHqnpgsaHQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HjMF28VReTbtBZ2jXkuS6UamyT7j+CAUB/HehwPIbYuMow4zE+lUsX2/qGTrDD92bEJoNjG7RJZ0CG+epQ1gYaXkT0tWCmoDNwU9XowIDEKmKM5pPKfn09H41tAe4OUirp3h2R+wh+MbEjnBUnD2KRMrgbYoew5+YM9DUu8k8AA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=yJbVF7Qo; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="yJbVF7Qo" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-224100e9a5cso48992085ad.2 for ; Fri, 14 Mar 2025 10:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973511; x=1742578311; darn=vger.kernel.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=yJbVF7Qow7HlU5PPgXYbN6pUFysL8QI0Qq6cuDPaauBy9e+JxJlqKnfZxphjZSReCT H1ApAcYWPeK/1DCGrSgPM9xrilA8KfWmj7qPuXpa7f174icd+WxUVyf4oLx/EnA46YAP GMHT/U9kdH8CMVhgEafHIC6D4kdtRlu1CS/gp/laTODLvQho0/E8auehKc+SCB04iB6+ 8jDAL5rpM59ZgyGA+36xtTFH1rr7DubkSFdTLwMqy2MRoOjugeDRuWfdZ6grVB6pXh0N aUxIo096MrGJYpLXN7Sos/8FUdDUbGxtml15AgcngGO7MPtAQmTisfuY2JhSX+Kyyg3Q PvQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973511; x=1742578311; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wT5ohu0Ui7xrH+jgYqMJMpKemGPcZNvy7jzdyuAyzEs=; b=bBE1pJ8R/wkwkqb8LoWiqZ6Q9SDSsnW5xmVR/iHw6nmM1bF/pdqZ9Zk43DdYjcIMGQ WDrgtJPU+pudPmwlvD/fkHdT281md4gJ1Gb7b2RiXK9+iE8GLK67pQMbGJH54ms9rLrt 5SOM7gK4e1nmPkttr74uacRAKZ4NpYowmaq6EknlUF6LaiIREMiQtvETeO6xGm0tPMBr wKF5BUKB2+QY38Fi3pGEDdOHgjJs1keg5TqQG/EK7w4lhAILU0/nBOV4nGkBArVH4ieq kZuvE0iMf3RBh6ij43H8Y0TgzJ0XZEzxmPOuwyr4ZA7oHJKCqn5JIXkEdsad30u7P3Gd /nEA== X-Forwarded-Encrypted: i=1; AJvYcCXCACnO34ZqOGCyRsoOJxz8ql1Wbly4KqZHWYLrPS6Ogu29O94Yh5GrYkB7T3fAej3Pu5Y=@vger.kernel.org X-Gm-Message-State: AOJu0YzyUgzz+fC86jMSdBahF/VHLlo+Z3uuZfNtlreuqPd9h6C/+AvM d3N35vWYppjZjo3J32VnDN4bU/WYcE0w2csx881WN17uI8+5KDz9t84amwT0AIs= X-Gm-Gg: ASbGncsOVNQ8L5QqhyZbRHRUDLWUjLS/r2ATkMxPmv5e4TG8LDPJTF5Il0Dtasaltd0 FEv8JW3R3gQ9h/34rcxG2iPYQRe/yh0p6sS1IkdLiiHNzI3BPXV/hofx4YyYqkXKc42cKmImsCz IuvmZf+9AYipsZ11YEZ95BcGq/O9eknvsRThbrAEy8vfpPQ7CIQjh6SmPjES4NPFqvtVOjrFNh1 XtZ3SLRJ+Q4kOfa3nUx4nkECYRaeKh83bjWPHozyBhGyiiBxfffnA0jgcOxYDJWSG68jkvENIEX mxt8bpFcoe7gHQvvw4buQD2GbaGsDiwpZw/a5AMTI+G4 X-Google-Smtp-Source: AGHT+IHrpliMNKDFJoDtMC4n7ul1BPKlqc8CVK3A1d9AQSWcUHjtbEMPub70Om5ILhqP0o6bsvQnoA== X-Received: by 2002:a05:6a21:9005:b0:1f5:75a9:526c with SMTP id adf61e73a8af0-1f5c117e146mr4872005637.13.1741973510710; Fri, 14 Mar 2025 10:31:50 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:50 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 05/17] exec/memory.h: make devend_memop "target defines" agnostic Date: Fri, 14 Mar 2025 10:31:27 -0700 Message-Id: <20250314173139.2122904-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Will allow to make system/memory.c common later. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index da21e9150b5..069021ac3ff 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,25 +3138,17 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -#ifdef COMPILING_PER_TARGET /* enum device_endian to MemOp. */ static inline MemOp devend_memop(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); -#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN - /* Swap if non-host endianness or native (target) endianness */ - return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP; -#else - const int non_host_endianness = - DEVICE_LITTLE_ENDIAN ^ DEVICE_BIG_ENDIAN ^ DEVICE_HOST_ENDIAN; - - /* In this case, native (target) endianness needs no swap. */ - return (end == non_host_endianness) ? MO_BSWAP : 0; -#endif + bool big_endian = (end == DEVICE_NATIVE_ENDIAN + ? target_words_bigendian() + : end == DEVICE_BIG_ENDIAN); + return big_endian ? MO_BE : MO_LE; } -#endif /* COMPILING_PER_TARGET */ /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., From patchwork Fri Mar 14 17:31:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017236 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1B9920485D for ; Fri, 14 Mar 2025 17:31:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973514; cv=none; b=SdVdGFGqEjcTAqRLB8WjgS5Le5lVv90vdoaVeYEHwSD1DV732gjEhfVh53sE7De6lliolxn3Ag/YCVGSr8QJ30OuakwQTit2i/dexsIRoUoqlhqhzEOBoJ3UIPL5sJZpHgCQZeyAl/AmLxLOGLi0b7xJmfXaUes11smtsaOyZG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973514; c=relaxed/simple; bh=7ZCuTPyFqkaspTwPhH/SEirOAPA6rDicmFwNtDxEP7g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IeNjamHzUDunInlAL/uWSlwjHw7oiVmmHAqwZDQJYK5l8xZLO1VEGEIXu3faMe/T8zX+/+s7RsS9Dptc6bR1irfXzdkZYXxBy1MYCkDJrknEqOaZc/flF9/Hg/o5/nmzD4C7OjOJT++Rr5biINncxnPt6Vyd/O5BbEXvnVIvkhM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=WkZtlYpb; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="WkZtlYpb" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-225a28a511eso43036795ad.1 for ; Fri, 14 Mar 2025 10:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973512; x=1742578312; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mZcjdDtX1Z7JVvsuWgguTldfqVr7ZBWkV3i9i17ooa8=; b=WkZtlYpb9OKCX3/slGsTKrBEyqCsJmhA2E0mpJwdxMKeSYJEFRObu7lrMLf+5vNxDI dQ2K9qE3m/YlwT0Gs7vflsr7KXpmABI0m80QOEM1uM2slcWhd+2YolxOm+UuunQs4AIU iL4DzINTRLMQc/n3pLRC9xB42X1kMu7A/bBckJEsU5twaeQNgIAu8sPbVUr41af6tOSE N113mci7y78kPqs+RioxQyq48beZQt5dzKCJHLfCyMQMN5p+m35IkxU7MM2FY0zBEttm 7QCdnPXc25I0I5I7UiKfr6zmMDv5bsyNFzfUjTYQ/qS8kEWPVEZnLYurlISh9Liqkrls rvzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973512; x=1742578312; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mZcjdDtX1Z7JVvsuWgguTldfqVr7ZBWkV3i9i17ooa8=; b=HNxYfd7wH352m1LH7rwYGeDu8s3u0Yukv18cFwjagZXE3lgk/fUPi/16hUnU3LrBRB WyvNNSoVyRYXpUCJ78DLzoeGhjrEARxpZlL3sl/rGz/9aFS/vUWVyHFXQJfiBejLXRes YdHFS+0kls2LaCdze4r0tKXISgn9paS9CxftZnLmPdfURpgXd6idB5Z3X5CPe2YSOgMV 1J+6AXiDsBos3p8yEG1dEVWqptjbRM/aiGILKf7pkWKSspVrswYjRkhkLwN1VONOO75x qC7W/PD5r0IHt/OeGF7gAISLm9godyljncfDCnw2ln7srq4r7RB0RUyQVuoEHp+Fnf2A kdQw== X-Forwarded-Encrypted: i=1; AJvYcCVUZ4uE/GY22a6NDSGZAvfYHtXeuAQTa41/DpiNo+Heqs85pCR5nsBJr0/q0opTPxhjuB0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2LjuIi221Lo9o7m+aqSLjHMaDD++pXc9+hGGi3Cul+czPbNmt Auvthy3GQElggx8MwbS5RGstOO5HHKv/1O52x5aZs6FastP+8dWSAwDgjlr4HnE= X-Gm-Gg: ASbGnctXfT7hoghYoQCpsf6e2Zf6KZBFMvBlSsUOxm7QhGI9+3v3XYMhZhI+G6ZaXzQ e/mYTvjYNKXubKesEfhhmaVk7x43GmFCZIF13VEEH9SHOCz/nOOPXY9PwM++jzVw9vUWrdINs6h 8PKetHVvWWODLtnejKSOfsmlCndDLy+2B+JNexhdXcFVI6KJqMLbsYPQ2DjFfTGFLQPuy5XfAi1 8ieL0KqzVIu17UqvLDAlOxEs5IXBrwz18NEhH8RnOZTkW94bwLZOP6TJGwv3IY4h9vO1g1+hCQU Ie0ys9vv8+XYz2FANmbepYWfIvwfDmfHLy01a+1UTN+5 X-Google-Smtp-Source: AGHT+IEORLbJQZPgomOf1sDjTcDkAnGl+mlFCK1VHaTDHzBWmfJYoIo2+c2hSAC++5jNWglDm/0AKA== X-Received: by 2002:a05:6a21:502:b0:1f5:8179:4f47 with SMTP id adf61e73a8af0-1f5c11d86e1mr5274835637.20.1741973511929; Fri, 14 Mar 2025 10:31:51 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:51 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 06/17] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Fri, 14 Mar 2025 10:31:28 -0700 Message-Id: <20250314173139.2122904-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/tcg/tcg-op.h | 1 + target/ppc/helper_regs.h | 2 ++ hw/ppc/spapr_nested.c | 1 + hw/sh4/sh7750.c | 1 + page-vary-target.c | 2 +- target/ppc/tcg-excp_helper.c | 1 + target/riscv/bitmanip_helper.c | 2 +- 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index a02850583bd..bc46b5570c4 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -9,6 +9,7 @@ #define TCG_TCG_OP_H #include "tcg/tcg-op-common.h" +#include "exec/target_long.h" #ifndef TARGET_LONG_BITS #error must include QEMU headers diff --git a/target/ppc/helper_regs.h b/target/ppc/helper_regs.h index 8196c1346dc..b928c2c452d 100644 --- a/target/ppc/helper_regs.h +++ b/target/ppc/helper_regs.h @@ -20,6 +20,8 @@ #ifndef HELPER_REGS_H #define HELPER_REGS_H +#include "target/ppc/cpu.h" + void hreg_swap_gpr_tgpr(CPUPPCState *env); void hreg_compute_hflags(CPUPPCState *env); void hreg_update_pmu_hflags(CPUPPCState *env); diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c index 201f6292033..a79e398c132 100644 --- a/hw/ppc/spapr_nested.c +++ b/hw/ppc/spapr_nested.c @@ -2,6 +2,7 @@ #include "qemu/cutils.h" #include "exec/exec-all.h" #include "exec/cputlb.h" +#include "exec/target_long.h" #include "helper_regs.h" #include "hw/ppc/ppc.h" #include "hw/ppc/spapr.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 6faf0e3ca8b..41306fb6008 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -29,6 +29,7 @@ #include "hw/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" +#include "target/sh4/cpu.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sh7750_regs.h" diff --git a/page-vary-target.c b/page-vary-target.c index 3f81144cda8..84ddeb7c26a 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "exec/page-vary.h" -#include "exec/exec-all.h" +#include "exec/target_page.h" bool set_preferred_target_page_bits(int bits) { diff --git a/target/ppc/tcg-excp_helper.c b/target/ppc/tcg-excp_helper.c index 5a189dc3d70..c422648cfdd 100644 --- a/target/ppc/tcg-excp_helper.c +++ b/target/ppc/tcg-excp_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "qemu/log.h" +#include "target/ppc/cpu.h" #include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" diff --git a/target/riscv/bitmanip_helper.c b/target/riscv/bitmanip_helper.c index b99c4a39a1f..e9c8d7f7780 100644 --- a/target/riscv/bitmanip_helper.c +++ b/target/riscv/bitmanip_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" +#include "exec/target_long.h" #include "exec/helper-proto.h" #include "tcg/tcg.h" From patchwork Fri Mar 14 17:31:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017237 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A58BC20487F for ; Fri, 14 Mar 2025 17:31:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973515; cv=none; b=n9k6wUBRBbQU0dGdWl6MTRvDanqu2v8Vcc1Q9245thvlvt8sWQdSLxDM3FwsqRTLfJJFCeh0QKUqSvASHg/mDlacGz7bIvmlwFz7ae2hMhXq0fAJ9H/sRESTV2dieKgb96Mxwj/+TYy9EnFSYMr+3NIFmdSzrvGKT4RDUMlwHXI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973515; c=relaxed/simple; bh=aHcHDSCEQG/Lxg84jg/rjAhvQowTiiMszTRoQh+zwoY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=trLgXoGCMZujUvBvjFeSHtLa3LLkzci7eny/2qvfAFIKP/k5i5pVNUN7Lo8b1O3+D1HnJhIalKxzWdvTspBSfBM9sWo+BOgBf5AqdMg+gq7sMxK9d7e9M9Mx2cdn6YDEYKckhH63XVtl4w2UD6PdEhlGqOjwuXnzUknXmmUN7Qg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=aVD9f3jX; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="aVD9f3jX" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-223fb0f619dso42965315ad.1 for ; Fri, 14 Mar 2025 10:31:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973513; x=1742578313; darn=vger.kernel.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=aVD9f3jXh62J5aSyJSStFUMZ0/IeSq5mvR5SNomOB14qChikwRdP2jr0MeG4opqi+g Q9k5cUwD6j9AFD8q8YKI6vO6uMUv0ih6Xn0p/iNNvLYqndDbe7Y1kJmeRbGVObp7aHju Sg1UcH3XBrXilyC92A+RXTTg72A/SdNzgtTo82aqxXTioeXc0OQVDKJfvtlBR0XkWANU QUS7kOyCS3rSQIPHFN8Jgx2YU3FrZcAkqcGHFWF+muwGNFNjYxsnGODSwIZC86Rd4VXE YLjTKOzvEJyaxBHaytidMncMQi9efzrqKMpHEFcsorKH2ld4vpLUmAYckAAgD/P4yw/W sZaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973513; x=1742578313; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bYYGOsy+zcSjxVOnigwMonGaAhWbZB7W76ZyOX5Jlgc=; b=AvyenTvC6alVVltJCpJygGr34/eYInTyjitbAaflXflOh4veWjVyzygeLMEx4aE2Ua UAQCmGx45pYH3ZxkF1IZHi9dm9H9hOBBQ7HAsNbBymZzL8/TB+DIzA3kGPz0S4sYcBSa gywxLRXxtoIb7UE5hU+grXaY5Ips8n/FulzRoa1Wm7fk1jZ+EBLaA7HCOUXF0MEuTAp8 WpVHDfBIIrUjeM6Ez/1yNg8FbLaW6w++fpVsSbjjEDSzC10Cy6ym02NIjj1yxPbZcS6f IsHC3vyHKpYzc0urvNJySIMf4dn4OZTkfxJWhAA5JoQpuAqATZOycTDuA5PBDvTosYC8 6mSQ== X-Forwarded-Encrypted: i=1; AJvYcCXke7vBuwlHCfAuehVk0e3ymzdfRL7Vn+kbkIr/wfmTOLob8a78AimTtrerUNa6uLVFpxY=@vger.kernel.org X-Gm-Message-State: AOJu0YxL3Q9OAviV4orE1mf4iYfmjGs8IrhJviZitg2LAQApWCHfYIUo XfHQwVCxJIoVp1ya2gkogErGJiFKLAbVtRx2czBYvfo8/gIBuSgAisH0MUeHkvI= X-Gm-Gg: ASbGncuzBK7RjiKkZY2tFxAagFCFXaz9GyXokIGZJeNm1pqXMVv05OgNYSZpVR//Ym7 zgUtgA1zyuW+N9otXsumqxOiukesxjKJ+Q7Q26viIQkXU1cWJuJvmDlwvcHHAzTXkpJ48cHTWu7 GyfDSy3afHnuth9eHscUeZg8TxobPYgmRKYH6kmFcr1ARlGCkG+PZ5yboW0lAXbJBzw6LlQkOsx Ju/GJtpRokQkSANPnU/gelnL3Opwjdnge7XkkKGHBKcR1qRKBvZlfNtJbHGIxvbGSKD5DYYhNYt BgJOSDZlVjBEOHYxKODxv0wCHWrv/UOA1ryZ2tGw6meJ X-Google-Smtp-Source: AGHT+IHKJWanCd9a3ngVFjdniRCV0nA3qgwDHy2sNxgD5gHXjvzGRnW7PF30BgY1b31dJB7uC0Yy3g== X-Received: by 2002:a05:6a21:7308:b0:1f5:64fd:68eb with SMTP id adf61e73a8af0-1f5c1137439mr5964561637.7.1741973513079; Fri, 14 Mar 2025 10:31:53 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:52 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 07/17] exec/exec-all: remove dependency on cpu.h Date: Fri, 14 Mar 2025 10:31:29 -0700 Message-Id: <20250314173139.2122904-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Previous commit changed files relying transitively on it. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/exec-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index dd5c40f2233..19b0eda44a7 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,7 +20,6 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H -#include "cpu.h" #if defined(CONFIG_USER_ONLY) #include "exec/cpu_ldst.h" #endif From patchwork Fri Mar 14 17:31:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017238 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16D18204C10 for ; Fri, 14 Mar 2025 17:31:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973516; cv=none; b=TbkWEa78tlhasu1v3F/rpP7o1qDbw60kjduAw8JJ4feVriIkv/hLcLn2hLwZR8D6dVZWG58KmHyxX7Io1haZxIkFEaDtA7vbhHofAF+lQ3Rkbs7IjqyhmJqNf9A1QgYIsqH2cQCKoita+vqFaqmxxFbwXQAbLMuukL+WyhsKbSc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973516; c=relaxed/simple; bh=072rJgb1v8WTOR3ndNWM1YDjHaA2UGkZkEMRddxYphA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=n77+LwTiKvHbMCUMulweupHlwBu/nLTAp1fhmh4xUwMqLWehGO9fBStCZS/lZDbULiPtIT03ZxGRcuNUYrbbIyoWerQO6DzRnjlYrNkRk3HuGNRFCbc2QMfovrrh2qqUDrMRcZ3w6Vkj4ENl9lu3G0KXdxKKTsxhFnhg3DQ/AF4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Ob2pswC2; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Ob2pswC2" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-225d66a4839so27410655ad.1 for ; Fri, 14 Mar 2025 10:31:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973514; x=1742578314; darn=vger.kernel.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=Ob2pswC2yBJQ/a5tT28NTCSNyMdjS/bg/jViulL+GxKQnEie7++pxLo+uBa0FB1e99 TkAXFsyLDGxu1eUThqJJcAyGqdNDQqc/ySAJIinBWcdGjyyE7hTvmCVGIkHtg3Lv4DSP 22O6JXhDhBM1cr3tV1bQpB9brUYoqzTUVxg+YhsF74RnpbQrt/81/FznwOJN6WgZWx4D ypqOuBfzlZAgWrBV6K0yZlq8BkmxpbNoFnWW1c9o3OugUJXiCtwt1TOKNdBYy5y8Tyxb bA+jTJnKPc9pP4IaWjRkRDDcyo5V+GolLrGgbJsWVKP81BIp0gfc2LyeMs63eX+Cyfuh 331A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973514; x=1742578314; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Rp8GQC6vA5rTxSSazblnkjuLZPjrJAYUOFg9uGM493s=; b=ODzYfkGQk7D4X1opSw1Vb6xaABvXALfKBJ4WvXogvUqe8h9crLWPHm9SBKpDrFvp+h ueelB7LHHGI7Qv1fjdtBq/hEEi4kjz46z7Z+dhWwOD4iuINuTOe8/zW9ONfbLI+oCOfr RL09nD2YWlyET0BJG8sZmk21O5pWTQpoZbwTcRNyh+vr39i6mOKAgQOe2APzuwb6xJ5R Xx4KRf+3W2Pm4QbaZECSjaY26e67Abfbi090wGd06HHeH6TtxpyRIpvMV+ZAju40Ghig qd7g/IXPezQPGEzLSxVBNT3qUrzaKcxGPESWEQLxfJ1fwJ8+iuzxpCayWgMd47qZpAcF icPw== X-Forwarded-Encrypted: i=1; AJvYcCURk3ZlywX87v1Wd90NLF75YQ94VpgSgzo6WtpKcZ1qibjO9PkuEbWbUowxAZa7dGDZV+Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxB1YYSE6mKof+GkgTtPbV1b6nRVXyaVNO2l1X5UDuHfQfSNq2v 9c2MdgEefRULKv/WPnnQZlT0z/KfDPRnvYU6ly+A5cpXkkjvWXwbO2F6BUotYWQ= X-Gm-Gg: ASbGncs16cMa/c3DpVZGqlvqSZzFWZN6td0oSZdTTgJFc3aG5ZC9yjoZdzOVIvr+pav +LGuhGjEbs/Re3DEwCqgrZ+44khZp1eAqOIM1UBDNvUxeBs1A15grcRsrZaeU4w752y0/v1FVEP V/nULYz5rMZqZvugsYYZzLOxggBjx8AtqOFY90D9LtoC0OZ6dg3Pzpz+Fh1TXucDu/o2gtLarYH HWBQ+2AFcFv3laQtBuzwMij7rR/UiDwkysqITtuw+Tu/3etsklsA1lk6n6yCeHw8+pPo6Ha3eKB a6zb5IXGIv0BVPzqxjErEuUsCj3qPAuLPJFIJzBb7uJp X-Google-Smtp-Source: AGHT+IGePgTU4KS0V7kjk76bTSqsHMsJJFpsZKEW9Y9cBbqNQCd9EST3S+oni0XLMdUtO/XVrzydIg== X-Received: by 2002:a05:6a20:728d:b0:1f5:9cdc:54bb with SMTP id adf61e73a8af0-1f5b07bb133mr8380424637.11.1741973514284; Fri, 14 Mar 2025 10:31:54 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:53 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 08/17] exec/memory-internal: remove dependency on cpu.h Date: Fri, 14 Mar 2025 10:31:30 -0700 Message-Id: <20250314173139.2122904-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Needed so compilation units including it can be common. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 100c1237ac2..b729f3b25ad 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -20,8 +20,6 @@ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H -#include "cpu.h" - #ifndef CONFIG_USER_ONLY static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) { From patchwork Fri Mar 14 17:31:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017239 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03E2C204C3B for ; Fri, 14 Mar 2025 17:31:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973517; cv=none; b=gMlUrbO0ze9DEm0HyqGqy15ZWuFoICqyfmhgTH9pvcrQqqeQpcU7lnbBYYthGv/LXiP/1HPca/uHfbjLdFU07a3/bquITRNHJxdOwt0XiOqsLpFGWRLYsbVbYuaAWhRlTkgp0L4XUvdy5Up4JLsnGzi2eCZ85GkiSBHNAyX/sNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973517; c=relaxed/simple; bh=rOapAhxsucTXmmvj3a2Zy3fKHxQeQMgYCuWijJzB6sI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=daDxszaCIxmH4LRs8lbEBevbWkfBjzWRhsCajaJxSf8M0g6vrJ9F0rXRI2dpp7rYhFjWQmhRYvFrrBt3LZ8ZOM8+iF8Z7kpbmrCcFI+OkWB1d0gpywSd97Iy1BqqF3X5xTxs8VFMNNws4auxI5WLnRjWHA07O3C2kgSvKZwLAkQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=UrQKCvNp; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UrQKCvNp" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-225df540edcso18252325ad.0 for ; Fri, 14 Mar 2025 10:31:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973515; x=1742578315; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PfpTTedni4gUGfvRcfnvXw4xTvY7JO0pNjOjXTZ7pI8=; b=UrQKCvNpDrw7flOUFWFb+khSrW9DUAr93CgBo/V4pUugU461oZeALuVmn0itf/khss EfNWytRVvfzeNqPamyLWqrAOf1TwYttdxNQcloUTU4S9jGmaPyPwwlpJZ0pp1HIq2IYH z5r6rZTe6qwSlod/iqeD54t719g16FTlNgVeKhILirzrdcJIneDMBwwXz7pmCzWi2Y1z kcBWCkYnq1+Dz6niMa5F8oX0I+HBctLJijbCPh2gCBI3PMwrc2Z4pI+WR5YB8BIeo13n uplfSo2BscxjwX0dDKVuxmNqqmLXBEsVuRXjvoW4+zu9W89Gu+WFEZcVxnXQTUyjF9OI wOIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973515; x=1742578315; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PfpTTedni4gUGfvRcfnvXw4xTvY7JO0pNjOjXTZ7pI8=; b=e1P+yVRXnrrZtf2nk/Q76qA70IvhkEJ8hdRyxuLhn9ZdqN0fzxJah+a7MgONo0RgvT /EvdxlcwHtV8FUS1sLk7H+i0YL+TSWAhqGRzTDutXDyFsOt47VgAWbNV2+DnT6xl5DUy 6Qa3tNfst1kryXU4uz9MDf0CcVhyDSS9AVDDZLHGe6fdxPHgPfuRWwShkRIY4K3Y5XJH nSkpm7GR89lZkBZwBW5BbBDNXq25qcll/L8ExarTDyXvX7fOaZG5tFl68gLJdBTetnjq MKknVBTea4aE68tlDj8rxc9GDQTWHTVyvkEHeJzdw9yxnvcHexiEPdBDmgVNx/uoKIDH 9L0A== X-Forwarded-Encrypted: i=1; AJvYcCWHpRkyBklJ5Fofw94OOUNKHhKU1snDjx4CEmadAMswWSHg9OKIsQMLtA/YjDCkEfiZOlQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+vexffLu/QPqxqN0K/fX8nLWNlY+XnYx6ViBcT4pENQFoBlA6 l1DLGt0kEfgzdCmssS5CbRlc5zj/RExcQ0I4fHR/jdqS+MbwpKq34lk4fdiRAOY= X-Gm-Gg: ASbGncumlId/P00v3ze1CdtiX4y6CgLEYPz4wDFyFaW6TAi8W7YXtifF1frPvUPEZ0b 6hOmO3TjTBQJdHgNinKRLE4eAvWgbuk6WAcCHNaYUyqGr4mXtPq3gBNjy5jrENdxuDwu6Lbe6mb MVUNKbZI0536D3QvT4iCHm7B/O+f5tSEUcjcwO3MXb+napVzMmv9clo9Bw32BTHoM4qnU7AfP8S nhe0461OlvjdvFNY6PeHSkHZpwZyuwifEoonZq5qUs1aMWCr3G3D905v7sWKnlo90VqIlyDF+BE ydAcJsdP7B1e4o4imJCryEHaO81lfEnJu1rmnpJ7J1h+QPVuk8lJ4Q4= X-Google-Smtp-Source: AGHT+IGj/I3RP0NPhKjXDLOwbHPd8rrkJpTvSehnV45pZ5KtPvxWJrCPU4ZqmKsKsNZoI57izw+qbw== X-Received: by 2002:a05:6300:619c:b0:1f3:323e:3743 with SMTP id adf61e73a8af0-1f5c28650c4mr5059385637.12.1741973515400; Fri, 14 Mar 2025 10:31:55 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:55 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 09/17] exec/ram_addr: remove dependency on cpu.h Date: Fri, 14 Mar 2025 10:31:31 -0700 Message-Id: <20250314173139.2122904-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Needed so compilation units including it can be common. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index e4c28fbec9b..f5d574261a3 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -20,13 +20,14 @@ #define RAM_ADDR_H #ifndef CONFIG_USER_ONLY -#include "cpu.h" #include "system/xen.h" #include "system/tcg.h" #include "exec/cputlb.h" #include "exec/ramlist.h" #include "exec/ramblock.h" #include "exec/exec-all.h" +#include "exec/memory.h" +#include "exec/target_page.h" #include "qemu/rcu.h" #include "exec/hwaddr.h" From patchwork Fri Mar 14 17:31:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017240 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C4C4204F7F for ; Fri, 14 Mar 2025 17:31:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973518; cv=none; b=tQDKtiWHpDhypD7SrAmk5LpZuMOHmkgaR5PIEwbGJrcYxzungF00aroRjPkGjgUsBeXvGhNmSX+F3z4mo6qJbTt1caLv7VR6nPYLeELvghAHhbr4nWEZ5GumXE4x0/78AxRN+quMjyFPCqHbZLEtb08FKPbaW8mowUbJSmpc8q4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973518; c=relaxed/simple; bh=eZxW1HUQDLqOK64QD3ZvyFTEod5DwQVKTFd8dmVQepY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Qhc+dqAFmDPa/+wNa2kD+h3FfBGS8VjJIbK8YNghb2PYQKrVvxjtGG1Lh3BQZumv2VowbLmxH5vI31KH4EIJF2dd2X4GigkgsYswj8AmMo/CiXoIrZ3Ob9Q0Ro3Ol85KLKEAwoqsMAzzKoLxXhWiTa0foQQc/TBBvuq1nnFAqF8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=AYna/S9H; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="AYna/S9H" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-224191d92e4so49004175ad.3 for ; Fri, 14 Mar 2025 10:31:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973516; x=1742578316; darn=vger.kernel.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=AYna/S9Hv0ML3+/PA7OOwPxnpzcF9/3f+prYuEEerbSDWje6k3r5NjTSI831Yuavvr HGGBCDRs/2P69IkateY01cqnutA4hoqYVhOvTuElT5M6awgPWCT0dpfux5H2Mx7Ev/4M VKtNSC/vcmiPpeiZAtB5DZ6HY6rgvecBUjP8EhbJsnDwIxl3bk575mYtWqdP+7K2GYWP 4KTF9v3xGuhXuGVy0W+JWNgP9awRwbXs//leKRj5iAhEUdilUDxSMLdShR3+AgPVGVVp Fm/gAD6FrdCOJ+2X1uSI9yCPdbbbsq4snqaHio/Cvkkm6iO46kjJyTMEgtG9x73B/zFq pqlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973516; x=1742578316; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BsftdeZcZ0LsVJ43Vlgc1kB7SrUHDvnjwuIeYSteybs=; b=EZ1cUalST8L+g8IOjpVIHECYW5g66EcGOSyhKeM/oTbVq4nsTWa33SClNWTwkYlXYX vWLqhoCsgtIAkj3JItbocUu5nr2LzHarrxQtnQrs8uwUe8Pi06s4bwMDinysZD6rrV/T zDcVqIDvyyHQrPidrbOOTZXRbQcRVQJG4XImJfI1cxPEOT309cankgZEHaPNPWITcbzV hgKFDc/umyqHiSkniSkOvfLXbTFSnIo1uzq4z10SjA8wsPseQFQqmMu1YTFi6HPGx3kT /RxkbYfJnfNNu+jaYFqV7OYrMIO/0MHFgAGQD8Yrh4tf9qWx5MKVkZBVKMUWfZz9EcF/ /3aw== X-Forwarded-Encrypted: i=1; AJvYcCUNRxqosAOIuVFT7c93Cp6w7ZGEXjwAeimQVmRhGMC5wrfm4ELJ/G/gG9QGqqpWxg6xw7Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yzuo5OEBxpRL8bi3r/X85nHQ3cGrm5Bn/qTYh1ITz9PsEoDtnMS nNOSPSr7y6TnQjbmkKGui4snKQyjozEelVFCeTyRRztH0bA3rIgnDJHE8Jmhc9o= X-Gm-Gg: ASbGncu+HZhrI6C02OG3Gef4WwFGKVzb97ioYZfxbTXUtJv4awoBXj55JRGFZcT5FVd kWO7qXhquUneS7jk9+wGqhbVC88qM5xx4moQL8HSwlM8jDSYShGXfD9a32oY9S01o0PuwYRUvD9 2AkJMgWtacoFOm6NFOdTQYtQvazt5VD56+xenoKGaVhhT7qJqXn2ZMiGMEEbqrGfRYzFUr1cddo Lsa5bVhBcOpD3Xp7kWMtADUFICtvnmHfSEEz4YaogOZlGRscqR8euDCFoWZP11EVtc9GcMapESS KIiGCoctjMQX5XCFJKa1FqvSqRfI1O3a6I8whHwEa1fe X-Google-Smtp-Source: AGHT+IHMleMJwhfQuIw2SImS8wKBtMic5A4ELNmhk5zJYoh3vglYg1/X+SLV/IgTuYLv0/Y4ZISJug== X-Received: by 2002:a05:6a20:1595:b0:1f5:8622:5ecd with SMTP id adf61e73a8af0-1f5c12c78aamr4816767637.32.1741973516583; Fri, 14 Mar 2025 10:31:56 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:56 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 10/17] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Fri, 14 Mar 2025 10:31:32 -0700 Message-Id: <20250314173139.2122904-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This function is used by system/physmem.c will be turn into common code in next commit. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/system/kvm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index ab17c09a551..21da3b8b052 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -210,11 +210,11 @@ bool kvm_arm_supports_user_irq(void); int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); int kvm_on_sigbus(int code, void *addr); -#ifdef COMPILING_PER_TARGET -#include "cpu.h" - void kvm_flush_coalesced_mmio_buffer(void); +#ifdef COMPILING_PER_TARGET +#include "cpu.h" + /** * kvm_update_guest_debug(): ensure KVM debug structures updated * @cs: the CPUState for this cpu From patchwork Fri Mar 14 17:31:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017241 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9130C204F94 for ; Fri, 14 Mar 2025 17:31:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973520; cv=none; b=QnjbJxvtPXjTHR+2z4mIcYK9M40ram4Y6LtFM2V0scjwUyH3Erd0LwRPULl+GaSM1rEFEvgAX5YvCAvCe/xAil5fJGFn7QqdRs7HUxaL+895ndGcwDfOLJcBcOvUapLq9DPp1cEiqW72NOO5RwExhY5A8RUCix33Kio7ohtFW5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973520; c=relaxed/simple; bh=ym8vi7HBFMN71o/ytWbPTEvymne8dwvUZJtelFdMdmA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Bx0hnwbRiHyTyviRTJjaDlZ2c3NRfYlUrtz92FeDyKCgcBxja9NWIlr1w+CX+7mvfxM+c7xCo4rTxncf4Bw8PH/K/NZZLkmFQNqH3LNxsBKfQ9KJkFfvrZZaXzxwuaTZljX5p9O0FAFDlCZ7h0m3ja6yIAgHh26kJSdfOyleQR8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=dIQ3qdXQ; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="dIQ3qdXQ" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2232aead377so53469885ad.0 for ; Fri, 14 Mar 2025 10:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973518; x=1742578318; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PABH8iZPN9WF+wJr72ZMp6Lm7i1C+9jWBJAvssLik90=; b=dIQ3qdXQFa8U8OHiPk9kGZTv8sM/aXnV2Ckn39zCF6To+CZHptgtnqyImNbhFLm1MB TdLge4dT1q8c2ZDQj3w3vbThOd8N8ur9jDgwchT2znG4fsHFSKwG6nH6nhPiBGpJ6fh8 /r7ho3qHf2XTkNT6yjjqInmaohuAciTbCFrVKrRBh6tsV/0IsepZNWTx4JU0/FGuvo13 k7dA2nDV6AdNaJiibW+YgsNZxf7Adbd/3V6PK1/rCVmkXQ2rljad8qKD2Ck7THaoKfMm eXtZK27Fz+zbBVbJsGNQOqsdYW6c9ACT6pcKvVDsj5E136QI3uae/BhvyJTnjaoneJhu mdaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973518; x=1742578318; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PABH8iZPN9WF+wJr72ZMp6Lm7i1C+9jWBJAvssLik90=; b=Uad3oCl197PlOCbu8XhcC0GOKz+GbM059jkq78U5fl+6+UAf6uqsLjkuIL/g2F0VC7 tW3SRh5IO09rGLAxa9aJ99L4zMWq2hqQ5JEhfICaJj85VeeapNLMJWehDroYIzIWIvB4 1S0PmZnXlvwSkwNw48/7WLczU4MarEthht+9sCCYUmX3QxpKj1yU0F3qNBxX9whF+KwV 2kuRATAR6ovV4b/X4VDscy+zzywwBdwwy3qaGjAzzgGljUCX5cKqJIDNK8MYH/xR0UqM h7FAQLJKtQty4MPEyIZpeEgFcpfuoH6f39Vq5FlNcdWqxNU3nAFZE30TK0YZrwZznvY3 Gzjg== X-Forwarded-Encrypted: i=1; AJvYcCUnKOQqq+g61pyTNpLuwO6YkFZEsqeleBhJG3onmBgcJalhnobU6OVghdCBreYkIgtJfo0=@vger.kernel.org X-Gm-Message-State: AOJu0YyrIZgPwh3zm2HQZc3mzUFEpRbrpJxZm62FUpd6Cmc+Zopj6iSd Ae6O6WbYQZYTp1Iusb+DrQS+PssC0KgsO9DZMhUQlJhaAeQx6gMhn+rJfmS8QnY= X-Gm-Gg: ASbGncvkYdZNXBZSeqzD8LqyNdhOS/2ZmEaf11HWBZqO8iNyRQDDfh7HLGt0yjAb4yi Tk4F/mliVJv16NmOr8Ssfs619KpYDl3J5X4RssQ2IU+gLCORkin+OjZ/vsYUZazaqHl6dJ61aDD 6kJ+hoLrSX2CyUOBuJEChjNNnJtnE23ADsVh9sbE9sqvAj44nojOWUMsPZhqolXER2KqxqSUaX4 FCwK9uGFELWKuxnYVrWUBcaUBKAgND/EeQwuUaRLOEEoPvq6q8030EvjObvtHI7o4cNy9ilZUw7 Z43mZla+ueWYNYgJhMGvUMCdJcbHUgevnfc5X3dGNYW+ X-Google-Smtp-Source: AGHT+IGnTvSqXO1fzlE+2xVmojsF7Bo5wJQ+q4TppfmkSKTjR2FsyvyfU5Ot+87AVkRJkvXuDcvBmA== X-Received: by 2002:a05:6a00:228e:b0:736:562b:9a9c with SMTP id d2e1a72fcca58-7372242d387mr4348766b3a.18.1741973517785; Fri, 14 Mar 2025 10:31:57 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:57 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 11/17] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Fri, 14 Mar 2025 10:31:33 -0700 Message-Id: <20250314173139.2122904-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index f5d574261a3..92e8708af76 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -339,7 +339,9 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, } } - xen_hvm_modified_memory(start, length); + if (xen_enabled()) { + xen_hvm_modified_memory(start, length); + } } #if !defined(_WIN32) @@ -415,7 +417,9 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, } } - xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + if (xen_enabled()) { + xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + } } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; From patchwork Fri Mar 14 17:31:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017242 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCC332054E5 for ; Fri, 14 Mar 2025 17:31:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973521; cv=none; b=iQB8wmtvEqHmA9u/5YhuvBx1x5vpQL38nZrO7SnHpUAhue6GapUDTO6YUt/+v71mb1KLdXy55qusqdMJfkIzpS+78Cpqhq+TmwqMAZ2l/u3m0mOJTS92u3/2taHpcRNEEwL6mc1GzK5dEBDBwWwaDbaYSZ2bZgrjAC/nNT2RClQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973521; c=relaxed/simple; bh=eqUIDEnU/5APjJtIqGx7rUlsYwr9cl7qn6R488WO+nY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mZzoUSdcYg0vwGN+pYNII7nQbjdRNz4Reyk3jFyD7qPqk43rwHPFK8Ecoz3sH+F0ZRKQTzBDMf3tGNE/LiYC6F5QK9hjf3hasO7VI3KLid4VQq1ChiFY9f3ilptQsxvxXzxouFwt/3KyUJeFI1pVuyoq4a3/gfcvFaQ4NPD6vgc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=K4mU9KFI; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="K4mU9KFI" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-22409077c06so62105895ad.1 for ; Fri, 14 Mar 2025 10:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973519; x=1742578319; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WZK4IDfbpcoj/UHXYNBc9hj61CH/qnmJNHrSERoWz24=; b=K4mU9KFIbL+WIcens6KH6b74ShticqlAdmuSeRQ/1icv0JPOv7CEPQO39xOnZ9ZAFg +lWhOQwAqBNw0X8RM/tv/VrdBpKz2l2/wCm3RcsQDlts1cW3AuF+zrZOoBr0W5l/CjCA KCcZ+Zdf0SfyjBrD3Gsac0htOeUQGeGl4VVVHPUqTjcqW3TzVShSgwdjuWmBAvTHwLSj LCe+pL9x+myE995romvXaWftDbNEu9elao9naS8gALOvH0MtXE0sQ9r5Owv5yFpzafQd V6SGzoG1IRd8/Jpq4Rd+2lwhZKVZM2eDrdDoE0dvsb/tWrjjCcLqZIHq5c11CABJppJe 68ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973519; x=1742578319; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WZK4IDfbpcoj/UHXYNBc9hj61CH/qnmJNHrSERoWz24=; b=AG5UeLfHubMfSValEykjBqrHqi6/oY5o09fMDsovhqKzSmIPc06zAXMm81XnDwUCMa gAp5zJKWBaTH8B+vTqY/1avburbyXOxsi83/n9aclk9kpn6OVwVNfQlSgGZRruP8xCoS K3ri0d/t4b4o6M4bodTDxRu9COovLmTJjCyKGvzhQ8B9qfmXsyqNbJ5lxIXktnb9Shor 7PMgtwpt3j3leJj+Qv8H1kCdcU11OKK82I9BevNhVZl5eNQ+Re+hxEjGbWkxFKXLRFsH 0c/RI19HZKmnUQl6fWRJjO3ikVbkR+3StkwSZd/m4cHRNNkWQBBAtYQVdoC+qVCdGUAU D0eg== X-Forwarded-Encrypted: i=1; AJvYcCUb/mT/vPfzca3JL9zWBnfj3SwPIKQ3d591DKNNQL9tIAJp5JaFBnNhtLShSeN5Z1d6Bzg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9gHtRxoSFQpgR6nFBlyoLvqhjcJQnVeKz0o8oiRedtedxKmGf gzlT2NXsZXPYRzLhdJElu7FlVsTFczTIMyxcWiOb19fwYuVQ5E/jfYMu1DNesQ0= X-Gm-Gg: ASbGnctUadMyJhAcGEzJLy3EuRRzVT6hL8uo58Vjn0onUVq84XsCwjuTq73L1c5Ghp8 slF5gZyZ6jDHs0jCR368S8oG7szo+9r68Ojzau3C3//lLt6FipaZScdGtBBzeYJpWXgEFfpWtqv jXYpX9ZiCKYzVCgGrwnKJZp/u/rkuNcuU6DEUE6eYaT6AtJnps4yugiPlLT2vYVphiqWj0xOu11 Ba+lNznKMJHITRc+/fsj3tjEaJ4yKIXp3I2zSgdOzcgvB8TNz8w+TKFsMbh6H4QggKtf0IpawEd Q22S68Gi7oEVzZQ+fsATcYpX9tnd0rhp7NpPrGfgkFl8 X-Google-Smtp-Source: AGHT+IFO+PDwMeyLa4EGhItdNdod3PivHdGg2tuOsQqj5N7me/+24tmsBkj8Jw+BltKmizpirWlssg== X-Received: by 2002:a05:6a00:b4e:b0:736:533b:f6fa with SMTP id d2e1a72fcca58-737223bf5e7mr3790179b3a.13.1741973518933; Fri, 14 Mar 2025 10:31:58 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:58 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier , Anthony PERARD Subject: [PATCH v5 12/17] hw/xen: add stubs for various functions Date: Fri, 14 Mar 2025 10:31:34 -0700 Message-Id: <20250314173139.2122904-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Those symbols are used by system/physmem.c, and are called only if xen_enabled() (which happens only if CONFIG_XEN is set and xen is available). So we can crash the stubs in case those are called, as they are linked only when CONFIG_XEN is not set. Acked-by: Richard Henderson Acked-by: Anthony PERARD Signed-off-by: Pierrick Bouvier --- hw/xen/xen_stubs.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ hw/xen/meson.build | 3 +++ 2 files changed, 54 insertions(+) create mode 100644 hw/xen/xen_stubs.c diff --git a/hw/xen/xen_stubs.c b/hw/xen/xen_stubs.c new file mode 100644 index 00000000000..5e565df3929 --- /dev/null +++ b/hw/xen/xen_stubs.c @@ -0,0 +1,51 @@ +/* + * Various stubs for xen functions + * + * Those functions are used only if xen_enabled(). This file is linked only if + * CONFIG_XEN is not set, so they should never be called. + * + * Copyright (c) 2025 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "system/xen.h" +#include "system/xen-mapcache.h" + +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) +{ + g_assert_not_reached(); +} + +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + struct MemoryRegion *mr, Error **errp) +{ + g_assert_not_reached(); +} + +bool xen_mr_is_memory(MemoryRegion *mr) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache_entry(uint8_t *buffer) +{ + g_assert_not_reached(); +} + +ram_addr_t xen_ram_addr_from_mapcache(void *ptr) +{ + g_assert_not_reached(); +} + +uint8_t *xen_map_cache(MemoryRegion *mr, + hwaddr phys_addr, + hwaddr size, + ram_addr_t ram_addr_offset, + uint8_t lock, + bool dma, + bool is_write) +{ + g_assert_not_reached(); +} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 4a486e36738..a1850e76988 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -9,6 +9,9 @@ system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files( system_ss.add(when: ['CONFIG_XEN', xen], if_true: files( 'xen-operations.c', +), +if_false: files( + 'xen_stubs.c', )) xen_specific_ss = ss.source_set() From patchwork Fri Mar 14 17:31:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017243 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C700C2054F5 for ; Fri, 14 Mar 2025 17:32:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973522; cv=none; b=s0AThKPDWhioqRK8Rw9uxUIeyXbVC+1C8rMy76i/jSigR0lCXGlMl+eLXW+043zkRBjaGO6B6gp+Cp9RIgVOcGMfaEubYCqLb6wMhfn6/JALGly1eGHOxGgNCb4h8EM6lU6pfNH9Foum7HfbHEk9UXZovfL4BEXd24zR4Qjfnxs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973522; c=relaxed/simple; bh=CzPhR8gRelKLEDtp1LKolN6jwIOO5jPAQq57RMOd2W8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Qe6cmBeSAs5eyaC4VvHyO02gLydvkpjRkUeIxXuq+9RHWu3narWmB0p2p+al2QHUJilwSp774sAc604CfAkxE/LpuFc1H/H42m3jrnhEbr1n1pE4+cxMywGYK09QJmwHzSCExdiCVPipdRcDOPazER8JwrTKa4TlzUQrOyf7Ojc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=l3epkdfE; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="l3epkdfE" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-223594b3c6dso48659685ad.2 for ; Fri, 14 Mar 2025 10:32:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973520; x=1742578320; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cOa15ppvF5kxsldjPkSIJYe5T0c824L9GaUvR3via0Q=; b=l3epkdfEFqpMcuuLKQAD5nASgMIhheMG2I8i3fjv4UNxoqMnvNBRaNVQWyVcaeO3xB fA1jTV9wWj27eWYtVSpnPlmWKz58J9J1As73YPw4OeX1GQONKh5yOBTgOlbosoI6Eqt3 TTyY4kVR7sdasOsbxX0E7towM9P/5KnXF0hfvLBs73dqSXmftDJTdmsLtU6qLC+wj81u flxjSoUdeNvirDt7ow7JqB1aydzIUiQWsbuEv4eoVsU9kSNYKV6JyQPuD1bchT/yzDv2 ZHVeiL5Gi31BlBGYxTwHLhA1I+kzSmDCUTS3xGM8YBRtR04nfcpVCBgov39rODaQDOcs MFVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973520; x=1742578320; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cOa15ppvF5kxsldjPkSIJYe5T0c824L9GaUvR3via0Q=; b=LPDLbfDcVy9w3vacWuDu+cuP8guvscThA0l4EYU/Vf8N06i8AcvS0MHxuCtPzyzpHx r3gRoca4cETKNpNVK0/y+aCCIOQS8XHSqIW7v9vcnMo5TA/lcK1CF93BcBLaDKhrdeMD tnRFETU9+qUr7f05yXJzCjvE/QvvcombQfO3j/oSB7FRo6ZRtJPt41WEupVDhRaNk7zd Wx6lEdp51y5/8gCtgcZKoobkeKWzPuhB18SHRPHMuA52CooGbRtX3UsReA5NECGyjVV4 HWiNFa2pnvH7lmDCKC1NOYBK2UjtC3ZIGnSu1WCSedOCQrjU/M8EQdyuSqjvT4ZQy1NX KxNA== X-Forwarded-Encrypted: i=1; AJvYcCXE+Y0JSJ7ZsbdrX57GLY+KjU/pg7AGD7AUWl0NkRR/mNIhUSq2UGEKtaZHgLdJJnnM9Cc=@vger.kernel.org X-Gm-Message-State: AOJu0YyraaeGQqHxrWfMBVFccNnEtX3Wm2gPDMMarxXgLEFcyUhv9/of g/MmzRXdIPCc2VGYdf8t1M2uVlRCSCyP3JGabbq+rFspHh6I8J+l62We05uo4yI= X-Gm-Gg: ASbGncu9PR1gSwvOyC79fv+9YoDVq8ugBZ74VC59VwrIEVZQ6h0DZ8XmD9Fq11DJ2xD b+z4lDDbkcgX4Nl1I5cXQScUw9NvIOZRduXmIsy1Bo3P4tu1qr4KgYrQEFJ2mxvjjwx5csuUjpb h45lfK7NVj4h1msXtt0eAsZzCB4fPdBvwvzVR4uGotJ0r5SKMD0R+miUqEpGijeOia8FZI+stOr RSN64B7o07tXWzs9AdSHkLYVEgSEgJMCQlRDQwzV7P2gZeI4Y9Jo1LdGufMgFtoyJgGIkSiIFzC PqNpKiY3cevuVkfKxMsTjnWiqDtKej0J8O/H4C+Y4Y6LOkCN2bVZUNw= X-Google-Smtp-Source: AGHT+IFlQhNJcOD04DdXfXRzIQFpLw7YnyShzSPUUYA1tOEz0vWyEbVCk22Q9xZ8telIqsQxDa+sSQ== X-Received: by 2002:a05:6a21:4a8c:b0:1f0:e42e:fb1d with SMTP id adf61e73a8af0-1f5c1326a41mr6196288637.36.1741973520104; Fri, 14 Mar 2025 10:32:00 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:31:59 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 13/17] system/physmem: compilation unit is now common to all targets Date: Fri, 14 Mar 2025 10:31:35 -0700 Message-Id: <20250314173139.2122904-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/meson.build b/system/meson.build index eec07a94513..bd82ef132e7 100644 --- a/system/meson.build +++ b/system/meson.build @@ -3,7 +3,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'ioport.c', 'globals-target.c', 'memory.c', - 'physmem.c', )]) system_ss.add(files( @@ -16,6 +15,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'physmem.c', 'qdev-monitor.c', 'qtest.c', 'rtc.c', From patchwork Fri Mar 14 17:31:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017244 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F368D2054FE for ; Fri, 14 Mar 2025 17:32:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973523; cv=none; b=cyfS3Ir/rgvZ+VBWfmEbgX4qGeH0ppYNZqEDsZaGijtUm52XDzp2qh38yIY2oEBUrf4MuvGQP+zrJkEnJok3tYMWuVnvTtrbr/N+p2vcfKfDAbxbTT/Wvpb1YvKU1KZeavMvlHNwbS6Xs/CFmMMX2GH2C8Ozdo/Ap4Rvj1pnQAw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973523; c=relaxed/simple; bh=HWCRrm0GaxX14ykibana2jy+mNovavf3Va2YjCViNUU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uS+TR1aL7oHPXtuxeS1fwdeuttygXNXbvPJYrPy1ydMChqUzCzGqBFa3txoMxEDct+cvPDTL/5hp5uR3wLXI1v/eps9To21P2e8OHErj+H51ffC7I+z7aB/b/dvgP9ZerkU0Pw6A7Pn+rj5V2gDGEHHg4jbETz6zMmIduZzipA0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Q8bzBm31; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Q8bzBm31" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2243803b776so66984465ad.0 for ; Fri, 14 Mar 2025 10:32:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973521; x=1742578321; darn=vger.kernel.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=Q8bzBm31jlvYmQqSurbPKvsKq9DwSx1C2O6J74AfDPNQS2SFxaaxoU42edYmlVtGc+ RIi3NtftAz93vlBHEbxo+nPZ9qHGh44HFam6j3e6yhk5gQkJhOAtcfqbDSLpuXXvlnvw e4X2GrscKinJ3jMpozLjUsjvtVUXPUgf7anFrI3qObyptc14zJQUlBAYuS8gfTAgFCvg 0xiOwjcsanZv+AtZYRAGGzVuzA7E7uQuUpG5YgwmuhcNoylVwLf1DVE43yjBP6ut43sk EJBrY9mC13Gvm/KcJ6oUXKJ8iA6J+ncXjTwxiqiQm6OmhzpYM08tP8k0TKlPVrVM1wfM nD/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973521; x=1742578321; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0vI16NHb2tKWbIxjnq/SoVUTdY/Lep770BkCc47k0Rc=; b=cm6MFS8KuV5gF77Slk4qlFtaOX5npPMUC7QZBUhnsczZCrbfJeoz8ASvdM8mqItfKZ OOk+izRrEJ4MKE+/yo/HVtB/6pPRjnSmgQq8tc6g5aq/i6L3tJg3gjr3gFWChbqC2vvv bmJb5N8kPO+cFZTQL+AUZ9eW8hSA33Lgbeq1SYipmC/FgXdW4Ikm+lkB5LX3JLrqwMP8 s6PJ7NapgnKuGnhi7K2ZlAmDaFjwmweHlv+k8GO3VHamFh4JMJ5LKz9P294vkvVtRfp9 d0tpp7mJK91KlqfHG+aANCOJq0AGuliVRyvllttLVErTpg35Kt7SOUZ39bhY0qJ3bm20 a/bQ== X-Forwarded-Encrypted: i=1; AJvYcCUrq5UninADUlTvoC4iU9x3vHK07FkaUcbR2tIvEr9gvR91MHvchROq593yWsY58vHZq+M=@vger.kernel.org X-Gm-Message-State: AOJu0YwStHCoRuraaNnpgcZUPeSHAkNhzscNMNQC1y1q3lHA4CXMxkRw e2ju65beb6s6/OPTs8AdPfFuJs7M4F0nubS8AKhnQH5w81Z5uQmMY2KFMwekzSE= X-Gm-Gg: ASbGnctRx3pqzGiYGd+JYnS0z/angc669FI9UQpayYSN5vm+x0Jm9lHkvm/L2wDiud7 etV/PRhzEhjzWR0HacEsVyf83IaFrv/cOWhfbBIoIUEIdJQiFHfrkKRFHttUQWyKrtKPO7w0t4f myW6qnATUJfa2AOUtw4tz48fq5eR3xeoiCMZdKSHgrQ+nQ7DBI81j7v+5WKUd/n+Pp3N70TexpE fRNMp92pv3DOHOaSFcRqQBtRoUknVEhsERixNI2O3plSyg9MAjuQy/e1gANXfuC5wmNqNTHpdxM cEOIxV0cywxOwWXC3iluJOmLfHkeQlAuCFHLnZ5nkNpo X-Google-Smtp-Source: AGHT+IG6cCxvjsVBwzL07VH+mus/++8may6iqII6GPehxKvNj4VKnHVcl4393YyfiqPTiVq1ksSu0w== X-Received: by 2002:a05:6a20:9c8d:b0:1ee:efa5:6573 with SMTP id adf61e73a8af0-1f5c113f552mr5261243637.8.1741973521265; Fri, 14 Mar 2025 10:32:01 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:32:00 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 14/17] include/exec/memory: extract devend_big_endian from devend_memop Date: Fri, 14 Mar 2025 10:31:36 -0700 Message-Id: <20250314173139.2122904-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 we'll use it in system/memory.c. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 069021ac3ff..70177304a92 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,16 +3138,22 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - bool big_endian = (end == DEVICE_NATIVE_ENDIAN - ? target_words_bigendian() - : end == DEVICE_BIG_ENDIAN); - return big_endian ? MO_BE : MO_LE; + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; } /* From patchwork Fri Mar 14 17:31:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017245 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F29CE20550D for ; Fri, 14 Mar 2025 17:32:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973524; cv=none; b=TCCqMUfMiheQ/7Y9KLCzuMLyhSWBHkhkkrWS38kvYqrtw+sO6v1V6AV3OBZB2I+1BcUTV4OUpywRUcJSSxEg0XkdOL8wNXn4C3xMNozt6hYY6kTlE0+daMUPd02jO5HDG1ZFRSnFNFQirFRBPBK0DW4bTAW5DAZg3WoFvhpbnHw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973524; c=relaxed/simple; bh=UarIdRlI7g0XIPw6CARZE3O+/eSUMq3JBtzD8zpo2Ao=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eEHXHOJjoZUeJePkq7yH9aGbP00aZIzk5SFhvKK8tdT9EWLlI/7eqvUgEJut3OLgO9oeD5AQJteiCFN7Ph+2ZdpM+yKz6MlGUxCnVGjTE13ndZQkEQnOFpoMoQFMNtcFC/E1k/eTygg/RrTLnZR1+s3Zu7ayIG1nwRE0DWIYwPw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=V5vv9LZ4; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="V5vv9LZ4" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-224100e9a5cso48995345ad.2 for ; Fri, 14 Mar 2025 10:32:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973522; x=1742578322; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ipPAyCMNYKQgJ+e1Pj22cNEjWMul6XXi9iVGdQZJ7Rc=; b=V5vv9LZ49vrOxYLK3IiuqmwkfdXjo/rdVDrGxjMBQzII5L0h7EEHvQ9jTi2weXVr6m /atVoHi0/eq0aZbQ0TBFMuPwh07rQtnpPqQSleFX2r1hmOdJYDAtz+KAG4yusIrfKNgz recSQCHjVZO7TPXGzlws4SqpKreMianbxcp4xwet4m2kMSnrO6YM4GNEYNmyjG15e8aM vlhJwEt9jW6f8tUa4c4rT049L4sLNN38KbXwmpWFNtitUbEaJ2KrkdMAPelRO7hDiO6n x0kSMiQ28tjafMHPDJxF0vVKG1u4Gxpirjmqt4oGaU34yggg6+yFIwl0HewWa+Rzt254 phfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973522; x=1742578322; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ipPAyCMNYKQgJ+e1Pj22cNEjWMul6XXi9iVGdQZJ7Rc=; b=SSMrZPgjjOUnoweKSf7yhFhCeVTznSfdChKg7R3KNB/R9rAHEoQX1CmgbA/RbY7JK+ Bpl7dJmPU1on630D0TGXPQe3B/s1JI6njXK5AYUDpFG8lI+yRlPWfZ7+cgJwwyxWELax F2cHkyeprK8aoHEPLJvWLzS8U6m1MkJzuLzpmKS0n39wNM0k3rAm9le1B+aIkm1f0HdX qyHe5YPERAuTP6qmVB6xaxaj5voS45Ef4ifIs8Ajo4u6bD/J0BaaBHPlHjc8Iy7NeBFh HftL4y3NriINGmJcxP0zNVALr4n5j8CylcKkmmkxdx8K4+ADu0hOdGsXKlIu/RUP1Mhh A/xg== X-Forwarded-Encrypted: i=1; AJvYcCVEKadW0kD7DEPVV+RY40XcfkHrG4GuUM2fTfm/39JHsJ3KYXqEBOM7g1DyWb0Ka9JLZwo=@vger.kernel.org X-Gm-Message-State: AOJu0YwPGQXWkMmy5XT6jD9Qv9B6ecUjM3bMopZYmcr7fWGTTFhEMpxH SUKm8W6F//2boJtjO/gmrhyI7iZ2ZDqEYx8Q5q4mb7acOXxAScjgUewrHxxL6lY= X-Gm-Gg: ASbGncuSiLmoa0NXfvyL1zjgjIStTQiWE5JzA+vYfMRJOmMHtvSHvxZkESrOpBqBoro USezbOd3QCsqIJ574IXOSLZok92iFfqM7exournsRVSnrIfkk5WGT28gU2WQgTkKCALF40Ovk0J 6oaPE7EQ+YS/eAVzlpwU8fgtK4rgECVHiXntiAaorNokPLREmFcQRGZpePZzk1CnjrhfW0J52W4 2UwNweAG6iEEh/REfcpn+WmvZ+gEQYF5kUU/u59TTjwhO9H9OwCKo0bNKXpRY7PEuw/wyxLlft/ yIyoLpIeEBXRwPXpllNhbBO6R4HnuxT2dBf3JXfoWMSG X-Google-Smtp-Source: AGHT+IEtHSmevJ6R5avE3bKBZZosO5sZ+P9hAoOgJtZ8OftQtbIF6mLlVq94OOMFZzJGHDBT5BJrHg== X-Received: by 2002:a05:6a21:6d88:b0:1f5:7873:3053 with SMTP id adf61e73a8af0-1f5c12ec5b1mr4773946637.29.1741973522470; Fri, 14 Mar 2025 10:32:02 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.32.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:32:02 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 15/17] include/exec/memory: move devend functions to memory-internal.h Date: Fri, 14 Mar 2025 10:31:37 -0700 Message-Id: <20250314173139.2122904-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Only system/physmem.c and system/memory.c use those functions, so we can move then to internal header. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 19 +++++++++++++++++++ include/exec/memory.h | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index b729f3b25ad..c75178a3d6b 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -43,5 +43,24 @@ void address_space_dispatch_free(AddressSpaceDispatch *d); void mtree_print_dispatch(struct AddressSpaceDispatch *d, MemoryRegion *root); + +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) +{ + QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && + DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); + + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; +} + #endif #endif diff --git a/include/exec/memory.h b/include/exec/memory.h index 70177304a92..a3bb0542bf6 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,24 +3138,6 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* returns true if end is big endian. */ -static inline bool devend_big_endian(enum device_endian end) -{ - QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && - DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - - if (end == DEVICE_NATIVE_ENDIAN) { - return target_words_bigendian(); - } - return end == DEVICE_BIG_ENDIAN; -} - -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) -{ - return devend_big_endian(end) ? MO_BE : MO_LE; -} - /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., * to manage the actual amount of memory consumed by the VM (then, the memory From patchwork Fri Mar 14 17:31:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017246 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 606E2205AA1 for ; Fri, 14 Mar 2025 17:32:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973525; cv=none; b=FB11lrHA/WkUAF5h96STwB26Y8uNRAmyp08s/upNvSmgCo5kUidQQuhulZ8J6h6qfP3Pub5d8CkGvPvocDyP5LUXmEINoVAFE4UcT313IDbEa8degu/gkgUuzdgJcwmjGxFKmjzIwh0zxJ/bxplH8d8XkmiG+tJ9pPGm7L1ZIFQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973525; c=relaxed/simple; bh=IelyUoYuqLIAw6DPSyagCvFpNJxQiv+t0JYUBox7DYg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jQYlbv2oT6s1JhVCzWOY6c0pcAgJTA8qO+wKtpJp8CcCjxAfzZCcQhLslmZqWqMReHkx4QwWMPA2Bv48rMpsxszx0OqVD56p1Kro7NHHEnez4mtVkcQh5js4VQsgitlMKVZilq/X4yZ3Oe6NjND6GyL11HEdrBPOHY3n9J+5Img= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=L89ZKHTy; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="L89ZKHTy" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-225df540edcso18254585ad.0 for ; Fri, 14 Mar 2025 10:32:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973524; x=1742578324; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EBRugwqnxw4q7Phz2P050i5IjB6Zbf1WGwdoEilqtkY=; b=L89ZKHTyQ+xy41cUL5BiN5R8Z7udAInqmSm8iqqpc8WhaUQsi8hAn+IKrZS3OkGhRY wJBO7bXrRDSgGe2yqDz5oHYP/IZFmu4C74095ml3n9C5AOYjD4G9nxzYNKTkJ3AYZwXH S/EvY1TSuT5sdNAtntzlWuhQdylO9U4+TOwNQpK9AgFqghLw7TGYJvJS3YlI34hVNp0H 5xHMNto0yYmq2Y/M6WPWVsIC7b9dbzR6VZUVlLlK4KLWTC+Y4f+cBVWKT0qqq3Wmh4hC Py6FrI92rd88hfpsYJ3IUPRfgnrlVwticpXg+c1WZ3gAJ09RQVRZPDaYRmmoxeKXsWyh 29cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973524; x=1742578324; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EBRugwqnxw4q7Phz2P050i5IjB6Zbf1WGwdoEilqtkY=; b=V/IN5eal/48xc0UwnL97G7ajFJM0KtGXf7NTshK39RATRVH4dLIFZrw9mi+rKiRTbV pIxwi3rNZVnrDs/xOtWbnU559b1z9tkJuWnAODGNucsWnGsC/5ZCZ3GsuxQQ0MS3crLD kp5duooyx7+FRRXI0KDSQ9L0Pa+OgAS7n35eccCR48qMq57SOlVNv37gkhTa1UuwZVDs 4c6By7HK9eGx2//Xt2CNv2FlzY05bM+pkt0cKdkhamDKQ8b//ZZDJ+ax9JCTzB/V2fUF QFZFREc1nV1aQrJmU8IPZJkWPUtRzcImceuOVH/pe2nYK0vdOQceGkiyMoiDOMlPJnax 5ofQ== X-Forwarded-Encrypted: i=1; AJvYcCVQLhmlqbabJfz4KefYE+zXhqe95u4OSsqVqOHRG53g7Op+05LUTT/CJ77mHkdU9NKDPyk=@vger.kernel.org X-Gm-Message-State: AOJu0YyqWoVd3QUdnr+ERjDjlLRz9mMeCxClqNdotrQTbPkmGdtpvNr1 dSYLIgG+UEVZHwi/vHZOz5KYB3mmOVejZTzg1+5xWJbq2KG6NVqW1CAq2Q0okxw= X-Gm-Gg: ASbGncuuzJGV/Sp2M3/RWHGkB+qE79yz8KKz8CFHPF9DT/I5t1HPpNQxx5b4KBL8wz2 egrJZr5zex6CkjBYGHY0PYHWgEdO8nyneAVdRPXRIGGJ+tVP0pQ7cG/EQ58gIyDHpbiEJXWD/wE YsuLKPhkJIiwVD3fXlMwh8SBCtEFgGhQJhyn0tKBU0NvigP+YbH9Is4ADNsfJE/zzxWjI9F6xvX kHKLVPNZ+aoJzS0eb3RLMf+2Fnwn4CL9x8auKBYegzeJZImBzmLfw+zcEqTMcV8I32D1aUfuYBI sjofytQOWRR9J/0T78Co5KNzY++oJ0k3oC8vwQNKjiHfeivipa6c1Q8= X-Google-Smtp-Source: AGHT+IFTScYSX7clzsDQUywbpsrF2iPQsXcqATUvOkRpCep5DuIqTnkqpSfhY4o7FVAe26d7sGjRdg== X-Received: by 2002:a05:6a21:1583:b0:1e1:a449:ff71 with SMTP id adf61e73a8af0-1f5c279ef94mr4638551637.1.1741973523678; Fri, 14 Mar 2025 10:32:03 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.32.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:32:03 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 16/17] system/memory: make compilation unit common Date: Fri, 14 Mar 2025 10:31:38 -0700 Message-Id: <20250314173139.2122904-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/memory.c | 17 +++++------------ system/meson.build | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/system/memory.c b/system/memory.c index 4c829793a0a..eddd21a6cdb 100644 --- a/system/memory.c +++ b/system/memory.c @@ -353,15 +353,6 @@ static void flatview_simplify(FlatView *view) } } -static bool memory_region_big_endian(MemoryRegion *mr) -{ -#if TARGET_BIG_ENDIAN - return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; -#else - return mr->ops->endianness == DEVICE_BIG_ENDIAN; -#endif -} - static void adjust_endianness(MemoryRegion *mr, uint64_t *data, MemOp op) { if ((op & MO_BSWAP) != devend_memop(mr->ops->endianness)) { @@ -563,7 +554,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr, /* FIXME: support unaligned access? */ access_size = MAX(MIN(size, access_size_max), access_size_min); access_mask = MAKE_64BIT_MASK(0, access_size * 8); - if (memory_region_big_endian(mr)) { + if (devend_big_endian(mr->ops->endianness)) { for (i = 0; i < size; i += access_size) { r |= access_fn(mr, addr + i, value, access_size, (size - access_size - i) * 8, access_mask, attrs); @@ -2584,7 +2575,8 @@ void memory_region_add_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { @@ -2619,7 +2611,8 @@ void memory_region_del_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { diff --git a/system/meson.build b/system/meson.build index bd82ef132e7..4f44b78df31 100644 --- a/system/meson.build +++ b/system/meson.build @@ -2,7 +2,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'globals-target.c', - 'memory.c', )]) system_ss.add(files( @@ -15,6 +14,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'memory.c', 'physmem.c', 'qdev-monitor.c', 'qtest.c', From patchwork Fri Mar 14 17:31:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14017247 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CABA205AAC for ; Fri, 14 Mar 2025 17:32:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973526; cv=none; b=qC2+W0QlgX8UOQ5JnhbxKPgCQwU7C/Qsem2WkxswxvQW61NfbXDzq4hFvAeWpq0QEy9Bp5zHO/N7ar7VPTpQn7Eip9LemxaC1UZFqSen6CxyOdT+BAE/QimQ0tXzC2KFt5PS1oLv6tvY6ylxa6eTkqv4s+HMPr/FrBDnhMARlnM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741973526; c=relaxed/simple; bh=8cc5k/dBJ8A5yXdLs7/Et5ghEBM8BXgwEWxHnVDm94A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=n/vzfK1i1SBCD1lV20r67n/SmgSgFFHU5yA+jqvU9BCGOFOihoE5PWlSsb6p0XhbpcJPApO4gATEAQd7mnaODsGrUJz7Ct0lD8N9iBukPeSU3yBmwol1iUL4LXhbYAkGHyLG2o601Tk5XsIJcqY882JSBHZsQjP+5R7OuGLuF5c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=eSGFr3Sh; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="eSGFr3Sh" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-219f8263ae0so42502515ad.0 for ; Fri, 14 Mar 2025 10:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741973525; x=1742578325; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pdsNHldr91xnqdGHk1DTLXuYnmkD/cCe/HKmA2EoKL4=; b=eSGFr3ShLRdZlAx7spXqQneFZtWnU6H0Kelsafd+f6pxw5IQmHREzw8+YnE51L1eBj 02R1usCY+WcZ59aE5Uet0CMU8MxqsomA2yuKh0tE3TGcKMDaq/e3hQY+VMHgywV8kLQ4 qG1bqaqHugJ3Anb3BBx+41wl1I80kevuQNXuuuUAMbyE8Z89QXaBfKHlxBpe8sHDJWfE 1IwjcQ0nKWRy3mWjO3ALLNPc/On426wQqFeY3qeCDYEhmHP0s3n7HokBR1Owi3TEVehN BV8a8inThlRQGXfcAh7jDoCwr81iOxUC4OGDr3ibQ/Sp4nmO9ifFbWZPlwmaQ9RQoARV u1fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973525; x=1742578325; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pdsNHldr91xnqdGHk1DTLXuYnmkD/cCe/HKmA2EoKL4=; b=tcSVQZOx4hBlUS+iUySC0mCu6mNQYpeRP+0KJ/mTpDoGhY1nfrg0KrvaPjylqQn3al gkPj4So7jTgDJSBSYQPdRi0K4ABiTpfh0knxBSlKA6Ozk0Aomo0OqjRsyjb4IiAAzBBI biMy0OVrCFh6vW13j4srfOds78toQg5vAmzzjhpJ69wbhz3Two3FZMpTnF+ikRYC0Ymg WAtkXpTRVta6S9OJv7aOKH7rhvbgOHw62dAOhTWNcYPNXVeNDysu7VUT9dPcDzH5THtg L0V7NNAp8LY+xbvetP5uH2ipkh0nwT9G3VH2nBjwUc3oUTPU7KOF0UkH2Ua7jKFPZI3d F7Gw== X-Forwarded-Encrypted: i=1; AJvYcCVb4D7Ne6Gdd7Mn3CEZ81MeigQO7hE84lK0vq9DE/yPkhTU4PXOjLHmQmRK9WQMnI/kBPA=@vger.kernel.org X-Gm-Message-State: AOJu0YyM8DfaoNBNoLX1wgtgkMKwus1yuJyjhLhdtm5iNdpkdTez2vI3 KSr8Y/Z2VQbe+07z558yVQ2q8it0uEJzxkJBy81C9RB2D+vkYa3A0TrDde/ncLY= X-Gm-Gg: ASbGncufpisTcxHL5IBma+KpuaXJCopZSdFvcPl7BJmZpRvAlZWgQfj25bAaoYmk+/U 0KgDWwMfob7L6yaDLjrxlYWUw4r7sCxl3DM6RLitqtT2XT9JeLYLR/Rk4z3+4VmmJFRUIutB3Fo +VhcoS56D4gmawkkNXCrTRNbvdGOeeDMq4nybvBF2oIW7GjhzHbGMVxPWPjKoXJ9EQzo9IQZS+o O3r/1qV4GB9RGlkuZDs3a79gMrapdzq9AG/Hp1WCHBjILzYG0mWtoHAZngqy+Ey612sjF4lDYJ9 KY52G/MtFP83oqQHqrQoH/ejejSoRzBu/rg80IAphP0z X-Google-Smtp-Source: AGHT+IHKE9NhNFaDqc44peROMWsjYJioKgZvs6KA5f3lAVTw3ISh5g4Lmu4Vqxy0jtgBCp9rXQffRQ== X-Received: by 2002:a05:6a21:1f81:b0:1f5:75a9:5257 with SMTP id adf61e73a8af0-1f5c1174fd0mr5240657637.13.1741973524846; Fri, 14 Mar 2025 10:32:04 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af56e9cd03bsm2990529a12.8.2025.03.14.10.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:32:04 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Yoshinori Sato , Paul Durrant , Peter Xu , alex.bennee@linaro.org, Harsh Prateek Bora , David Hildenbrand , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Richard Henderson , "Edgar E. Iglesias" , Liu Zhiwei , Nicholas Piggin , Daniel Henrique Barboza , qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Palmer Dabbelt , Anthony PERARD , kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Stefano Stabellini , Paolo Bonzini , Weiwei Li , Pierrick Bouvier Subject: [PATCH v5 17/17] system/ioport: make compilation unit common Date: Fri, 14 Mar 2025 10:31:39 -0700 Message-Id: <20250314173139.2122904-18-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> References: <20250314173139.2122904-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/ioport.c | 1 - system/meson.build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/system/ioport.c b/system/ioport.c index 55c2a752396..89daae9d602 100644 --- a/system/ioport.c +++ b/system/ioport.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "cpu.h" #include "exec/ioport.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/system/meson.build b/system/meson.build index 4f44b78df31..063301c3ad0 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,6 +1,5 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', - 'ioport.c', 'globals-target.c', )]) @@ -13,6 +12,7 @@ system_ss.add(files( 'dirtylimit.c', 'dma-helpers.c', 'globals.c', + 'ioport.c', 'memory_mapping.c', 'memory.c', 'physmem.c',