From patchwork Tue Mar 11 04:08:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011087 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 3CC9D1EB5D8 for ; Tue, 11 Mar 2025 04:08:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666140; cv=none; b=ATL4IpLRk6K7hOLhCVod8NHeNoPX/FrrNBxoOQ8wwxRoSmUSek32Y6wX+pP3/+V8yyppOaGpF190SQ1CH4TLytwZsIqSULCWC4GqfejATdBNYF65akz7WBvutGXLv8w9jqjD1HdgEu4qi1EC9y0q+EbmvWwhsgt0kpwi6joTr3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666140; c=relaxed/simple; bh=D7kAKGSn4zAKkiSs1hQlq6vEceALs33too5mFmMr30Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kcB63VMGcHTJhbX/L9A3BtftNqql+Oz5awm+UhhWXwIxVehscCR227+0RaZIXidDlKKWywRlSxKFLMIJgdSQhsSSkMZ7BOAfGeRO1z2ZD3RmkXPb1HAtmjTFX8GytmN/KNJrdJArt9U7f4xLGytwAuQz0nxa22QVxf8sx9+lqOI= 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=LwwDaDU/; arc=none smtp.client-ip=209.85.216.45 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="LwwDaDU/" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2ff694d2d4dso7130741a91.0 for ; Mon, 10 Mar 2025 21:08:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666138; x=1742270938; 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=LwwDaDU/ePd/7NhfhWIJyqaLQ/s7jFDmNhSWjk4OnsKzScfrusP9VsSqI2iI1cr2gR j5pkKVBZQsRyFc0Kjg4fIbZRXqBUolw8pCGl0X4rKZD+7gBlNuoHDgWs9e7n4HJvRjq9 UC2fiTDcn9xrcQlYqttCgx4wMZ9Xsyvh1szVdxw8H9cOU5iq4lYgFb7iUWGCWwpO+aUV qhatBjpv0OYeGX+JlNnXyuHXoqVTmeYE7kA4+G52FHvMax2ySalJ9o90thhJJoz9/0R7 FjP0kYqDZOeDK8pveutzGWCgrQApCO+CvS1csekI4NC1xFIPDi/F6h44KTKbvebFefC5 4l0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666138; x=1742270938; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=949DeBQijWmgHqYCdDdupcSTn3rDdND8nLqwkILEwEI=; b=BwWDlHk4gbLCMNFW2fDSYeoQGufEC3XvQqQQapZ0UW+vTCv/rgkL079ZE1/W45JdoO 8MI6c9y8/a367Q3vZxzdu7+zsrsDY9ZjLsW4RHGyLYK+bWkolu6PllwZ4zHJHe2mnSUo a7Egs4OEv13UI8HdxUBk+zwCeGZKsSidNCiA1aMZ5XIKWd+3WHNfWgjsRiswlk0VjtHV cAoQIvaxL0xhr1Em+wUA11Qk1w79vhRA3GamXUcyYtLN0kAmMvkskyyvnqifY4NaFTTy FZQzaON92AXLKsuTZ/FmRAJiZyQx9ECSAxKWu8Ybv5alVIRQK9eaSk9Ri6+cF5Ap8WyV zwPA== X-Forwarded-Encrypted: i=1; AJvYcCW1YqadGRaV0IhWmBptjB+hJf8MwQJ2unhapyf/9YguSExFvYTi5QuA0zoJmH2pScU8RMQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3otXWuIaAG7zKSTI0T2kpLI5Xd9vYLhlDWN7Wp7+taKALLTn1 XS+jtoojTS6i8TrDxS/KPCtETTD+MFHP+NTH9O/E60PP3BZXv5nFL1fm4ethYnU= X-Gm-Gg: ASbGnct1Qa1TfLI/3UHRXDiVfqouTQ6JbWR+5kFTEjput9hV80WRgD/FhOkeFKt3HkK sb8ULVSlmY0aezcsJmb+5MWp1ktdnANBzb9snu1Quf6OP7TsAkkRg8g0r3tIxt7rstcwfnOH4cu qeYpfqP/j9C1VDa5g0aLMmQkRvbNJrxfcSFewkSwnP6/7Schzl+2V13yGmcYqijkgCJhVIm4OqM HKqt7LvU0F3dN3wIh4mQpCUDcd8yIrhJI9E8y7Sxeu6dH8gFbxqzUZfnRfrGzpEcPOf6RbOelJ9 YHPE8R4lN9V5p8tSrTn022gj4W/g3NPXT3usZ/c69ogE X-Google-Smtp-Source: AGHT+IEzBJ4Y504tWVEKTLiAl14rUz4i3nUGGoyaKrgK43oaArjDd5np2LA5f1JQHmiuxtYBHKlEDg== X-Received: by 2002:a05:6a21:b97:b0:1f5:889c:3cdb with SMTP id adf61e73a8af0-1f5889c6dc7mr5899820637.8.1741666138527; Mon, 10 Mar 2025 21:08:58 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:08:58 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 01/16] exec/tswap: target code can use TARGET_BIG_ENDIAN instead of target_words_bigendian() Date: Mon, 10 Mar 2025 21:08:23 -0700 Message-Id: <20250311040838.3937136-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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 Tue Mar 11 04:08:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011089 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (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 72AD11EB5DC for ; Tue, 11 Mar 2025 04:09:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666142; cv=none; b=Ii0Kow46FlrBs73BO6F40Skr40U/Om/3Mdv8KWcMlr1wnQ3aH3XQy0hAo0UOotm7GTZqbsmwlnhN9LWfhlEIQiVF+JTtU42nzQ9lAjhADCZuCNnIZgy13SMATu3KgpSwxtf5Bp1S7svbiaifwfqBH6+h8ZvbRdXcPy9AtHngcEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666142; c=relaxed/simple; bh=qQCAyHuPdZVDnIthvYxFsDITvp5nIhySPdbWtVszCSQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EjDViTfPjMS3EGGO1fggw4MPth1mtZZT1TkLmXdueUHNudU6UFvxUXnQU24e33aVwQ8w1XxtV3nZolgXqjTLh0Z1Y13+PzNyseFGcdR5rEXX0lMsyoQAZdzKUdo0sK0l5MTScr6gW2U9W5WepjWJHj7Xy1ktiexqpeZ2ltmJPuQ= 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=x46E0Bve; arc=none smtp.client-ip=209.85.214.179 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="x46E0Bve" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22435603572so52632775ad.1 for ; Mon, 10 Mar 2025 21:09:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666139; x=1742270939; 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=p9XKPWEC1FDWwfXw4amuYrHiaWnSduBZ0xkgSDXw7jg=; b=x46E0BvevzaRlV72Dnw1mbGDDjxoLdxYtsapxfF3xg/EmSyhzzlTQSvwsy/tnSJESt bNyOYGRbUGCO9qMiCtrkLVO8NJJTTZlqiUuhlo2OMHDhDeHE4Vw2LCIPRzmwkCm2Iq7s GH8JDVxCrdKR37L6kcj6cBNdiyAMGwCvzbgC1Wq4ohAfP3XsJliTFbfVdRUeHY8wrPWu vkW03VJ03hgFwWRJAny+DfA4J5EPQ2c7ImuJTTvPvlmMmt9uH7Z7zvYy5XxTSsjxT0J7 DkIzV9OD0ssLr5W/Scfe19Ev/WhIuHdNUIvYBmkahBpxNs/N58+DJEOZP3F3zoMUuuwC Bo5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666139; x=1742270939; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p9XKPWEC1FDWwfXw4amuYrHiaWnSduBZ0xkgSDXw7jg=; b=PVlfQc/mOO8BMU6hq30+mkqQLH3FE0DglST2R4qnBrNCU54unp3zRb0IpjeJuxVguT 4ri1OebWNvkcK2z8WfqVyfaVyIsmRWw3d8H1I0Dvc4I4pD2JmfW2eMP4P6r3Mk2AejIY w0W30HuoywhTChVdLIES0S8jcCp0864jB/gj3lhErXIkjs8d7KGnBDs0EU6zO74nwAnR 8++njsmsucEqKZEGTCZYRDsDVxlklhrvkchopIoQP0GH92DKhsdtDYbtf7F4LRAu02y+ 1eZ8fnoNlmS+bsKiyepyf03dunVTX3M9qzxDH7Z1ydE6tQawC/maF8/WJf9zLBPekODq VqKA== X-Forwarded-Encrypted: i=1; AJvYcCWdVJlO/QMabktLbJKxSdhnFqLf50yDyyQ74H7p/MA6GyHM6///Vk45jgPISXrkQbNNn5M=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8GPr2F3oVYK70MEVYWj5DYYavKcNmMce0mBSOSrn3JK0BB3pM juhAep9ErBJG+McbZ79vy18KFZiemwnBGOwvRc8Pvx2eyyxqlg5t2It9ZDdJbs4= X-Gm-Gg: ASbGncuP3rBScXeKy2HK0IrW0MYR7V6ri3deSi8jv+2D5Hh2B0kdkilg6fIVzGs/vED 8QGraLJePx4fQT0R1Y3ZVaowuqLZgjwXxNVhJGNBnHaa0Jz9uobGr+hh0MEKu0k2D7dtDmx+7Wp 9nB+69r84ncVXuI9AWKdL9nWBHKPHwwAvPa6oQgHepxMkV3tGlHdBOh285G1l0V2dbBUvJeNbUS +5DMHiBOL5N0FFP7ypB610dbh/PwdjKmIdDNtOGOa88DpowEMbn57tU1mz6tbYT9zYf84M2cSHm K4PGbZkQMDk4ItcH0WI6YLLv5JtCL9llQSPDbUFEUppe X-Google-Smtp-Source: AGHT+IFULxKXKLSRt6Qs0nLWBVqgQyDOkjRhSbU6XrRQVwLJue3Ph3bi7X9tYlurUTD8KJTtNJkwJQ== X-Received: by 2002:a05:6a20:2d24:b0:1f5:7007:9eb7 with SMTP id adf61e73a8af0-1f57008366dmr14192716637.37.1741666139634; Mon, 10 Mar 2025 21:08:59 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:08:59 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 02/16] exec/tswap: implement {ld,st}.*_p as functions instead of macros Date: Mon, 10 Mar 2025 21:08:24 -0700 Message-Id: <20250311040838.3937136-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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. Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 25 --------------- include/exec/tswap.h | 70 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 8cd6c00cf89..e56c064d46f 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,31 +38,6 @@ #define BSWAP_NEEDED #endif -/* Target-endianness CPU memory access functions. These fit into the - * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. - */ -#if TARGET_BIG_ENDIAN -#define lduw_p(p) lduw_be_p(p) -#define ldsw_p(p) ldsw_be_p(p) -#define ldl_p(p) ldl_be_p(p) -#define ldq_p(p) ldq_be_p(p) -#define stw_p(p, v) stw_be_p(p, v) -#define stl_p(p, v) stl_be_p(p, v) -#define stq_p(p, v) stq_be_p(p, v) -#define ldn_p(p, sz) ldn_be_p(p, sz) -#define stn_p(p, sz, v) stn_be_p(p, sz, v) -#else -#define lduw_p(p) lduw_le_p(p) -#define ldsw_p(p) ldsw_le_p(p) -#define ldl_p(p) ldl_le_p(p) -#define ldq_p(p) ldq_le_p(p) -#define stw_p(p, v) stw_le_p(p, v) -#define stl_p(p, v) stl_le_p(p, v) -#define stq_p(p, v) stq_le_p(p, v) -#define ldn_p(p, sz) ldn_le_p(p, sz) -#define stn_p(p, sz, v) stn_le_p(p, sz, v) -#endif - /* MMU memory access macros */ #if !defined(CONFIG_USER_ONLY) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index 2683da0adb7..84060a49994 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -80,4 +80,74 @@ static inline void tswap64s(uint64_t *s) } } +/* Return ld{word}_{le,be}_p following target endianness. */ +#define LOAD_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + return glue(glue(ld, word), _be_p)(args); \ + } else { \ + return glue(glue(ld, word), _le_p)(args); \ + } \ +} while (0) + +static inline int lduw_p(const void *ptr) +{ + LOAD_IMPL(uw, ptr); +} + +static inline int ldsw_p(const void *ptr) +{ + LOAD_IMPL(sw, ptr); +} + +static inline int ldl_p(const void *ptr) +{ + LOAD_IMPL(l, ptr); +} + +static inline uint64_t ldq_p(const void *ptr) +{ + LOAD_IMPL(q, ptr); +} + +static inline uint64_t ldn_p(const void *ptr, int sz) +{ + LOAD_IMPL(n, ptr, sz); +} + +#undef LOAD_IMPL + +/* Call st{word}_{le,be}_p following target endianness. */ +#define STORE_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + glue(glue(st, word), _be_p)(args); \ + } else { \ + glue(glue(st, word), _le_p)(args); \ + } \ +} while (0) + + +static inline void stw_p(void *ptr, uint16_t v) +{ + STORE_IMPL(w, ptr, v); +} + +static inline void stl_p(void *ptr, uint32_t v) +{ + STORE_IMPL(l, ptr, v); +} + +static inline void stq_p(void *ptr, uint64_t v) +{ + STORE_IMPL(q, ptr, v); +} + +static inline void stn_p(void *ptr, int sz, uint64_t v) +{ + STORE_IMPL(n, ptr, sz, v); +} + +#undef STORE_IMPL + #endif /* TSWAP_H */ From patchwork Tue Mar 11 04:08:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011090 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 6FAC61EB9F3 for ; Tue, 11 Mar 2025 04:09:01 +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=1741666143; cv=none; b=ab2aQkEE8QRdlfhPNjge/5X4r66BLE9cS3CcIxscLJyMMIQdel/osGklBv6j5rJuvMd2oJVi/eeEvYSAf+AUruzqBVnF+QTUcwyvd3SBhu5RcUWNqLhFyqolDCOa+95YsLT41P3QvG3NQldD4unelwewUwneLt35Xp8bpB+LHio= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666143; c=relaxed/simple; bh=/0PU/IUPkm50UvlUKhO8CtFr0MS+b9OlLgM4eWroEjI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rfoSvyfGvgBjbThgnYF4JGvEV62bbsbp442OZSBkHpgvjelHBhnnXRNkXR73GVuplw0CUOBmkyQl+gvgld5jZJcVkHodDsvsA7vKfHhsoF8gXfmlrDuKUFTe1wupuuNNMq50t5ZozI2xbrmWooaMPeUp6WpNwvS5x02cRBDLJ8k= 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=nhWFyd9b; 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="nhWFyd9b" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22355618fd9so91860445ad.3 for ; Mon, 10 Mar 2025 21:09:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666141; x=1742270941; 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=KTcsPgfp4qWHKI5IiGC/xRJnn7HmZtcbIn5ZIF7f/ys=; b=nhWFyd9b/JVkMKHKb9n9xYUBJ8SfMUmzdpcurIlpov/Cywxc+SR097KeB5yZqGz3GC o0gnzsixmCn9v4t/wacFI+fwbF22ZNxSy4lB84MRx5j5PVBwTQwIp8K8Vvbj5+EeQBOc 7QYV65s2cPQ6A1HkABsBoE/k3kchgcFSavnSLU4QaaNEf45M3cUepc/Mm3FN8UUPMUcV 2Wi0eBM9KfzbdbGqp9Xj7jwG3PeRiB78saISBcxsQNfgJfwhfixuj8TNIdveHEB83sDX djv136L4ilVEDHk5gCVrbzVjYNTeKx2m4z8EB7l2/+pQiyeQiJlUbwt5eBCy6k/p4RxV bEig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666141; x=1742270941; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KTcsPgfp4qWHKI5IiGC/xRJnn7HmZtcbIn5ZIF7f/ys=; b=jO04tKSvmlaS71X8m/79JcUR8Cxe/fYHn/URQC+ZHt1H8VuHYtLpMS3t0lym8ymplE 9eQOeyDRXveJz2Cw2jnVDFFicIWisfRhQJ71/pYX67ydMPWffUofcr5YxLU6dqIoKfW6 OcCcpVczXAlT3nq508sxa/m+VKct4ezC3dWVXiFN0ylKX79FCnDm46gGqLH/6g/sJvqR QltzsYkPEEJONdLfctEyIqpMjBvSfi+7uFE7jWSqEO6IEPIy/Rhormo4681ezed0gaeo w5c/J7gK/sMcQM4pSZfkWsjnAeItD8hSP78AGxhGjngaHrxKm2LRA/GYXp0HIJcDhOLK eGkg== X-Forwarded-Encrypted: i=1; AJvYcCVSpZdp1+DVYrxlagD8Z4jr+3nQ0yM5SRSE36SKTSbtq8wEz8bb5G3Xf3BCqS6tQefnIpU=@vger.kernel.org X-Gm-Message-State: AOJu0YyaAFhvdiQu/sSIg/+XFvOyITKQ5KlOul6ZtE0UJKQJUeewkipB L/J9QBW893awhKYX2KkZUGVA7ZydJYuOm2zi5OQ1m3+NWoeTgFofMU+y0FB5xH19yjFBsglggVU QxEM= X-Gm-Gg: ASbGncsc8vkucz2Av9540t+1Adm/VZrezSEOyLTMmzccex5gMH0ZmzN5VUGMEc/eTc9 cLA68R/t7Y46snh1VUse10k0J7yrMtZrCA+sJY6C2y6oQ72FBg7asqZIQDsDz1Ff7+knqVl6iWP z1uw2aLDfqyD6mzZjOZiAfgI2n3Y7CwXG+0h/8GgvecUjFbgiiCJKRBS72Lz7NedD8MD6rX+zrR t7G6fZn4RIL9CF/0qalYlkxdZFj1ClkvHBhsPQfYlrcJNP+yn5jYwUgH48SxzmjL+9qwv45rrWO pncfdPwsVKWp2MENGjbmfbSuVbNtluyag+RRzwgOwoP/Jq1iFyWSZIk= X-Google-Smtp-Source: AGHT+IFvmMV6FR9w9HRJlmca+n7Q/Lcb7qpOce3I31boqIZsCEXwR+2F1i3uigVa31tDctZYbS6W9g== X-Received: by 2002:a05:6a21:6b18:b0:1ee:c7c8:ca4 with SMTP id adf61e73a8af0-1f58cbef8a4mr4223140637.36.1741666140734; Mon, 10 Mar 2025 21:09:00 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:00 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 03/16] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Mon, 10 Mar 2025 21:08:25 -0700 Message-Id: <20250311040838.3937136-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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. Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson --- include/exec/cpu-all.h | 12 ------------ include/exec/memory_ldst.h.inc | 4 ---- 2 files changed, 16 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e56c064d46f..0e8205818a4 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -44,18 +44,6 @@ #include "exec/hwaddr.h" -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - -#define SUFFIX _cached_slow -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) { address_space_stl_notdirty(as, addr, val, diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 92ad74e9560..7270235c600 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, @@ -34,7 +33,6 @@ void glue(address_space_stl, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#else uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, @@ -63,9 +61,7 @@ void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Tue Mar 11 04:08:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011091 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 8FDB31E9B1A for ; Tue, 11 Mar 2025 04:09:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666144; cv=none; b=pjIXBU2EL/K89BfTBLrGZBSXM4ilOkd/U6bb9Ib5BVXpltR2t3skVmZKFd3ezNRGQO0xwtDYDRCWLwQHx+TjsSBH/DQCmLvIwEVwmXhmGDfMP8NV1jN1+/CEJJ3zzypx/FXkldXyUjNl5xtQKHVzSm15FxCvqUFOkHufsg9Pm1E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666144; c=relaxed/simple; bh=U3j0YvfkdFqSCbjvb9lRIX3g2cJcj6pAwUG7lv+G/Is=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NepSpMFzdclCGiT2sybltzHN1Mt8MgsecyvNBGu0oGzGJR2sNmTVC4fINexXdZr/OlcQ5552Ko7ULUE/cEAY9qE6xS+3BkC7kOj7sKHttgONhdqSWw1ZXJnuxzfR2FBFDbCe8dcyKBSu+py+hRbcznxJLaO9EupkgBDe2ZwUvOQ= 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=nkGKB+iS; arc=none smtp.client-ip=209.85.216.43 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="nkGKB+iS" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2ff087762bbso7395786a91.3 for ; Mon, 10 Mar 2025 21:09:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666142; x=1742270942; 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=GZg0/as8vJD+8Um7sy7JKxAjMVLEtPUz9ZnXYeX+5Ko=; b=nkGKB+iS8bQoxe5uS2fe/t32G5/+w2wtCRKXIhsfNRl/532wPQckVW4YmkYulLdlvq Gv/dy+JhWkFFiR9fA9qYWfvpX+VSCXV/F2FrCY5zMX2KVGXUy8zO4TvDm1slo8btrnAo tqBSCSRNppsGC8EN7kEFbfI3I5Qc+78l2H4Pyjry3gwn9rCzM/9yE6Xa8Ih1ZqWwV83K 0G0vduUfuXVQHtZSbo5mLG+H/eqLQBzUM2NmpwuQIq6zN8U73dGNJKjZTbeiWdXulPzA 1sI0B0ngfQtQTBSjcZMYkmON/e9CRJouMzQ71OEhqb5EinX2fFOszyF8i/16M6YHo04h L99g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666142; x=1742270942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GZg0/as8vJD+8Um7sy7JKxAjMVLEtPUz9ZnXYeX+5Ko=; b=pJorpA2k0xWuQlIC8E/MKoYosp42QyJtDZs76FTK1mY4iwZ/ybSFfKhz3Bdx19zvGf zmuXKFNtgJxnRtraJAtRXV92c5rEQKqGM94/rzJL/7EHBwVSvh+IpPeoO/NFgECoGw/F OsrF+fIAXhqTRZcEN7Aa5i6dfbrga/05DE2oZ2E5uFpj6snJwcKEQn/LAvpJKhMtT2bK KKfX/wY36i7bHLBJEOoCfBZxuHTXS1H/BknRysJl3T+zc0O+NSvsSxmjWjJzkDLlneAz NBNYd3YeHCLQvRMhE/6JX7ZZNm3FNkTjLzXL6QIjVgsg2e0k+PeA9h8/Tn/HhkD1jaT1 ZXkA== X-Forwarded-Encrypted: i=1; AJvYcCVoNy6MWekXCKHOxTCMcAhX8u01bB1AUTTeAYNWJBRjpTZTS4HHIjlOFwa2EjBcqGUMhEU=@vger.kernel.org X-Gm-Message-State: AOJu0YwQVHxQhYJxSEEhkmARXxynkJsI2ihsv47RsGE9FKb33OCRRKbc WnEiWHtsQBf1/u+938fkCmWE+rI70POgAmtlmD62fxctJbfdsZ85e8yVHNpW3VQ= X-Gm-Gg: ASbGncvFVLu3J+lO06X+7C1l8y8z8p1GKHfA1ldZpQV47M2TcBBHLHTCDWTiKfSFWKV IxA9vR1i2L3dZ1XuxdO33bwYCUgVISuZ8bOm0MnDCDJFJ8Vk718hqrOR3sZBfAsHSeFL09TquqU YsxWqU1sSdaLqotlRCXzwegeEexJY79iN6v0a7g4kclksmPnjIIgHW1ptXtzp4dZhdrgFrn/aSG r7H0ow09unl3WduOckn+6GizFCXHYAPJXWEolOIHwaMxrf3/Bd+OsJBt6eNoQUFdUKlbKi7C42I +3PQ2oZnR13bMcLHcD33/kyQb9RDZGTwVdiCw/oRSUhV X-Google-Smtp-Source: AGHT+IEv6pfYhMlZcVFtUT8KTCc1zYGaqiUcLOn7dx2sPDPFPmpFWZtYBaUHHMwx5Ykg9mMF6L42zQ== X-Received: by 2002:a05:6a21:7002:b0:1f5:7fcb:397d with SMTP id adf61e73a8af0-1f58cb1bea7mr3411754637.16.1741666141836; Mon, 10 Mar 2025 21:09:01 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:01 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 04/16] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Mon, 10 Mar 2025 21:08:26 -0700 Message-Id: <20250311040838.3937136-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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. Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 29 ----------------------------- include/exec/memory.h | 10 ++++++++++ include/exec/memory_ldst_phys.h.inc | 5 +---- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 0e8205818a4..902ca1f3c7b 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,35 +38,6 @@ #define BSWAP_NEEDED #endif -/* MMU memory access macros */ - -#if !defined(CONFIG_USER_ONLY) - -#include "exec/hwaddr.h" - -static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) -{ - address_space_stl_notdirty(as, addr, val, - MEMTXATTRS_UNSPECIFIED, NULL); -} - -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" - -/* Inline fast path for direct RAM access. */ -#define ENDIANNESS -#include "exec/memory_ldst_cached.h.inc" - -#define SUFFIX _cached -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" -#endif - /* page related stuff */ #include "exec/cpu-defs.h" #include "exec/target_page.h" diff --git a/include/exec/memory.h b/include/exec/memory.h index 78c4e0aec8d..ff3a06e6ced 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -21,6 +21,7 @@ #include "exec/memattrs.h" #include "exec/memop.h" #include "exec/ramlist.h" +#include "exec/tswap.h" #include "qemu/bswap.h" #include "qemu/queue.h" #include "qemu/int128.h" @@ -2732,6 +2733,12 @@ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, #define ARG1_DECL AddressSpace *as #include "exec/memory_ldst.h.inc" +static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) +{ + address_space_stl_notdirty(as, addr, val, + MEMTXATTRS_UNSPECIFIED, NULL); +} + #define SUFFIX #define ARG1 as #define ARG1_DECL AddressSpace *as @@ -2798,6 +2805,9 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache, } } +#define ENDIANNESS +#include "exec/memory_ldst_cached.h.inc" + #define ENDIANNESS _le #include "exec/memory_ldst_cached.h.inc" diff --git a/include/exec/memory_ldst_phys.h.inc b/include/exec/memory_ldst_phys.h.inc index ecd678610d1..db67de75251 100644 --- a/include/exec/memory_ldst_phys.h.inc +++ b/include/exec/memory_ldst_phys.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS static inline uint16_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw, SUFFIX)(ARG1, addr, @@ -55,7 +54,7 @@ static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val) glue(address_space_stq, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#else + static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldub, SUFFIX)(ARG1, addr, @@ -139,9 +138,7 @@ static inline void glue(stq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t va glue(address_space_stq_be, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Tue Mar 11 04:08:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011092 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 A026F1EDA12 for ; Tue, 11 Mar 2025 04:09:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666145; cv=none; b=Ul6m9sFfkllkvE81ZHUbPTtVXhYKdpLqf1dt7U/JzHUZJ9WsI1FsZ/hdAfjF6crQqqiZ/HRrQcY4SIntTFd35zhNubFYjXLhozo2ZPHkQebBj/a5b1pAg3y9L7F6YD6xIa3SIZDfkqBHfq5HRSOFGLlJnNZUozU2rKAchSMHAVY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666145; c=relaxed/simple; bh=yFFV5k6u58GmoFHWyrxMkyCvxBZP0lG+d4fsFlGzWtI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OYM2xtOy8J6QzSz0tbYJ/gs2DCC4NkiRvzJpviSWuckS5s263yyswtZ2OcOS1kN+l/YxrhPL341TzcW+yFNZ5+JamMTUEx+q6dQMPMlmzAshhQ4MX4bgwfMUsrRqSZTP482x/4w+ioISc8V8JvBbfWZr7ZSPgUEaC0gfV5F0sLg= 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=sGeHux3P; arc=none smtp.client-ip=209.85.216.49 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="sGeHux3P" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2ff797f8f1bso6645128a91.3 for ; Mon, 10 Mar 2025 21:09:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666143; x=1742270943; 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=igRm5DauylZU7kF6A9LJbRIXn+glPoGkFsEjcODvlvM=; b=sGeHux3PNUXSXyu0VWmq25ZffNkVKiKkw5ibpG4QKzaRGmB/msrJqrxt2g6bZ1ok7l cbQfwBJleVsMwpznSnjtv5jfQ47t9Cci25Q/V2NjwKede8Cl9FOrjJfy7WBbK1904hXs Qe5VDWh+MwBatrd2Y7El5eePyzwwmprgDdtRszH9yh7XsCHsvrm1roCQ9RzmRbRiEc1J Yg5mYpyuooWFukKSByjQul/H3Oh+wfy0s1AXOvElskna8Up4zItblvB9nji7lapnCb9A 2RxQYgzuuDj2a3PNHuostmVFlOncvtQTfiG7pipn6AmJ6/etyT5z6NWFjciIczPvJi/c VDdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666143; x=1742270943; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=igRm5DauylZU7kF6A9LJbRIXn+glPoGkFsEjcODvlvM=; b=AYevHxLgIRpkR6KE2fHe05tBSlrT3gWLaQG95GgYNfnhvWXqAGJeW2jZHXCQCr44h+ Rv4NF+4QSlGCDxXmV16wjnt6kSWUPXA3+noPjJx9G4Txpu1pUc9mdYU01BDIn0YleU81 Kkla62otmTCR8RQ6yK9ujgqtsyYkPIlBEhU/oeY5y3mUS6kA0jPEKRWueCPrM97CyVl0 C5lcpgBMDmO/BFLl6s0nNENcFX2Ub+QHeAEg0huL8R1hi7U45Y1CY8nIpoyN+eSS52/n qvAiBW16sACOwgFtC5LRIHtpFFHSnfrFoTbtj6wTCMkcN3lPbMl/0nsOe1AMk6lrLPgQ SdiQ== X-Forwarded-Encrypted: i=1; AJvYcCVX+ivAEDUopMbu1mIUt6K+PND2MjIBJ0H5oybfL/ON7VA4eRwMldBp37+DoHjx/kzmIZA=@vger.kernel.org X-Gm-Message-State: AOJu0YySCzmobkyhBjMbJXK9uLfzSzxxAsMHcy60MBuyZ+WGTVXGOSNl oWO7IEJyrF4bvHMIU8FsoWzwHk/pCsX7uuvFkwFPkfboY6JkqUBNOy2LLegHlYA= X-Gm-Gg: ASbGnctCXtmhM/JK1sAam9WxV7SPwe0uoJo6fgSz4Apm2pHnFSUwhYx3jLHv8CN9HZY xdci7sDSMJpamXx7i03YP13Q4MgYUgEY8GnOZ9fvjhMP8X5/0jH09gIhV1YE5FkI1qOnenq8Q/z 6UOxkENPqphqF275PMdmiL1I2zIun6Rz9PsNwoNUTFWTDAvjKbMUFDxaqMhMnpSwijEUKbGwvMN K5XUgE+PWS6SFUE5k40I9ts9YGGb1oY5pwfJWOEb0GEVLlYyn446FatmERjvTT5RwFWlOsxbujm aJ/m7MtNwiAqVxm7hq/DVl1gNvBGffrmRmoq5oR6y2j6 X-Google-Smtp-Source: AGHT+IHqGisSQCK+iGHuI44FF+Puo0WshM2hC7DuGryTfuE/I3BKO7cRhsCQCZNyA9pqBEuzvyba5w== X-Received: by 2002:a05:6a21:3a85:b0:1f3:40a9:2c36 with SMTP id adf61e73a8af0-1f58cb20502mr3303668637.10.1741666142929; Mon, 10 Mar 2025 21:09:02 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:02 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 05/16] exec/memory.h: make devend_memop "target defines" agnostic Date: Mon, 10 Mar 2025 21:08:27 -0700 Message-Id: <20250311040838.3937136-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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. Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index ff3a06e6ced..60c0fb6ccd4 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,25 +3138,17 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -#ifdef COMPILING_PER_TARGET /* enum device_endian to MemOp. */ static inline MemOp devend_memop(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); -#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN - /* Swap if non-host endianness or native (target) endianness */ - return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP; -#else - const int non_host_endianness = - DEVICE_LITTLE_ENDIAN ^ DEVICE_BIG_ENDIAN ^ DEVICE_HOST_ENDIAN; - - /* In this case, native (target) endianness needs no swap. */ - return (end == non_host_endianness) ? MO_BSWAP : 0; -#endif + bool big_endian = (end == DEVICE_NATIVE_ENDIAN + ? target_words_bigendian() + : end == DEVICE_BIG_ENDIAN); + return big_endian ? MO_BE : MO_LE; } -#endif /* COMPILING_PER_TARGET */ /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., From patchwork Tue Mar 11 04:08:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011093 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 ADF961EDA29 for ; Tue, 11 Mar 2025 04:09: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=1741666146; cv=none; b=Cum6jMHprzgQxJHyYyaq2v1sYHrV7lhPSz5osHfOjPaAKWCeQHAa73L7XWwWFB+9saz4JQIJy9/F3LZAdwqovqoBzBUdCHV2pPE/sqx7WQV1qEG+nwufbKzSHR4T5gzlZ+QdesnAgs/TrsYR+Tmh2KAtrdxVF4xup0C9D9lrWYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666146; c=relaxed/simple; bh=ZZ+AiZUTunZXOtLpOLhEBn3+u5OhZNz1tND1065eVAE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HY4K1PeFWDjGIGmajuOBEaKnbv97z7AwpGXm6E9ji6Ulcd2ojAuPERU+/XRbIsMSRyvcBeKqZAZaU0k2MvHVKVusl/qjP5zwSwcNilmMRXDreYIKzeTKNPa8mnH7l2lcBk0tM8wrTSweq2ONUv9fBwJZJPwCFHWkdwV6822Cz6U= 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=NzhR9vgL; 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="NzhR9vgL" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2255003f4c6so43108755ad.0 for ; Mon, 10 Mar 2025 21:09:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666144; x=1742270944; 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=wYUY7egDw13yHwOIShpp+yHE9Lg9eeptR3FMaPhbw5Y=; b=NzhR9vgLTUcuuF8dd/hEzEeDcU98Iloh/VYR1/KqPgsflhqm5co5wj5rZBnSnbtXna 8yjYSHCnxzD9UNoLtme0tBgzqkCGrA9TE9wl9IpW0b1HocRLE6guScY17FsoAvwgJpLu iUp2VOtiHLEgbF0SKny3rJ3DEd4XWkmZsNIqQSa1th3arI+ujXs4MVmLDxsuzM7VxQAQ SpcOaSkyDOHLlmZdpJI9dE3VYirRf7hgKF//c43/spYO6nWE5Ek+27R+z5GPToyr5kiT spZ6jp3WZS094KGtjFrGWtApYm83JuBaxBYB8//0jwIH3g+0xH99+S+9LxIt0xh/J9Vs eWSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666144; x=1742270944; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wYUY7egDw13yHwOIShpp+yHE9Lg9eeptR3FMaPhbw5Y=; b=VXhJac5nbbKDqQkxjyGtetVvSSlgRmhZ8juY+3H2pKrW5rm+DkAInFvKoi2Upom246 Lo/4OBREJA5DrNj9zvkEoPUdj+yKCSBLiAQYke7oHPndbOV+nb/b2gj0tVw6qC2/zgIy R1M/EtuYneRJr37IiuPgMC3bSfplugCqA1NBM3J4uf72eSbtVUpDm6NVn6LvE0sfnY+l N9WWrEyJvtfyDc7n3Aeo+qP8q/nlKP+FQtxtrVycQdep2PEwJcb9cblcC8B2+gb6zRxB 63CaGg4/RFwSQE7NRCsgq/jRUfgP76GHLdwte2jsGATEhgOjxJuefFCQ6Shz10OfVYcl JHmg== X-Forwarded-Encrypted: i=1; AJvYcCUajYkfbD6MsusDh4/K+OdT1E4CqIB3NSMW+T2zQTKEkZn3H7KqMpRGv5NMb/zIGCKtL+M=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/Y5c2fJMc988oUkXn3WYEBvkyNxphKA3x/IkHVvsgFOMPt3hf 2sP0iC2Cu2HFwqmxvwFlkmxRQGg7FA+M8gWr+2ruoPusT1YgFsqqOBZhz2gEarU= X-Gm-Gg: ASbGncst409+dM8xy7RBwtueo/TwLeumfbJ4EZ5G0dZcvK8QvPK8EzXsdzv5i/8mery eQi2gqXFILHbzJU+OXpaH6SKIcmigwEAVGe/pPL1R8d+CUmD9WJjTFoVd6HemukwR8reCm/b9e0 vnq5fvUUCTbv7zSN9Gr45OnLX24bxh7vX0cJFTkNG2HcBIpuqfJdiA/iU0/h9751W3GcN7Jrf69 vUzYSM4bZdtVnkYNC4Du6rd27E8exyHeENxD3wOxY/XFigbTdgCbigWIx01m353XSjstd6chZww BUk4eFbcFHtkyYM7ITBfJobU7sXu3rpanMwe9aHk0WMa X-Google-Smtp-Source: AGHT+IG1r91N/pZj/+/h4MYPAOLJfFbK6eObEmS4IiEzuC9Hkmi66055HrrfvkPljzn8i/+Wegt/7g== X-Received: by 2002:a05:6a21:4cc7:b0:1f3:36f7:c0d2 with SMTP id adf61e73a8af0-1f58cbf3befmr3240926637.41.1741666144062; Mon, 10 Mar 2025 21:09:04 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:03 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 06/16] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Mon, 10 Mar 2025 21:08:28 -0700 Message-Id: <20250311040838.3937136-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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/riscv/bitmanip_helper.c | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index a02850583bd..bc46b5570c4 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -9,6 +9,7 @@ #define TCG_TCG_OP_H #include "tcg/tcg-op-common.h" +#include "exec/target_long.h" #ifndef TARGET_LONG_BITS #error must include QEMU headers diff --git a/target/ppc/helper_regs.h b/target/ppc/helper_regs.h index 8196c1346dc..b928c2c452d 100644 --- a/target/ppc/helper_regs.h +++ b/target/ppc/helper_regs.h @@ -20,6 +20,8 @@ #ifndef HELPER_REGS_H #define HELPER_REGS_H +#include "target/ppc/cpu.h" + void hreg_swap_gpr_tgpr(CPUPPCState *env); void hreg_compute_hflags(CPUPPCState *env); void hreg_update_pmu_hflags(CPUPPCState *env); diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c index 23958c6383a..18bbb1403c6 100644 --- a/hw/ppc/spapr_nested.c +++ b/hw/ppc/spapr_nested.c @@ -2,6 +2,7 @@ #include "qemu/cutils.h" #include "exec/exec-all.h" #include "exec/cputlb.h" +#include "exec/target_long.h" #include "helper_regs.h" #include "hw/ppc/ppc.h" #include "hw/ppc/spapr.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 6faf0e3ca8b..41306fb6008 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -29,6 +29,7 @@ #include "hw/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" +#include "target/sh4/cpu.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sh7750_regs.h" diff --git a/page-vary-target.c b/page-vary-target.c index 3f81144cda8..84ddeb7c26a 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "exec/page-vary.h" -#include "exec/exec-all.h" +#include "exec/target_page.h" bool set_preferred_target_page_bits(int bits) { diff --git a/target/riscv/bitmanip_helper.c b/target/riscv/bitmanip_helper.c index b99c4a39a1f..e9c8d7f7780 100644 --- a/target/riscv/bitmanip_helper.c +++ b/target/riscv/bitmanip_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" +#include "exec/target_long.h" #include "exec/helper-proto.h" #include "tcg/tcg.h" From patchwork Tue Mar 11 04:08:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011094 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 C27811E9B1A for ; Tue, 11 Mar 2025 04:09:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666147; cv=none; b=gYsfI0n3X7GOFAWclCPVQzTzKqemaEYv1cHEbLxWeScsuuUay5gV9H5eaEeVxy/rY0/jPyUTOmneeFFw+gP/CB1h8ER52dzF1vKbdEt80r7Kc9YnucdBCUcxp27kd/Ek8omD04pqS/ENR/3cWgrnIyLBfUIXWRd5qWzxFJlx4pU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666147; c=relaxed/simple; bh=ow7d7sNoJUkhrGjcKBXehdPsLoswkA7O6GVkimqOLU8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cgyg9aRVI0zFzE3LYx94HO7pzkdcCzc3EzZkT2GMoGyTgK5z/f14+D3/zImOlX2xkM2k+yv4JnsI75+UipSnlGo7EcxnFEujoIJ7SYBZ3pgkbNKNNBQHudJ1dv7mIUYYCG4FSKNxNU4Ad8CxhvqS4eHZazuOF42+elZo12HMnIU= 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=qXpnRrrW; arc=none smtp.client-ip=209.85.214.175 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="qXpnRrrW" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2239c066347so87017795ad.2 for ; Mon, 10 Mar 2025 21:09:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666145; x=1742270945; 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=JJTMw6tkQg2gyyv9VopXfGbD8re6/gGFQNon8Npv7Ak=; b=qXpnRrrW5JUaQAK+uZIplarjc1eCafuqZc+OmzDxFfZwh01wtaptMGm+Zvt3lSMw6Q Zr0/tLcDWFALUBmZbwGu9jFgqfi9s/wLOYDKAcaJXBTXBEqT7qXTwwrCV4hDM5vQZUwi GtiGCpX9Nd6di73SvDZlIBDQXqbt+kgjkgMy7Ebpmme1ksLfaCdsYj0wGEyIsu+7+s9F hDyEI2yM7rCUF53ze6RG2X/e2B4ZIM3F+8fXoPqSHnIUqk6BdoGdgD2BGBhq7UP8Qh1e eeIWsG0yc/j6HQzTo65rC65Kh7HYTvh2+QwjotkIdsfzELfcQBpRhC9ovWEDkVRo4sRJ +tmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666145; x=1742270945; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JJTMw6tkQg2gyyv9VopXfGbD8re6/gGFQNon8Npv7Ak=; b=SHcCc60NMwPMy0X1kh/xDzs7MweISYnGtrmMlJLvhyn4ktOZPh8AuQrSTEk0iKrqjx avXVoaZgkvFGZwR5wU4owjuVxNxycpeCFm2AiIWw+kiruZIxNayJGpg3PGG90xd+tdJu 4c6YsPWw4vclFmQyHk9Bgd2Nmdkt9ftAOZ3mQjjNb/7ZIpYZBvJl+rb6YCjM8T/2h/aZ oLwyrvr9CB8rwSKXSumy6AAVqKohMRUrrmMYgfbZsRho21zBgiSw9D/M4RzxlgUcre+z QT1LtSMHC8Yfovo4FIlxny66JK2cNpVPskFomh2dimLOQ3mpH32kqu2rHgbyyzb5uJ6+ maxQ== X-Forwarded-Encrypted: i=1; AJvYcCVX8AFOS/55/RhW3M3cObswVNGhhAHLG7X6ZVbjsCaiXQlYmh9vaRvb24K0/6CSeYk3iSI=@vger.kernel.org X-Gm-Message-State: AOJu0Yz3h0Z5Jp2Sn2sizIJsHfEKMp7XmGot5eEB2zwzdDrf0AYzw9P/ rjHJ8yeREluBYZ4IgLsqcaMsUtRl9QQVAzmqWCMZaRHYxZNa41g9FuzKxaHldwo= X-Gm-Gg: ASbGncv1CufeP0oympjdPSKep6c4glcRmecyOt7aHcn/8MndkviXbS5gNiPUU8/YNMR 96NHCjvZ6BRyOrjS/vyUm5akRsjGnwJDip2hxZiC/x9Kf7qnc5nklmocc5MBcA8y8UM9KKTl5lk tVm81SLZnlUuJKOslcRPK2HudRulcvH4Z3jJeGmTl7pBFqkFOJE3Q86uMxCPpQ3u4kgx38pCixb hINiObWC7hVC1vRzo3tOMVVhwfMFepGpn1KuZDSyJ/BZUISUBykLQ+bnP3JzP/yUSh25qMeiuTu 0UlolGWpCEw398zM+T437Y5bwNZXdbKOcFtQBNcGLSpzrt3GyGnVsmE= X-Google-Smtp-Source: AGHT+IEZQz4PbmDcJ14zbyjAyAYIBXfqlvYCPkEDTZUS00hzo0yd+SRkwBCunP0Y6iJa+tBGNAcErA== X-Received: by 2002:a05:6a20:2d2c:b0:1f5:8221:d68c with SMTP id adf61e73a8af0-1f58221fee5mr8742647637.3.1741666145118; Mon, 10 Mar 2025 21:09:05 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:04 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 07/16] exec/exec-all: remove dependency on cpu.h Date: Mon, 10 Mar 2025 21:08:29 -0700 Message-Id: <20250311040838.3937136-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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/exec-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index dd5c40f2233..19b0eda44a7 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,7 +20,6 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H -#include "cpu.h" #if defined(CONFIG_USER_ONLY) #include "exec/cpu_ldst.h" #endif From patchwork Tue Mar 11 04:08:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011095 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 C18EE1EB19B for ; Tue, 11 Mar 2025 04:09:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666148; cv=none; b=LvuWhpWyBKTwxCZcsmBdS3djXpVfa4yZKDnLTciPmana5zqftYfKul4uzaooBMbb5+vnklsqypsddFSrAq1R3tCq9TYYFUjpsUz7YuXIj9ETGulun6sTz5e2YkjZ1D4SU1fPccu7uByn0Efb8vGPn9/MEPqTk9oo7TPUlpvqpVs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666148; c=relaxed/simple; bh=nP4hXHDVJqx/oRSSlzZDpBYh7vDF8y+p4rncNlqlHYo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uvgzsPlLUWgX+nmMi9Q3uRU/adU59+nkl4/XFINmPJ1EP0pA8j1lvXLA+CcJTT1dTh+zWubpZJnjtfEHay4NBajq+KdlHL8Y05VM9OmuuW8EcWN1D4IcVQmE/MC1uSzllXAQ/OJ3a0+3reW7lknO+pEq/UDZmpXdzaqT1pgg46k= 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=nHdwx2XS; arc=none smtp.client-ip=209.85.214.175 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="nHdwx2XS" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2240b4de12bso87519245ad.2 for ; Mon, 10 Mar 2025 21:09:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666146; x=1742270946; 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=S847jAMJoPTCQP5Yv6FtgKXIrkXeVt152gZ92AA3GhI=; b=nHdwx2XSWE8qeRfviIJW2cC+lJaNKd+39nvA0pGvhSNSbyj37uGSkcdtodCAUPsdRh jyxw7gmP3wKcPhQq76CnaiLBPcummYL2d6rTfy76uIRFwBHKI/UI9n4oU8WKp9W4vy2V xApIYk10HFCIe01utxFNQv5CjVkUfEMoL8myoymzySmS/CIUP+JKFjpviSNMouSY0b6g YEELjQSfVLnDVzdiXt05Y0bZ/loQsadzOJaHeNzn4d/TmjyD36+5+0vcxC16i0vGN9Tw yAa8V+95Q/9oamLjK1DEFh6QGR8S7X4wArDHrNs8cWz0CGFuW1fO9PHMp103mNHjBdek 9vpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666146; x=1742270946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S847jAMJoPTCQP5Yv6FtgKXIrkXeVt152gZ92AA3GhI=; b=kklS6dQwBMCFQbuS1bu1gnYpptI4Kh8/xYFcAbjfAnTYDEcylAQfvM3v4fpkufL3Mc p7PsSyg8d9IGrzsmZqh5h/uMmFHobfKckOhROsvWqK8795CT2Es3rgb0nF0WfncY98B8 Zz9g6D8+wLYbUxSVBNPCevhAPgPb3e1wwcW1v9FRgEac/N3qH2dsBrl8iqCdnlByk1yQ vufd6EX7rccwqFi/mlR1ltlDzQdUerFIfpRSByH08xkE5UeeZJyRiuPT/OP9aivsyP1U nIzL97BPanIXJk7MhAyLKmoWHKOqEKS7Fu0YCSrlLp0vCxqudQ8S+yAfU3fW0cJWy6ZZ STnA== X-Forwarded-Encrypted: i=1; AJvYcCVMRTrHjuuoi9wzUd29U6A2xTGq7seaQ+C4MdPaGBxqHabO2V74DxZlWJUavXGDOoyOw0k=@vger.kernel.org X-Gm-Message-State: AOJu0YyxEVuUH7ObUyki0qAs1OozChWPHBPL1bj56SoBpmyS/vWgDp72 Tw9l9uLhnF5iOtEP2Nc2BgFLjbgleJGph9JCjWKEUWdYxqashbNcx8l0Rao3g10= X-Gm-Gg: ASbGncsLvU5hrMXGQlkTXLI9DJzHkCnN+Mr2juJ8zX1V+2Ho3Q7S6U7VZ8T5cp8Oa4c Q/lo+qQZ4O1SOYAq8piMhjO+GmWwgwxjkusARj5IVvueD2vylPS8E3/I6jl6eVIZhOFYmhg53co qNORelrJKj9M4m+no1rcuST07T80UPA3JqBGx4SLCq21Psg5dx7dk/Xsv/DS4uSGtIFDxBnR65W oBWofmS4IL756/gRNLVpGbor5Ixoidw1WRkWeu5RIAKa+vsHqFhaNyCCCtIFcycsorf+ipTnARj Cj3DLfk67kGqo3uAZiWwnxMm5Q4ZbzejA9A8I1Bai+6r X-Google-Smtp-Source: AGHT+IE3Vl9B86Ve/DQiaAua/ITAo7nczT+bEsdawDqXZ5VAclVm0x5zL+4TIfw0f3xRMRf28fdfZw== X-Received: by 2002:a05:6a21:516:b0:1f5:709d:e0c6 with SMTP id adf61e73a8af0-1f5709de3e1mr11267027637.42.1741666146178; Mon, 10 Mar 2025 21:09:06 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:05 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 08/16] exec/memory-internal: remove dependency on cpu.h Date: Mon, 10 Mar 2025 21:08:30 -0700 Message-Id: <20250311040838.3937136-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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/memory-internal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 100c1237ac2..b729f3b25ad 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -20,8 +20,6 @@ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H -#include "cpu.h" - #ifndef CONFIG_USER_ONLY static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) { From patchwork Tue Mar 11 04:08:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011097 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 65AFB1EB1B4 for ; Tue, 11 Mar 2025 04:09:09 +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=1741666150; cv=none; b=DSwmcNSBJ31qIgqsSle2Y46xmDt37MdrWMfO3SbW5nNj/1M71X2NXE6bEhyhPz3RNEh8TXXTNV16fxKgPWC9CjN4Oae+jRj0Mr0kWcRKt4HkJ/5oLTWuCj+q6wTmsQSHyskeL13rxJpGZcsfxXAw9CfImxCR6XleMMBJBh0cpsI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666150; c=relaxed/simple; bh=QIQStCNyWEbmJbGI98mgn/wF6l0/5wE9kpHfnd49aRg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YX7hsnpQfpGZzMxYUr2uFd4+p+OYuMHztJcpH9pNlncGoCFhHaQDJwLdtf2/tZ27+QGAep33DkH4iFfiGZvCIDivYoghwWanS6syi5pHyU502UfEtnEaYvJdp2KZw77biET4VskO5PMsvIklwNYMgg+1vjEBK8K/Q+D4kgDfkKQ= 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=pTbD6nMG; 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="pTbD6nMG" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-225477548e1so45550835ad.0 for ; Mon, 10 Mar 2025 21:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666149; x=1742270949; 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=lSQnGpOqRDw3w//OvJparnGxlKjvigYzwQgvxmVvIU4=; b=pTbD6nMGyIS8OKs4hgQROjEmkEibEl6sRSdOjTYHydneVe3+kiDaszUnoVJzGy/aRm Qv1Wuz92XSaMVnvAwFHVkmiCC0Nay6bTmOfwM85gjbVVhLAM2AnYV6ENiJkh3FLMMMM7 OWH9x4PXrv6v4RlkPKzoSoL3evJVEqYxlMJyTrjuc40u+hd72Mve/g2EKSC+mwUuLV5w qQCmZHlCXYCRyWdPDd02yDmOrrrK9G7mC2IjwJ5qGJBlL5bP3WJe8n5BzrNObdHs1Emv cdbg7LpC+W4ouzeb5PFglK6+4QhslhWKG0Th1xTX1+OAeYjk26mOtX39y6DREApxTWMd QWug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666149; x=1742270949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lSQnGpOqRDw3w//OvJparnGxlKjvigYzwQgvxmVvIU4=; b=w/xP8EtI+Fxbx1vHKf9xCXEMCLR3DS1AKs7560fmADnQqeYzBvTVM3DnpSeR8Nc/A+ oFIQHEqoQYXdlasBnrmRkYHvlb1N/WNX/i6CR42rigbZx1jADKSGNzdQO7DtJxqTBSZ1 Rvxv2aMRuQiNCU2OBv5m6ulmS7raNVrRa4MBQsGZ7TXs5j12PijyZMJudnPe/l3foFun BEpOjL8pwVgcfshh6OUWZYoql0KKFuWgrvnPz1zSm7ct5NG93To0hW6vKZvhNw1Ga5FT aNSrjZXxzeIFgWwIc/9x7sG+G92onyU7hSMXzjIOv9ZjuWW5E7/tAwhzi9yhvMeA4tin bpbA== X-Forwarded-Encrypted: i=1; AJvYcCWe4WSscL+uAI3vCHYNHgSQD9kNoSpb76cfUQNxgrSoedmRKgZ4+bJ125YpUsO4FpTJL3Y=@vger.kernel.org X-Gm-Message-State: AOJu0YyiXD3FHdY0V79xfW7sG/hYxEBtroD7A68yPEox5rDlXiNPEP6z grwP9r/Uy59oYy8Sk1sOyNs+O1C6pAxUZ/mW8I5VKiuQei/mVITkh+LZAoTr1l8= X-Gm-Gg: ASbGncv2k7yLCKCvDke1uQAtUeRz7sO9U5R8WL69bXw22K/ttpvRTv0qhaHTF4ExikW XSYdxAAxSI0eDgj1LMLJ9mxYIPwf0Wa/rvy66iiBOrU5/SPJJ9CfjqOtenJjmlxbYgZpVtqujkw XXDXGfC2fF4dmXPdxuGDxdrlEkMVrR5TXbfY58roq8ZpXxkwNeESuRMt0d5YAE2EU84QANAbNC3 4TQ3h5Q5hlnZsrlopMZXt11DUdL27oTn8BDfPEYUU9PGnbqXYVocNgUoeNG4CZE6LLAudYGuokt vg8nG5mZkr8OG2j8DtTyJGvjfqx5AbYm5jmcfNUtlKUI0rXaSlf9aoA= X-Google-Smtp-Source: AGHT+IGAtyqJ8JwUWzZUpShXBSvpRNbrwAinE/LFxHiM0RsFVnA1TPY911KWPkY4EkoTDg/0IjRi5A== X-Received: by 2002:a05:6a00:23cb:b0:736:55ec:ea8b with SMTP id d2e1a72fcca58-736e1b3e670mr7549220b3a.24.1741666147270; Mon, 10 Mar 2025 21:09:07 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:06 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 09/16] exec/ram_addr: remove dependency on cpu.h Date: Mon, 10 Mar 2025 21:08:31 -0700 Message-Id: <20250311040838.3937136-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 3d8df4edf15..7c011fadd11 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -20,13 +20,14 @@ #define RAM_ADDR_H #ifndef CONFIG_USER_ONLY -#include "cpu.h" #include "system/xen.h" #include "system/tcg.h" #include "exec/cputlb.h" #include "exec/ramlist.h" #include "exec/ramblock.h" #include "exec/exec-all.h" +#include "exec/memory.h" +#include "exec/target_page.h" #include "qemu/rcu.h" #include "exec/hwaddr.h" From patchwork Tue Mar 11 04:08:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011096 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 1857E1EB1B2 for ; Tue, 11 Mar 2025 04:09:08 +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=1741666150; cv=none; b=FPdk/tkWnbp/iZUqUGlR8ggpt95KBP442Qfzk+V3mVH70ApDqfNNnKO/8on0bgqZi212RdA66ae7AjkvJKgVR/8qpkl7rA63xv+6uNDVgv5zrUNX7KGQLaNegYbLVgzfASuXckFdB3VxKLS1ouXK5Ya7QqdBRFEUlfM5DNMd1Ac= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666150; c=relaxed/simple; bh=eZxW1HUQDLqOK64QD3ZvyFTEod5DwQVKTFd8dmVQepY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=O3P6QEd5mgC9YJ2nsB6zWg/sMsUcw7tIZKXlUbosFqKbqaax/l3xnVrxOfUjguZp3sZVgCRH7w96CMYoIXPT8StGpY26Nh/PoeDhyTMlyXwvo/wHv1P2rp+9kKyW2n5lpgqAfppVDyJcHoPrsuICbJJ5sgTaHeI0c3hE61USqUo= 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=WggEpciq; 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="WggEpciq" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22580c9ee0aso23111045ad.2 for ; Mon, 10 Mar 2025 21:09:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666148; x=1742270948; 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=WggEpciqf1cr78kDPx6R9kzNnuFjPxHh1Xe6qqa3fVmXMtLHXqP2faqHWuslopgBjj 0As845ll82F2DkStW1BbBj22GyFxfJuKF5143gc1Cb8pW+ZnP75L7RE5HrE0qY4TyBBd XSXvnXwerXKifpECoY7+tT9TQvQo7vn5QNVMzILGVmnthCikjsCpq+tjui7JsCt/MwS9 m5KZDd5vFFGX5dMxNSH96983Omjl7h9zvhufxIP84Dn+b1agiuFTzYOFcNHLIkGtQtDO RqQYHpBywIH44RfLHTAKZuNjsGuFlopBVMrqjE4otkm12+uQgSRYWeknor3zaciOW1uW WRlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666148; x=1742270948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BsftdeZcZ0LsVJ43Vlgc1kB7SrUHDvnjwuIeYSteybs=; b=RtjKmh5GT/DWObEd/lb81rXk/6DrRJYvC0Krzrj9+WMq4nGFUvYpqJbH0hlifHR8f7 SPvgGPzqRgH6YikjjzoBv/2ZKyiaQdJbXOznAbsUPTW3tW2apuzvUYIHLAh14Rh1LQkt DMYA/rUz0fscDm7R5wTUjKAlGRtbWbzt8mpHMTzRZdKzyo5Yl+zqx7GHyegErrztgpPN 20Of8TVjRyUac+Nj9sEwJFGEJEfY5EVJ0Wl0Nm8Y/DhRuCjnNjI7sKqLU7sYltrVuyby oRJBnQAJrnK/cybxWmth8rhOkwaHOUqBMKWGbWO+OjYaUxK0EbPjsR2g1z398I3ELhUI B8Mg== X-Forwarded-Encrypted: i=1; AJvYcCX1VNdbbyxNdHxLq/sfPHT104zYUZOXEyOcp7FXiVYhJu+E0v0ComQg4+uBEuUAMAYFmYg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3xss8cIaNhRQg7i/mjV6WknLaJEV+1FjpMrYEJc7njU6XbrP0 zym7mWA+PwSKxBhpmXlK520cJPmp7ozHpCpH3CrVQM+7OXKxuL7ALSVJZSDZ8bc= X-Gm-Gg: ASbGncuMFaxC/S6f3syEpoRW4/HBVE+IvVxwGW3e4VucGOEh+5uUzu7tTdBzFbiiaCd Ii50WHfFj15JjczEYRb0NfCeW8N3aa+UWXexBWWxaOcmB1GOR6SSvbCsdYqw6baeAGG/OczWatB hWZuubSNl9yfrsfJpucLEmOK5OFLVVgmUXzKuUVgX2mnmfvEMSvSNwvDlycEH1Pv5uShW61MV/n oc4FaWVWzNOEVYxSKIqMsLNWdXwDdQ3PcVh0OFywACrVgSq2Uyhl0INujzyw7hMDzfLJODGXlnd 2NEiC5bAWT4jFLOgTJbRiztPJSR+1QqmrXpa6hE3+NvH X-Google-Smtp-Source: AGHT+IHS2PJ+/kxwhPkSsqZSy1Lcoi2dOdo4gLmR9Sx1nH5mZxTPaitClYNterYld+kjauOZ34q9lw== X-Received: by 2002:a05:6a21:164a:b0:1f5:60fb:8d9 with SMTP id adf61e73a8af0-1f560fb098fmr15311166637.33.1741666148378; Mon, 10 Mar 2025 21:09:08 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:08 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 10/16] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Mon, 10 Mar 2025 21:08:32 -0700 Message-Id: <20250311040838.3937136-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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 Tue Mar 11 04:08:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011098 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 06E771F872F for ; Tue, 11 Mar 2025 04:09:09 +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=1741666151; cv=none; b=QZXhHrujC8Ly3ufJiKcgZAaPJJj0SNfde8HKcqkXZ6B6GrSg9gnLlJS/dnIF/Jp0yASp5URKsBBYakE8VD6Kk01C5RJPa3E+fsAWoqGnaQ278vWH/DQC3omJ+TiezeI5tBEI0Z7Dq3v9J2Ui2KtAeXpyLSewh6R47b+f8EXSuH4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666151; c=relaxed/simple; bh=2EiUgDnSIr2U0DMUcevHrrz6cNF3hvjf3O5YcIT7Nyc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aMQwDRAId4BQoAgLBtjnCYLwRmpveSNRxNebbFVD47CzpoQvRWCRMNKottyYdymxiXVvj3NI1y0Hxf5hUaNdtbQ7FPOFxy8vTwxGcSN/CH9vI3B/ifnbx8aouC+hp6GrweMq59vgsP7k4E4v0JJjtFqJM95AtkZgujMW2JbOVh4= 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=c7eQtko+; 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="c7eQtko+" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-219f8263ae0so94074115ad.0 for ; Mon, 10 Mar 2025 21:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666149; x=1742270949; 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=d9PU2mUUZXceFgFF8NURkIZqXSTxuLUTW3yG3F37dHQ=; b=c7eQtko+x00xmt+LfUTmShr1gr7hOCKOyELOOj2xMBIfVRjW5mQmJ1G/uqSaC2D3Ae Wq1Gr6x4joYDCYg7DMkX8sw07AOGLoE1/dwPfm3ykdnmVklYOuJcklhiqJEsXwXfUrC4 H0Jc5NZAkqyZGbCatc+eBvhrJljJn9pcyuiw0o9mk/u4iXVxY5iQ0uLc7PcM+xQJMgTk J7kXrolg89663H11bTmWgh11G10P0jAJVWQeIw2697227mpOP+2jQcoafzSJKYOG5wsv 6Yb4pFXv8Ze0AAx8av83gjb0efTF21rAWQ+Jr94aX20GdurpetZ4UoWgATK+M3NebZdE R4+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666149; x=1742270949; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d9PU2mUUZXceFgFF8NURkIZqXSTxuLUTW3yG3F37dHQ=; b=H2OA36jvF27VznPtzV5tenKCK+Sur2+eE9QYnOV8/dsnvYpU/xWpUqd6gY9/hrbBUN S3cTljxTLH3v18yaXtO8PyvUc8Z/vlpLqFYvwqBg8WlAayVOi3Es+UkbcY4pocLoA6O1 ofNJxZ5Sh6vSZkOqOvai8NO2MnEOTfAC29Sgu1Aj18VoYIRraSJifuO4ci2BDPPJpct4 ar0TeIoDH57OKjwQtl+PXriSrvF/XM0LqG4JIcge57V71PmZPdI4ZW3A4W6BjSH0hVkD l8HVoaI/yNwikca+fXT1hG+RUal64+tdopnrn++HL46qUZgxlpBmHGOestYeLG1P41/o reOQ== X-Forwarded-Encrypted: i=1; AJvYcCVd2v5Ejk6wLqKnbs9paAycWwmuNX3Nc/BeRU4TSZ8SUL/BBuS5vXSWvFh6p/ZcqdeR+nc=@vger.kernel.org X-Gm-Message-State: AOJu0YxbEg4VbarfROkNs27uPtzdJ249HkFbBQ/t1EtmL5BLlgETLzaQ aiOdVR/GsG1680KVS4nofwQBqgjo6CJ/kan6dWJYseAGoFiD2jH/+KjRr8DQDHw= X-Gm-Gg: ASbGncsz83ByFGuWQH9BvXxnKnaqJzq7+KP1en31wJZOMwgxvuc58TwqHbDBewVSTZf URsv02o5948Hj6u78sykHCAY3TXXDeLdEkXuq/r8KkDI3yYP8wQlHYkw64QhQTQyX3B7m+M8aUu rXu1HAeGg74ST5cj2sV6ABMOVAy7SWRS39YZHc0en8anxX/Vbz381Oz2iX5qLZrCQUj11JEUEnF nuQpC8rGxceXa9IYd5HNfnDkhNBNv/ujV52uGnUrfYWe1Yly3L56nKEC1juXjsbfINDjEFXYOjv voVQDtnYUquDfal6ymTuaNMDkkuPMwk5YzU5zW20UXWgFtx6GOuraa0= X-Google-Smtp-Source: AGHT+IFhjhUd2vTxqYR3Z5nzc5K52WwhbsgB0wgjWXiu+XeofP+aLrA4dkvuyGbgnmdnOjVQzIEANg== X-Received: by 2002:a05:6a20:160c:b0:1f5:75a9:5257 with SMTP id adf61e73a8af0-1f58cb1ba63mr3462589637.13.1741666149439; Mon, 10 Mar 2025 21:09:09 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:09 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 11/16] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Mon, 10 Mar 2025 21:08:33 -0700 Message-Id: <20250311040838.3937136-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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 7c011fadd11..098fccb5835 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -342,7 +342,9 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, } } - xen_hvm_modified_memory(start, length); + if (xen_enabled()) { + xen_hvm_modified_memory(start, length); + } } #if !defined(_WIN32) @@ -418,7 +420,9 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, } } - xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + if (xen_enabled()) { + xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + } } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; From patchwork Tue Mar 11 04:08:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011099 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 4D38821421F for ; Tue, 11 Mar 2025 04:09:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666152; cv=none; b=LVjGXrLJHqTbbDcDf9j/vRjszf4bBOUX55J5ayEn37fL3Hg4sUc4TS1Bj31eoSHHIEhTsP3uA+7iBzdMDCrp+ZOnnHH19rCfODpd+PsUrV2dzFCMBN86l63f2Ueu7mPZqBhDXPG+OUigj7EwqMc/RO3K5bpXimlMSmEy01R2T/M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666152; c=relaxed/simple; bh=2BGYv29y1gAuWbOxLdSmdLhzjdPFXu3kgq+kOyRsd60=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XE4e3GSjlN7C9EFPLC0HrqCMZ4i+opt8XSfSt37c7v6JBY1bmkLkXkrvPh7iCdZY7WGRzoTII2CePn0NYd2IgNoSjBo6KZEEk0XTGHHFqo10Rls5kbU6uEp+FBQIr8php5mvFq4Cgqr7lqTqGZvvMlTYVisrcbH2oUx5RFWK1sE= 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=SEqJ0+E5; arc=none smtp.client-ip=209.85.216.43 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="SEqJ0+E5" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2ff04f36fd2so8358062a91.1 for ; Mon, 10 Mar 2025 21:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666150; x=1742270950; 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=YZcwoIie6BtZ5Bqo8BYW0CKBTK95znA0iA8YHmiy7v4=; b=SEqJ0+E5RpUIDI+bhZuTyk5LnYpMTz+Tbig1ni/+F6RusMpIddhmIJ3POvbATCIIJR quIZd6TDcDj7dTk+fi66Sd263vez8TUPNrduiF3U3SBcjJjivmLqjXoTkKMwAney7Mpl jye9CaCCsjr64SLwf3SnKdF/PYEN+krzsBQu6cF7/168bA73CgcIu47Zc5W1qZoDjSPg AcJrSbg9ATRwDp346Ic3iJl+HIuYxQeRuHn3jWEMCPzbWSjeaxBN+lF6zGQmSFVKYEjh pwb+Nh+p5swzSRj1mHgabjotby6H6EOVFJchHl2Jxz/CTVVNeuJNRFklhqCGFNYjrbsW H3fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666150; x=1742270950; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YZcwoIie6BtZ5Bqo8BYW0CKBTK95znA0iA8YHmiy7v4=; b=LYZk/9CJhDHmHKs4h2dC/1zaEY93gxAdnDNiOIRWxdijzaB9bfkOpc9wi9uSvJ+xqQ 8AXFlO4OHDAp/m8jTt/WKJavKdVKWAu8EA1wyAuJpIC52V2kn7FIy1o6GDj1vBejK0bg P2JQ/VD4JskIs0Ei7AfGA/o8lifQ53xshlz8zdK3JcV6CmAPW8ybfV4XeIuaEjG4Je0L fzwAYK+D+pdqhTBpK6YpkKYxBeN9caLU1nFDdKbYAi3iLbPt+WN8Ira7kmr1wO0NRtsp blypCkuh77PbgrEuEF1H9rgAPAeaZtV21I0pYa7sE4F7reRZyjlaxVj59tMPrts8F1w1 rRvQ== X-Forwarded-Encrypted: i=1; AJvYcCXgEaU804Eszh138p2cY7mukDUYe9ZIa1miwK5Jz2rq7ZVEafKVUx3Ki2qyyg82pdqNUVQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4asGFLpgQNOmt037Bjnm+63IeGFXXPAEp1sTFjp+5GeYLPTKY 5giTEnegb/BvUvKdLlS4tY9dq0/IhqHDmh48f1ZNcxXna4ML3e+fvwl3i155HsA= X-Gm-Gg: ASbGncvyVVK9ANPsLWqCMtXDKGa25/vKjURS9n3Ni8XE7RFO5EdagyN+IdA2+zyLELU g+SQCZwiF00C7VnZKkKl+Bj1uA3J5D+2J3K60LMc+Y6Jf1QNQlwegm+9IHlofkm3BuCdEggmlOr 6a6IpuUpMzkGiTlo8vDJIGFYSXT0PGVDlcDQkM32TTUBfHPScumZEDmXILdz/9eNotgfjzzbp7I AVSIzMpx67UEEo1RCzJqfGbLZnAhYFP7HRWiIFMGwdcIcInqT0gS1gn7UlbhOzMZXZ7PXjFtOPg bUdNhtMsKJj7FGkgsRyeCCS8Kc0+xZphg1bZTDXv3S1Z X-Google-Smtp-Source: AGHT+IHJmCe2dJrkKZuUg8Hp5UUMBrSHtlgnmpF6Gn789stb7ihIio5wxKC4BVHFee5F9pMJvA7mBw== X-Received: by 2002:a05:6a21:3941:b0:1f0:e42e:fb1d with SMTP id adf61e73a8af0-1f544c7fc7fmr33091101637.36.1741666150581; Mon, 10 Mar 2025 21:09:10 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:10 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 12/16] hw/xen: add stubs for various functions Date: Mon, 10 Mar 2025 21:08:34 -0700 Message-Id: <20250311040838.3937136-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Those functions are used by system/physmem.c, and are called only if xen is enabled (which happens only if CONFIG_XEN is not set). So we can crash in case those are called. Acked-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/xen/xen_stubs.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ hw/xen/meson.build | 3 +++ 2 files changed, 59 insertions(+) create mode 100644 hw/xen/xen_stubs.c diff --git a/hw/xen/xen_stubs.c b/hw/xen/xen_stubs.c new file mode 100644 index 00000000000..19cee84bbb4 --- /dev/null +++ b/hw/xen/xen_stubs.c @@ -0,0 +1,56 @@ +/* + * Various stubs for xen functions + * + * Those functions are used only if xen_enabled(). This file is linked only if + * CONFIG_XEN is not set, so they should never be called. + * + * Copyright (c) 2025 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "system/xen.h" +#include "system/xen-mapcache.h" + +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) +{ + g_assert_not_reached(); +} + +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + struct MemoryRegion *mr, Error **errp) +{ + g_assert_not_reached(); +} + +bool xen_mr_is_memory(MemoryRegion *mr) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache_entry(uint8_t *buffer) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache(void) +{ + g_assert_not_reached(); +} + +ram_addr_t xen_ram_addr_from_mapcache(void *ptr) +{ + g_assert_not_reached(); +} + +uint8_t *xen_map_cache(MemoryRegion *mr, + hwaddr phys_addr, + hwaddr size, + ram_addr_t ram_addr_offset, + uint8_t lock, + bool dma, + bool is_write) +{ + g_assert_not_reached(); +} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 4a486e36738..a1850e76988 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -9,6 +9,9 @@ system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files( system_ss.add(when: ['CONFIG_XEN', xen], if_true: files( 'xen-operations.c', +), +if_false: files( + 'xen_stubs.c', )) xen_specific_ss = ss.source_set() From patchwork Tue Mar 11 04:08:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011100 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 7DB0C1EB1BE for ; Tue, 11 Mar 2025 04:09:12 +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=1741666153; cv=none; b=iOMDQThipFfGxKcbRYkscZGmobWickDpRNNFLCCGkZVZfd7hqXnZx6eqtoiJ7/E5Mio5TnGkci609IRBLpV84+xRKwIalvhi80bUipit5bCXpyBrDCTPfNf/6pTa1VNGO7ChrE0fwMYBTJkyt8nHpRPLwW2XDJELMER/5vbuGkk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666153; c=relaxed/simple; bh=CPSslnXnrG3PuOzhFaRqUdFyOZWqbvTYRwMrQTpy6Y8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lWL1YjiP/x4un0439SrV3cJ5ddvV2nwvLktP7AKQe+gRrASf2FiKMw0HLbu2yY6oA5tPLoKhHuBFddZ0r/o/mmttQG80hYpIhwrtGsm5tapwoyxCszKF/Li17iopRHZd0ckRvWCqTvQAWn5iCEAED6B6K3NIw7R1eknmVrvUhFc= 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=ZR1OvrxP; 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="ZR1OvrxP" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-223fd89d036so97389255ad.1 for ; Mon, 10 Mar 2025 21:09:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666152; x=1742270952; 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=Q89mBu4b5JYOE58WB93/V2zR/jXmfpOvKMtRO3aXK0o=; b=ZR1OvrxPu/Nzx7DuWgzuDibJNsxP6egr9a7PNmcf3KPa5nhxBFn4xCeVU8ieWaDC6D 15ZgY+iaz++bcuxSxTRyBYzDrbGtM4fTZCTNZRrOYk/G54UiavyAjc1ytmjBzxKJOUcK JyBYLDknzlJXSM+Y5jfcqpNKAo67zWtNcEoCSiL5yhqmY2wXq6cwg/o4EY+R7Cagm20P jdK2BW9/LwLkCB6EFVlXa3Ke/Vh+OEG1/OYyXti4hnyX7pyMyg87ISbhUtt/qQtJMYls ktk6W1rXAKEXBNR1ySP2kJlBrvCXc0OEzqhimVuH5eTrjwKzQN941guufzxNZ0AE4xWX hEhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666152; x=1742270952; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q89mBu4b5JYOE58WB93/V2zR/jXmfpOvKMtRO3aXK0o=; b=CoCr6OxI6wKqOVPNUY4AfTe8bHzXXfFNIawsRf74AfyqtbLqbW1fP2cLnMLnW8ZFms dV4+Uv3xM9K8LXLxwO2O93X92j/bml3wwFwF7YuanZIyGPjaIE3yqnGBTFljcYW4vquy qXJpaQQq6uX8g7+Rt+tiIRtMI/+v93fpA8FrjTZCHTLo7+XTythRV0njMH+vRpM6ozSR btqLgjacUqFKIr+UVrwOxtWDxE6uzkJ/oag7Dsy7rtEVLYwGmLkZFaqNCGVy9VYn1YIN CNTdsOT/BYr/5+LtRGz+yYEkQYzoSnnWRFCWqXwtSna48WlKBqQKSOlnEHClEAoFJqev IX0w== X-Forwarded-Encrypted: i=1; AJvYcCUuAoD3/DIBcf9VepH71liXzeKml8il84FJfubw8ge4hZlFdGUapbwSD4TUa7xRHLbQ0rk=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4ceoSqu3L3RffgDM5SA6cEqSOM1J6+I7ImopzYU+25tlXTIA0 xPUH6gkY/LYRgMFr18cizkrYB2+wgYXwFIHd3ISN29SH4hSLSJhPDSLk6o65wFs= X-Gm-Gg: ASbGncsi02pVL7+xPU99XEefls/BvCdQRvKZLSe0WcsJqaC0yx8a82VwKdx16IeEky0 PSsk4D2WU6tV3HCWIDdzwZ1S3QKM6Mg0yJiS3Osxbh27wdAR8/VU7RVe4L7uicKSbD/BR7Yi38p mLD8Zz6YDxZ5hJaP8IAJdF6Fq4PbvHgD7lNhI4dBG8GRk55SV00apk8PG0+UDWlNb+r48IGGgsN uo8w0Syxx0D3IMNYkKvZbBbKzbtTXAMgFWqA1GvVeoiiOXqtA+xKsuSKlQaQe4ex9x41tpRzZS0 p/e0vt5JSDgiJEuI1ynlE0H8wSZDvq3hUiI8y6hSM66Y X-Google-Smtp-Source: AGHT+IE7G7QimFDknOZtg96uV2bamM0fTFqFZY88Y5t1E8IfrTFu2U6cjPQap3/Vq7WYgH3pY/scbA== X-Received: by 2002:a05:6a21:3944:b0:1f3:321b:4f8b with SMTP id adf61e73a8af0-1f544b190edmr25270834637.19.1741666151748; Mon, 10 Mar 2025 21:09:11 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:11 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 13/16] system/physmem: compilation unit is now common to all targets Date: Mon, 10 Mar 2025 21:08:35 -0700 Message-Id: <20250311040838.3937136-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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 c83d80fa248..9d0b0122e54 100644 --- a/system/meson.build +++ b/system/meson.build @@ -2,7 +2,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'memory.c', - 'physmem.c', )]) system_ss.add(files( @@ -15,6 +14,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'physmem.c', 'qdev-monitor.c', 'qtest.c', 'rtc.c', From patchwork Tue Mar 11 04:08:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011101 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 94399221554 for ; Tue, 11 Mar 2025 04:09:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666155; cv=none; b=n1ZsxGfVmQyNiQLlq7RqdOMAFtQEaNd5vq6UmG8mG09EJIPKRTzX1W+wExOvVA9CPXZ5M23Qzv9LCnUtH3L2NbgU0OSkPttB4Vd538Sb0JKP2hjADgirGodhCEbVp9pDzEYO++0WTivQFrCTF1A7UcipYNLVLgYCJudIhC5qCs4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666155; c=relaxed/simple; bh=GpHc/7gbu8WRAFUJRiCsLUN6noN1HCb2LT8LwfgVre8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oMQEMll9pfo/nYqt8w0ixd/3hvJfROMvctRPGsRy9F6oDYizrcxAC7tGBlrZFyhT3ZqjI9KA/pql8ytyePKeptrVfGdOR3/KE6blCBmBZr+6zxCej/vINLoy+wZ8mUxUPBuni7PrSZPWqoKlkEh72wtUoVn9rgzUkQGZGuh4zH0= 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=nK1Guq36; arc=none smtp.client-ip=209.85.216.53 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="nK1Guq36" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2fa8ada6662so10526050a91.1 for ; Mon, 10 Mar 2025 21:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666153; x=1742270953; 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=LEAQ9wvxViIwfRRF7MZBxVkXSE0tKicEinIFunB945A=; b=nK1Guq36HVXvpHIQ87xNAzeczKtAQQfAxGh2Qt0ChAIAjI4dq0tR+jy+MGqWP3wPol 3Z4KN302HkX6lONN8AO50iAZLDPsD5XSygt/wRRLAMgK8VmrmJF7KDNBG/hQzSqrjkJJ wsZ7x3dSXsUD7JE75Vx62dhNu4ue9ZhT/XZaqHzIOKPyda66iV7XRBJaNMjs+8GlGLqj URcKIJLW2RS4i6xTS292gisWBGG3vaED+GGBueneYSA/ScV6evvVaT3+LQjmG7WxHqTV 4lnQTWUrxqyuubiDPHiDPK6/EkWqjcY7D3IHrzgYIug/EbhEfbD43Lx3+raf1VNQQRm5 EQiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666153; x=1742270953; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LEAQ9wvxViIwfRRF7MZBxVkXSE0tKicEinIFunB945A=; b=Q9nisukk10uTUJ7+xiLu0Aom0ZU/26G+jonVB4pQW22fClpdE27i7FQ6X3n9zBsTPW eo61aa6o4YcCTNkZMrztycrdPMnWhJlsWJP1r2Crjw3ti8wZBkYoFkAWchLddlWuGbDX EJDzqRlGmWt2X3gzxflGPgYJiDniRwqjtt61m+thMoOu7gqRTB7pHUPEAwvKa4vzcpP+ qAmg3se55GgOqWN4wKyciA/IxLgf0wk3/83KO5cXJMbc+t6XG08KGyz78xUEm5tKp9f7 LLib7Bzjh6+EEqcbyHT5i+Qljw2JkxZnbI0aXfm03PLeF+lJMdQzXndiNL3PVL65rrzI oxLw== X-Forwarded-Encrypted: i=1; AJvYcCVwbS+Gd5yk+E2Un8KOQKmqxzWRgC14ITiaeD1CK7hF1dJD4TKoNOvvQ4QWPYp7ja338e8=@vger.kernel.org X-Gm-Message-State: AOJu0YwgvrixpURe5dNuHqnj92vxnCMn5aWQt/tStlvQZFPr4+nGEoyX hoF8wdoPLnhAWDz+ISIdLtG0yrb8kPhrOTaju8WdMCyq+JcjH0V/qqevE0XAszc= X-Gm-Gg: ASbGnctVrxe72R40BBi1Jgs2BKvyXtUMz6U7dwIZbD+hmicw435LO9J7TxO4hR9rkjj eHQw2K7Y+ww0hbeRpNLQDDlLF7QZBz2riLGrC/GCmhNC5r+mfvqzhmKojfrAnPrEwAV4DMxlIwe 1BPMH9oipMd7JpdFEoHKLWNb03FS5AF2eCdzFO7wBjAaP9h+rs+XP+sF2jr3jpUgK4Ca36TAkMq 0U1Wv63HywjlyQjX8xf4uuGYz+fRSmqQxIhytm2JZ5wSseCdp2FLbQ0zDZjiKLcy15zslT4tAyL bbcFnKHuyagmM6FBLAYuYMjF71TzvUhE8ydp9nyqx5Js X-Google-Smtp-Source: AGHT+IEEBIqVh4ZJ8rHFVsra/zLBqrrO/2Z7wqCz/tbRxr6Sh6SkveOkvqyI/KznC/OO1HDpbbusNw== X-Received: by 2002:a05:6a21:4d17:b0:1f5:6e71:e55 with SMTP id adf61e73a8af0-1f56e71100cmr14244196637.6.1741666152825; Mon, 10 Mar 2025 21:09:12 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:12 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 14/16] include/exec/memory: extract devend_big_endian from devend_memop Date: Mon, 10 Mar 2025 21:08:36 -0700 Message-Id: <20250311040838.3937136-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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. Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 60c0fb6ccd4..57661283684 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,16 +3138,22 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - bool big_endian = (end == DEVICE_NATIVE_ENDIAN - ? target_words_bigendian() - : end == DEVICE_BIG_ENDIAN); - return big_endian ? MO_BE : MO_LE; + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; } /* From patchwork Tue Mar 11 04:08:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011102 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 A73DF1EB9E5 for ; Tue, 11 Mar 2025 04:09:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666158; cv=none; b=jcaIHH7MWQ53LzX04VX7USJLWyo7MQNrExGHpFIAkUGUJ6EMjixx95+y1L01JpRjfafUfD2FvIVdHaJqOmI7R7lBsikuCVn9gwdg7+yuACdPI9/jN331tEUy4E8RXdIEE8ySv/lh+ekdmflyY6zJYFu7mKgpdk9ZudaNmXgQ63s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666158; c=relaxed/simple; bh=V7caGdwpPvVcMTz4Ryr0C3nFSPGFRfnlil4NUl3Djzk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Fm602FmOvm5Y+tpDF2XavCMmpAsvKjm7B3F8FWbSig7oeJM/15tvm8EzbWEAH5wiH2s2oVNopzJ2EhnIaSkqryDzsdiqWcOT4AEzJ4OSs8D+1S7kKjVtEwoqqhgb/19mwjx9ActY9itNwP+RX7TGGIhh6hy84m004MhDWMy+pHc= 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=EggGCey/; arc=none smtp.client-ip=209.85.216.50 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="EggGCey/" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2ff4a4f901fso7397719a91.2 for ; Mon, 10 Mar 2025 21:09:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666154; x=1742270954; 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=v3CzVNwffqVfXfk4NE2Z+/4EFEG8FprDV2OFnBt+VLQ=; b=EggGCey/UZKA2NU5GcU6KXeOqcoi/hTxo2/RkgVIpub5vzvQXAru99l2v2PlJgBXIb pYsA+HS5rQPqUokJJy4pzm5ywhSeF+BRhuSMSs3XQXyh1bPtAb/TgXoZO05yI3Cg+5um u6k+75jF2zIM60BZevJTPR/J5JGA00cRi0+B/pmBBT4S7mmPq4K2mSH46Cao7gUFtCa/ 0kaYZj2EjKA4Q465AYXmP/aYVjFeg6laf4qvqsrwDZJmOtuL6UqYQHtzZYX8aKrxIRMt 2KxMn+v6z8CZp6ULnXrtk2YZrdVMCdn3DqhIQSf3cq1go9BXvmOGDsiao2rNVyX6wHtZ qoCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666154; x=1742270954; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v3CzVNwffqVfXfk4NE2Z+/4EFEG8FprDV2OFnBt+VLQ=; b=hQEd796zfLIuuzAirl+/+LI78tn1j96nrxY6SreHdagAS0vVr2wUo0kZJJS+r1uX7D DFW1iGhZ3nOgHJMopjWCPDj8TJNCfEsuCHwqiGHmNFmq686h1abgyd2xB8h6jGijKKbU lRuZMTqlMvnKCMny/FrzWGEUZ+VcVLazHMflZftsSERgvz1oUlr4rOmbLg3FZsan6hrs +G2Aab3QQJ46/E3/Rkg4JX95NxP2Fe4/N5+Om1eXrWDTBkctViB4ALxwdvOwq1i4DaYO GknKMSBBkM0xZ0JBp5DK61rFUo8P978FHaZlwbBAuMubDzgQEoayt4xNjl3YzqmeGA7L ZAJw== X-Forwarded-Encrypted: i=1; AJvYcCX68AwjgE4EE7ZbChZiLBws8MHaHVIYtfc89Qct6kpFKwyx49U9M4tPPz3pewo6tMliVfo=@vger.kernel.org X-Gm-Message-State: AOJu0YxELqttC5ozbMxCS/wYuExDtaQ3E26S6N8vc4EgV5iAauKsYOMf SWa5Oq2E4OXjO2OiAykqL7m3iGENKhGPDeOkyOfNzVUT29q5884wL1JZ++HlODo= X-Gm-Gg: ASbGncuTEzclp+iReZZXkEFR5hBrOECBul0Sn1RqMcOFfaBeaaiYmdUNvAUK9aj9VZp tOWwSMgSZ+7LTP7MXSgMIgs9FmvzesUFPPr4BUURIfCHW7I3V62AB4Sl4LkMnJKkba7RmghWWwK KC8TRMCE45D4qtMsHfRWMFfiqcJuR7XZlD6qHxtlN487X+Hk8YY+CKgza9iFHJxXNtCRm1RU4dy TKi9QswHlJmUWePi3BqG1TPjJW0bB7G8Jz4PlSWYOnNIN8Az5EpXS+1k2pny3nY3kP776fY2FsR QLvI6I0mxQwVObRo6HfIMzC+b4WjoUd/IiV/WnUpo8fi X-Google-Smtp-Source: AGHT+IFvXFjaslvNGXJjltHn8NjSjDrKRDjnKt7uWKtRausP/KT3hgu5XPa6ctrl8hlKzv3rih4ocw== X-Received: by 2002:a05:6a20:c6c1:b0:1f5:59e5:8ad2 with SMTP id adf61e73a8af0-1f58cb40fa8mr3753307637.24.1741666153903; Mon, 10 Mar 2025 21:09:13 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:13 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 15/16] system/memory: make compilation unit common Date: Mon, 10 Mar 2025 21:08:37 -0700 Message-Id: <20250311040838.3937136-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- system/memory.c | 17 +++++------------ system/meson.build | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/system/memory.c b/system/memory.c index 4c829793a0a..eddd21a6cdb 100644 --- a/system/memory.c +++ b/system/memory.c @@ -353,15 +353,6 @@ static void flatview_simplify(FlatView *view) } } -static bool memory_region_big_endian(MemoryRegion *mr) -{ -#if TARGET_BIG_ENDIAN - return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; -#else - return mr->ops->endianness == DEVICE_BIG_ENDIAN; -#endif -} - static void adjust_endianness(MemoryRegion *mr, uint64_t *data, MemOp op) { if ((op & MO_BSWAP) != devend_memop(mr->ops->endianness)) { @@ -563,7 +554,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr, /* FIXME: support unaligned access? */ access_size = MAX(MIN(size, access_size_max), access_size_min); access_mask = MAKE_64BIT_MASK(0, access_size * 8); - if (memory_region_big_endian(mr)) { + if (devend_big_endian(mr->ops->endianness)) { for (i = 0; i < size; i += access_size) { r |= access_fn(mr, addr + i, value, access_size, (size - access_size - i) * 8, access_mask, attrs); @@ -2584,7 +2575,8 @@ void memory_region_add_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { @@ -2619,7 +2611,8 @@ void memory_region_del_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { diff --git a/system/meson.build b/system/meson.build index 9d0b0122e54..881cb2736fe 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,7 +1,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', - 'memory.c', )]) system_ss.add(files( @@ -14,6 +13,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'memory.c', 'physmem.c', 'qdev-monitor.c', 'qtest.c', From patchwork Tue Mar 11 04:08:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14011103 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 BC4AC1EB9E8 for ; Tue, 11 Mar 2025 04:09:15 +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=1741666159; cv=none; b=otLjAIy/Fa0mEYk1+v8MGZyE3fwICnPdl81wIiri6jXYDXeinuskXx5ute3MQeX/J0sAd9/+YQWq7gYp+W47cVA49Ojyof/a/PaJiAaQGJ/AACd5/d4E/xINBIV2U3xM/qL4hU3q8aM3GyFaiXNz33vkNWx5J+CL3BwvKrSK8Kc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741666159; c=relaxed/simple; bh=BkkUjOWmF7t6i9tbUmPiymzR4gYmq3p8TFOqgr7W9ZI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q/0HyX7TL4AIxDAgWT/pMCZvEKLPSBzb8j0TmpDDPZUoxb2NOKakZhCZxEEaz5kq4ZAjwH02ZGbKPK4KoMxCRxYj9mOVhmiJmPwv+dhUGXuon8BLqk1c1ybB3x8lfTc7q5Ic20MKRCJyGZ5OlrEntWCnTSDrlpu9PfJt06R615w= 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=i5LeSA6D; 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="i5LeSA6D" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2239c066347so87019285ad.2 for ; Mon, 10 Mar 2025 21:09:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741666155; x=1742270955; 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=/jGKe5PComzh06JRRSjyC3R7ujh2oauOlO5efOCu+zg=; b=i5LeSA6DnGU1twwaWsugFWUoTBl4BQ0huuqfs8iK2RyaK2mdtRsGNMoT0K/LUlLBcY 9hUNvlhNjs77k5cLdiRshJtAQ+UsUOpejnluZIkSUEZThacDBTb8RFy5vMvstl/MvtYV njZHZCpV6kjtIpawUOB7WLXdPU0gCFir/qm3554wIVSZltR7dCB+9duFJ92d74Zh87P4 e/h2UANqFQILaXxtuDChDBPANoLA8cGMK7InGTG1OLD0l5Fz5Px549qvGjABOjELqmRV dSMybRPnAxPiNPAO779cbY8Mj6wYkj+C1+Tx400BSWdJ/QAtA0K8wI349WIhLZmVGcb4 bKLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741666155; x=1742270955; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/jGKe5PComzh06JRRSjyC3R7ujh2oauOlO5efOCu+zg=; b=xAVcakDRSJ8v8Djxe91o38kmYng+ahjIVV78TtTpvOFwyZyGSXw/5cILOlTpJ7GVR6 yTjnjMr12f48sk5fM0/u2JDggTgHtdloi/SPW4IQmkxUfUEziQJzn/szL5I1GuniSNWO r2dr+nDFGoRdYO8mSEVEnsm3XAcH6lqzT2lC4GrMJFLnKd4z5UWd1wgZhDq3CBSbPrVe YfT3H/QUzBoVn0MGUZUZIYhcfkGaKHTTVnWrimZl7gYJqaI6zDBIH1AaiKLfSpVUFk24 K+7R9cJ0d6hCBF22p+pOK9zRctNBsgGDC/aUuVJmrVhjwSvsx6pFl+rCNuFoyZRCudKh LXVg== X-Forwarded-Encrypted: i=1; AJvYcCU0muZpn9L4X/DFaKUmil+7aX9igjVTyusrRPh56k7LUYTUV1j/yp6QzARjKQhwB2YSICA=@vger.kernel.org X-Gm-Message-State: AOJu0YyQtAJYSa2lRFTDoiOBCg7Iw6C8NEzwoUkwh/Xo0CAcX2yp9sKu NgvztyYKq4acOaDLRbBpUddxBKjGvbeZWVWWmH9/zD1TcbsD+F9MmPX6ybj7DB0= X-Gm-Gg: ASbGncu2J4GXrfYk4nJVf1rBBu2OdS47ixHLiejnuT/W6dTursl8ayY7RnNVtrfxOPd o5IKQetGRaOgZCr7NRPQEqQc5j+6d6Urufc55n5cJG4woj6i7eBtxGOpe8nglUuxeefH2pv078i Wf42/TDIn8Zm00zdlpg+nvZFOi9ByQ3aD3KtjTej/AYHL5NH0AIU0x7B3A975CZdZRjmAoKHmmx T24ks+oVsvMWy4vV3Ef2D0u17xYPz4Peza+Iho9nvolsLcbWO8EvIqPJ9eHxZg8IT9zBRle7+uA V+F5AM6Ak9wRZRPk5cYKltGZujh3jzWtAR8SmaaYtCWd X-Google-Smtp-Source: AGHT+IHyNZlPl+mr9I1Abk1OGoyMfz7g2vsqkJBEqYSKDsIrZops7PpVKyQRnmB7QqPJXfOnNuaTjA== X-Received: by 2002:a05:6a21:6f8b:b0:1f5:8b9b:ab56 with SMTP id adf61e73a8af0-1f58b9bb025mr4529566637.18.1741666154964; Mon, 10 Mar 2025 21:09:14 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af28c0339cesm7324454a12.46.2025.03.10.21.09.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 21:09:14 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , Liu Zhiwei , David Hildenbrand , Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Paolo Bonzini , Richard Henderson , Peter Xu , Nicholas Piggin , kvm@vger.kernel.org, qemu-ppc@nongnu.org, Alistair Francis , "Edgar E. Iglesias" , Stefano Stabellini , Harsh Prateek Bora , alex.bennee@linaro.org, qemu-riscv@nongnu.org, manos.pitsidianakis@linaro.org, Yoshinori Sato , Palmer Dabbelt , Daniel Henrique Barboza , Anthony PERARD , Pierrick Bouvier Subject: [PATCH v2 16/16] system/ioport: make compilation unit common Date: Mon, 10 Mar 2025 21:08:38 -0700 Message-Id: <20250311040838.3937136-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> References: <20250311040838.3937136-1-pierrick.bouvier@linaro.org> 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 881cb2736fe..3faec7e4dfb 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,6 +1,5 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', - 'ioport.c', )]) system_ss.add(files( @@ -12,6 +11,7 @@ system_ss.add(files( 'dirtylimit.c', 'dma-helpers.c', 'globals.c', + 'ioport.c', 'memory_mapping.c', 'memory.c', 'physmem.c',