From patchwork Mon Mar 17 18:34:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019854 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 CD7F519048F for ; Mon, 17 Mar 2025 18:34:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236469; cv=none; b=e6ZBVuJ4uEElIaWbEguOAHj2BToDA8qTIz80YApKVoyhBz9kfzL1tx8F+pNKjxygoUqfSah0SLjVvPHL02t+BbRmBBW147To7WDKzXCt27PckMfGusRfY/YGbvKreinm9bqhR9ICUtKjj0dlhrbPeEnac73/Oques/0Gdpej3/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236469; c=relaxed/simple; bh=D7kAKGSn4zAKkiSs1hQlq6vEceALs33too5mFmMr30Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XP62bak29y4StAKMB8cqY0tR+88bwGXHkAzCzpN9fBN5POeQrNpWJDYGf0Cf3ZboqvygmkFMvtElbRnZl+6RjZDrokfStHIcGdJfz/caZmkkAS5Pd+myO0WimNbXG4DGydmkyzCo4zK1ywQ6VnffAT79hfiHBpYNgjR9vJOinxE= 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=lf7coFEG; arc=none smtp.client-ip=209.85.214.178 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="lf7coFEG" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-22423adf751so80101465ad.2 for ; Mon, 17 Mar 2025 11:34:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236466; x=1742841266; 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=lf7coFEGzN80IA2TlDFDPqH+AH+ZksdfEB6AhFWXJUC7o+90sjl3/K8h0s3ic1aujx C1dlrecdXt55NiQcR3XQb5YcpdE0A3peW2gmP76i+lBKaLWTFQiXwYKBZomqQMajl+fh go2ekezYCGqSGdXNswr02fgr9MWurqWF2LGWuKGCmu1kHBcQ24bZjTIQyeIET48uYMwM xtA6ntMUztcZLUAwsNuOFQAtnNM0KfnGsCgNxBzhQaKvvbXPmada8aLEZGi4ZZMJZswO WULz3nQ/4UCzu/5cRtl3jlzgwImpSjZRRYnGtS2fOcOVQVquSEd8/CwPWDtaVhiVy9qP XZvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236466; x=1742841266; 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=ReRpYzFUaijfa0UDfLJ0dkJ5Lj1XiI6cEpAhE4FnM0bW4Un/khD1tdG2m6ioph3vSv RWWzYzd51sfRO6E2zvhEGdLZVNftCvth28ekLuYej3XcUBSJT5yuHoy2P0uhg/eWv46f 8Lflf5UfHfvHRmpFSViZaw9jOOETEhP2YSNvfAQ9HPjJ+PRr06AyzCHYwJnoEt/mB+kl hOEF/iYGRuTzwJsVQjeUI3trLmK5z+Y5xsVBdTvxBpPttoMJd4RQT+cWts0p0/HQ6SaI RvmbHIrFQzvw3F7s88JbqBqsn7d8PUGgz2+QQ3DSCgSiGsEaLtfi/lRN0gjxBYRSDkhQ 4rFA== X-Forwarded-Encrypted: i=1; AJvYcCXBpobe/ziR8vEltfO3NLpQxGBf9fMYaGiyIIUot+zFVVQqgEU8QzLP1EJGH9IE0fOnyzc=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4V5n/WrMAu+8Rt3blDW4hCJiJbywacbbPbbHuFDmuW8pMUjOQ hiX0n3acFzKEaZr2TQ0qBEnGGy6J9MJHfz6zXZXKAQmEiOitg2vIBcXaMlXp8Ko= X-Gm-Gg: ASbGncvddE3DqNd+mOf1SobAkJf6CAfsGbEMAB3GphntWHzLfj8dwjuJL6ppEctVas5 H6tbKraiIJ4CwXG1gUdBMkA7w1v5/rTVG4hLhreNFGh6yV/ERwDTvp+C5Rh4gNzcizm7irGrgrk Y9646V+JaBee9lQEf8VxRPLREFEpAzhedCwQlDzhZIQIiOL6Ve+xNKJpKpDjeVmiSCH6ee0dul/ 8I8NB9qegzGOEF3V+Ik4WZGx5kPwQ4Em+CHOH0AY4uqNg+IXZYhAjGDQub67jjWpsfwXDyauV4H Nqgnxi2JLpDVG8Kl0gteexe4Ng+QLU4naq5In7JMYqya X-Google-Smtp-Source: AGHT+IEMdkhHnCOZBQ+9EV0uYxPSw6/JcOSk+BrsDVDiw8khDcGewsFrIqa6c3AgQ8Es/TqwcULwNA== X-Received: by 2002:a05:6a00:139f:b0:736:9e40:13b1 with SMTP id d2e1a72fcca58-737224726e5mr14180634b3a.23.1742236465994; Mon, 17 Mar 2025 11:34:25 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:25 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 01/18] exec/tswap: target code can use TARGET_BIG_ENDIAN instead of target_words_bigendian() Date: Mon, 17 Mar 2025 11:34:00 -0700 Message-Id: <20250317183417.285700-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-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 Mon Mar 17 18:34:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019855 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 E33151BD03F for ; Mon, 17 Mar 2025 18:34:27 +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=1742236469; cv=none; b=KEM3o6eP1V9fEarr7BI7qxMOrYI1XV0sijGsK8dL9nZK/X+GePoFq2I+2UnJwmx4OmcjMGrDnL/B03ZoRmyHU4dn8ZHZEsXBJdZGpG+8kE0kSMaa7CDtx4GcyEbcT5sWDRaWi7gkLns3JzoVBbpJUmwTNzMQth+7ZQgmYmsFG+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236469; c=relaxed/simple; bh=6cdUkgilZ/OtUG5CSqfjwssNSd31+3Bqv7Sh94x+Hkw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lYU0iAyxzz3n/VL7Yf9hVeiU3vITtBL6qtTkGPo7HZ1/0aeOC6dMkhCH3usxHSYPhP7GzjI6NB2xbR0nXnbI0rTus0pycJLdbhZTNoft2mMeP4rlWzlCLHknAExQyMG5RFo5iuP4hxDyKpUwvudaL9hm71hQ2Lo35X7M4ctd2Ck= 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=Y6bhYaOz; 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="Y6bhYaOz" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-225477548e1so82724015ad.0 for ; Mon, 17 Mar 2025 11:34:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236467; x=1742841267; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fjQjYNlvDIsMbe7+veFF5h4s6vvln32m8yANkT1fS5Y=; b=Y6bhYaOzzduqDzx5tzfgkXDB3l2tcAaUJ3+Eb2CkCdRxNJ1O9WYb9VqfJlI7NdUdfq oZa8lSWRll+8dj0ev1XOLCxpaLkBRx6YckR9HJb1ofhxbm0Y4lP9kZLVYA++Qd6JuLF4 gaixm0rbaNGPjmZMDt8n4uw04tY3M7gDaDwTPOkQQR21Ddtn544LFtLQljXVbScoD80q upY0b2wL+9HTZgUjMmc8cB4dRB+U8MZXQGRbXi4Iwgk3BKeCzDRDTqMiY56GxNVGzanC iRbZCHVpfXzZYjaked+mbYLEpDwU11o9k10uSCakOLGs1WkdApCmp/8NL5NJSLQKi/TH FdeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236467; x=1742841267; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fjQjYNlvDIsMbe7+veFF5h4s6vvln32m8yANkT1fS5Y=; b=XIx1MKuiTc05LP6vMjWKLnFjHk+v+tWkkG4jbO1C8Sbcpbzu6j/IMZSxD30JYHuc64 /5myHFOFmEM9z7MkkJlGyXyA1KxfBHAhAKelQgpkC/qTsbVCPkCe4ri6Keubdsyb2x8Z ptvhmDciQ/+kmr0zmz4/mnKxpDRvrEYzaCcyfIOTIUJPjYXE7z1GnA5uCOVWKYyPwjtV zN3fULp8kWylhz6Oj9Lfzc/2dBeeKK3rH2IupLRKFzUfS5Uwi9VZbfd3Kdabr4YjwNnt SrFkWffrCGrlzEsydA3tcYIT/kHgb4PaMrpdDp1z8hlqoW6IRxjHgLMT1NsQkXb96YLn 1V4g== X-Forwarded-Encrypted: i=1; AJvYcCVGUPKE0TMb0Jpa4cvSNMNuwkMNZBjfNBNsZuVlZ60+ve7VHikS9NGvgAJqgIWs7MGhxpc=@vger.kernel.org X-Gm-Message-State: AOJu0YyzLRJ1M7NeqUIgdhR+tI8mgotUyUcqinZkhYH4KabPcEU4oDZn xKqEsjfr9P3yoZeGFa66wv7Kd3wd2/MGTtwIIxyQfVcKUJDE7tn4lE5EBS+G+Yk= X-Gm-Gg: ASbGncsraArebyHjiycuaJtR6uGS8pAw3AzNf69R7D9yScdTh5VnnzVKelJAbrOKqjL sxF0br4+pN57tL9d7fTGkDyAkrNBkFX3MS6Gq0ivSYY9UvWN95rioXsIRXsAoaQ9bhmMMvjOgb5 w1uBVx2jo/pz+AtSCz5FcvdBA8PWPWEdzBfactXKiC8pgrsx1iZpHd/uMwQ20ubSUVzAmEtTwXS UyIGquLIUH9piCEPG/XH71BbMRPSC/G7Ed5xNaYVJC7bQ2Khoad9XC/hpyxSpJDuh2/iSlxeBHm 7BBn1SkYybK9Lj23JOS9zVBv7McveHGu9Ge6aWm/efdJ X-Google-Smtp-Source: AGHT+IFi3tqJwrzQePDsXIvC4P2qzcui7bHazmhEI/k1ekPUyZPPBb0NOgqZr9PPYc71RHo1sxISkg== X-Received: by 2002:a05:6a20:4e08:b0:1f5:902e:1e97 with SMTP id adf61e73a8af0-1f5c133476fmr13616359637.41.1742236467105; Mon, 17 Mar 2025 11:34:27 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:26 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 02/18] exec/tswap: implement {ld,st}.*_p as functions instead of macros Date: Mon, 17 Mar 2025 11:34:01 -0700 Message-Id: <20250317183417.285700-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Defining functions allows to use them from common code, by not depending on TARGET_BIG_ENDIAN. Remove previous macros from exec/cpu-all.h. By moving them out of cpu-all.h, we'll be able to break dependency on cpu.h for memory related functions coming in next commits. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 25 --------------- include/exec/tswap.h | 70 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 25 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 8cd6c00cf89..e56c064d46f 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,31 +38,6 @@ #define BSWAP_NEEDED #endif -/* Target-endianness CPU memory access functions. These fit into the - * {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h. - */ -#if TARGET_BIG_ENDIAN -#define lduw_p(p) lduw_be_p(p) -#define ldsw_p(p) ldsw_be_p(p) -#define ldl_p(p) ldl_be_p(p) -#define ldq_p(p) ldq_be_p(p) -#define stw_p(p, v) stw_be_p(p, v) -#define stl_p(p, v) stl_be_p(p, v) -#define stq_p(p, v) stq_be_p(p, v) -#define ldn_p(p, sz) ldn_be_p(p, sz) -#define stn_p(p, sz, v) stn_be_p(p, sz, v) -#else -#define lduw_p(p) lduw_le_p(p) -#define ldsw_p(p) ldsw_le_p(p) -#define ldl_p(p) ldl_le_p(p) -#define ldq_p(p) ldq_le_p(p) -#define stw_p(p, v) stw_le_p(p, v) -#define stl_p(p, v) stl_le_p(p, v) -#define stq_p(p, v) stq_le_p(p, v) -#define ldn_p(p, sz) ldn_le_p(p, sz) -#define stn_p(p, sz, v) stn_le_p(p, sz, v) -#endif - /* MMU memory access macros */ #if !defined(CONFIG_USER_ONLY) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index 2683da0adb7..84060a49994 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -80,4 +80,74 @@ static inline void tswap64s(uint64_t *s) } } +/* Return ld{word}_{le,be}_p following target endianness. */ +#define LOAD_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + return glue(glue(ld, word), _be_p)(args); \ + } else { \ + return glue(glue(ld, word), _le_p)(args); \ + } \ +} while (0) + +static inline int lduw_p(const void *ptr) +{ + LOAD_IMPL(uw, ptr); +} + +static inline int ldsw_p(const void *ptr) +{ + LOAD_IMPL(sw, ptr); +} + +static inline int ldl_p(const void *ptr) +{ + LOAD_IMPL(l, ptr); +} + +static inline uint64_t ldq_p(const void *ptr) +{ + LOAD_IMPL(q, ptr); +} + +static inline uint64_t ldn_p(const void *ptr, int sz) +{ + LOAD_IMPL(n, ptr, sz); +} + +#undef LOAD_IMPL + +/* Call st{word}_{le,be}_p following target endianness. */ +#define STORE_IMPL(word, args...) \ +do { \ + if (target_words_bigendian()) { \ + glue(glue(st, word), _be_p)(args); \ + } else { \ + glue(glue(st, word), _le_p)(args); \ + } \ +} while (0) + + +static inline void stw_p(void *ptr, uint16_t v) +{ + STORE_IMPL(w, ptr, v); +} + +static inline void stl_p(void *ptr, uint32_t v) +{ + STORE_IMPL(l, ptr, v); +} + +static inline void stq_p(void *ptr, uint64_t v) +{ + STORE_IMPL(q, ptr, v); +} + +static inline void stn_p(void *ptr, int sz, uint64_t v) +{ + STORE_IMPL(n, ptr, sz, v); +} + +#undef STORE_IMPL + #endif /* TSWAP_H */ From patchwork Mon Mar 17 18:34:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019856 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 24D4A1BC07B for ; Mon, 17 Mar 2025 18:34:28 +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=1742236470; cv=none; b=CSdFYJOy3Pg+0rzA7rAkM0guakWA1FpGG+DePLd/yqVZu2TVhu7KovwHZGF2t/TMws8NHR9wyWDkez70pNJqQUpCv0IOonC7AoJJkwnaJ+wf768J/rtAwfMWvPDoX81BAqELiuxEDPdPFWxp5c2ih1uBQaFJyT3HzuJhLsMgdKQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236470; c=relaxed/simple; bh=oqW9tTQslkYwWgYQ4FVxpgiaLvEuigwHwZLhfUQTCic=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eK9RWPmfwx5eG+QP0buirf5uqmzkIlWCt0T/5YQlTGovX+GH/nJ6OryOnVV5G/1epZIuQ1vrElcq9IOswBsIZT4DvSAupHTKfdKOR1BGtPNnJ/BTGFL54uDJ51DnGHXv8WMa+xC8iX9Q2l8ABOHT/Fh6/V+YjRaZ2ILW+eeehy4= 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=YjgHXfST; 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="YjgHXfST" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-224100e9a5cso92050595ad.2 for ; Mon, 17 Mar 2025 11:34:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236468; x=1742841268; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fcP4MFj0H7Fu3AxOxTbJlPG2KgbdJwiBtz5sSPdKZDU=; b=YjgHXfSTyUxscAxsSAvjk0VWUjPIoVkN6qUWq+e3Qylmc3VA2Z9wgtMBwKTL8jw5AX 9WfBY5fiwEBeP3LM/6wCDrI/AEFUyY6Ig50ItJpc7GizWu52BJzo4zyh+si56PJupmjR EDKdCWHM+jTv63W8YXRuATB6yzCFQngjucQQ2K8nGWDZdNBoRieoIwwUmv4WnaSGRdLH MSKZ++yMxR8/nVMGCKR85fQ2d02WFubVg1UAGFUhD/dO2GvVl2nH8lOdvSG1alRQnRsY QB/4WUoSXcm03VcCR8i/DGoaqbxrH6jp0huTMDf0nAMCuxWjXVfKVJWuxVOwcDExSAQC HYDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236468; x=1742841268; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fcP4MFj0H7Fu3AxOxTbJlPG2KgbdJwiBtz5sSPdKZDU=; b=Xfm9q988TAvJNtey+iMN3+zfOqdy22C6cx+JV+5aWyZoxWCBNlFf7/U/Dszjzp7JRE KhAbXbmRlUB8X2HcpKCJKkF66ArVPuifNhF0l/pYZwPBOct04fJTf8u8F7B6XSt0vZe+ li9hfQ5tEJryUwCLKI5t7XtY2pWtqBVlAmOvkkS92Om0wHMPJ4VO05UH1G881lgwWM+8 m93zamp2GLj7rSNWKUKOBOWpzrs77wSlpuvCuIkGHCggRDhJ6szUXhXyEzB+AsoztOU6 DiWGpRVjEq8MrWVnVIZbvf7aI+wY6I8dl5Ao8X+6/hULeIci2hEdMdWZuMv6V9+H13pJ 8oSg== X-Forwarded-Encrypted: i=1; AJvYcCX455CwVijhom47xr8MPdnxTaxqS5nuozc3R9BBEEQ2URhHVsgRBlsa+3ikEywKudH+ejI=@vger.kernel.org X-Gm-Message-State: AOJu0YwPrCWsk2FpGQ+arV4A+lY9oaj2YrxGKqEW+03HJpznbWRoNuOF KWg62LfWJ9UDg9skKtbrsSYkOCAVRgAzGDLezMdd4hKXOWd+z2TGme3edjPBaac= X-Gm-Gg: ASbGncs8hb+M3nSqjVkFIATHDyke5IqhnePyV4oLrqga64dDcQFH8+YXtwo+VlTVLqd baImzULotw9Ndwss+aAhI1yJrsgyeZRHsX1JIY/22w7AIZ0FRje/kmUfuo+UOWQXWjjDJiHxU2I SGXmTPjsaScBczvRRGaLK8UWxhe2x+5zpQwTcyRNp6NM3tZESZoU7djjxMg/bnMOcSxjfMfnwok AyEEn2nLFYXYMbZwOCpS7rp3UjyyWRC5piVRoeZI3puiO3sGZSG8m7+5JC0C5mRIkXYPyrPZo+F RDtFpU8I+Ti1MjT915AIaC6IcX0gj/zJ3srgC1Tf4/0O X-Google-Smtp-Source: AGHT+IHQDcKJsv+Vb17cz20O+u5FV4YlvIefcRPItg35hxavnuYTE6e3UlOmHk58oIUa6dLl2/Rvnw== X-Received: by 2002:a05:6a00:13a6:b0:736:7175:f252 with SMTP id d2e1a72fcca58-7372239d970mr17183784b3a.14.1742236468325; Mon, 17 Mar 2025 11:34:28 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:27 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 03/18] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Mon, 17 Mar 2025 11:34:02 -0700 Message-Id: <20250317183417.285700-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 12 ------------ include/exec/memory_ldst.h.inc | 4 ---- 2 files changed, 16 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e56c064d46f..0e8205818a4 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -44,18 +44,6 @@ #include "exec/hwaddr.h" -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - -#define SUFFIX _cached_slow -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst.h.inc" - static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) { address_space_stl_notdirty(as, addr, val, diff --git a/include/exec/memory_ldst.h.inc b/include/exec/memory_ldst.h.inc index 92ad74e9560..7270235c600 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, @@ -34,7 +33,6 @@ void glue(address_space_stl, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#else uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL, @@ -63,9 +61,7 @@ void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Mon Mar 17 18:34:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019857 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 58D3C1DFE12 for ; Mon, 17 Mar 2025 18:34:30 +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=1742236471; cv=none; b=fAjNnffrtc5EQqurBkwxvuMlMsnwpuBsTh2pGvhtzQ8vUaQcTXjI7fyDJ8IzcJz6H2HlbVoXZ6T0U6b/UOcmJIBUrnlA5tndfEWb7qcYn9ZRRLivnN1uyDrMMkVEMyeVX+y15P0OHI9DbrbN/Mxx5yxArBBLSHnIyBo/I6aU+Ro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236471; c=relaxed/simple; bh=tsr8Vu0yCbhmYRJ+c2Olh9gVNG1abA5bAWFfRS2LzZg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e/D+nusie9f0PsQpawHMYfdI8Dk7GqQWf3y0DLUVq+W3vmZgyfjdsOAoZzfcS17OOTu9gFauUaX1QHChx61X0NIBrgCHatOq/eC61Fj2ErPY8Jgf1zLsEXty1h7QGQhcm0LQiMHCasYxIZD8LPZgpGQa2mPS4j5Sb4YNg5NvKK0= 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=qnpnP9HG; 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="qnpnP9HG" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-224191d92e4so91697365ad.3 for ; Mon, 17 Mar 2025 11:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236469; x=1742841269; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G6OuFeXnonCJBRRaCKlE2hD3nLeAbwsquVgoLJADjfc=; b=qnpnP9HG5D8CRLyaU+c1BehTn72kdkzpA1SpbBj8xImnxw/v11F+P5vb2vdQ/Yutz9 bz+pU2jUgkKr+9BSjmgv8oeW7wwkIp5VctmMjiJxpJ0fwjufHW2Hps7+30+RPckl8OG7 hu92VgoAwGqxAY4bcjz2kkkvOAMiAZeZwBPYA7rWNU78jwnmT+jve1MrjNZCEO5fWPkE nnYZz1H78T9IYGrfPRGSBOrAG6ouFLu2wEnEgPE+9ORTRkwWhHGjwk/R6SKo9T6WwGty TVAL3mfU2zaJwtd8S2sWE3EYQlC4LKv7t/zGPT7LgBdNey/zphCYa+GnQP+5kAhQfYgL ZZWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236469; x=1742841269; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G6OuFeXnonCJBRRaCKlE2hD3nLeAbwsquVgoLJADjfc=; b=FiVvTxY3J7cvqXhWIg/ds+KhQZuwz1zixsPldOcJpGEU1iBNOJKwBYT7iRKkT4cKUw QcR5biHO4bd4/xna/eZ2AQU6AD64gJBIf1CTMzjshXHqDz1euQzuTMyTwvYtTw4v/J9R uHbr0fXcBaKUem82TsRqRYvzUvprA03e2qAc+5DUFXSx1bYS5kgX/kJEQiMXEDfi9K9B qyS/JgSYHIh6vLVYBS7ogeC8ysfdjJ6BxnNZbMV7wDVtYzy1ry6Ui4xg7n46reCM46XW LlW8utmNx5mfwjrveEr7ndN0Q2R0QBznuxV223wtipA+PFTLcOav3iqrzJYWi28pgU0G Kj8Q== X-Forwarded-Encrypted: i=1; AJvYcCVS+LlNPe/kpATXGsTqBJaOfACtqb723WSWorTcAT0rErt+eAbkNNnmKRSmyH3Pw1WvnKQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz1VIx4p9vSmqJ0Kl433wqoEQbQ35Hb113/RToTFDU3Qk3FzieA nIfFF3KGOg26q1NGmM28elH6FGCzbdRJsPnKvKMvVQsPJxV6Bn7dCT0gFt1AnGo= X-Gm-Gg: ASbGnctKlBZbTthfJ1TWYlI/8Mvj/bLnrOb8Jl8VknOlSLFdrLUnhepPWw1fJVo+xhx LAvvPwUJpxq6RLR/r+hGKMQtlrlH6Uivyr0nzawzscsylpbTUPr5XlcFMM8JFia8qeo++7TM8yp Ch6KR7aLilreLWciPSxdME7mVLI8C6BxCu2YEQFCxUis0KCGEjO5boA/1HTVSNCj/q3fA7f9MDh b+9HHayexmRNQQg57cI05t3iIc5Gz4oQiqsX2RJEcE68DJRzFhIXOGmUj7i/AVeehEmxZCYQ14N m/4tyiUG9l18Ory65geWgngGHPgvRoJz934Kq9hRxnbo X-Google-Smtp-Source: AGHT+IEuktxGhHzx6xs3EGzvKgpAVns4GkbvMlee+9okZ79gnYJTq9xN+P/LP5FdgPO0zhqsq/U9Fw== X-Received: by 2002:a05:6a00:1916:b0:736:51ab:7aed with SMTP id d2e1a72fcca58-7372240f242mr14927867b3a.16.1742236469458; Mon, 17 Mar 2025 11:34:29 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:29 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 04/18] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Mon, 17 Mar 2025 11:34:03 -0700 Message-Id: <20250317183417.285700-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Move stl_phys_notdirty function as well. Cached endianness agnostic version rely on st/ld*_p, which is available through tswap.h. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 29 ----------------------------- include/exec/memory.h | 10 ++++++++++ include/exec/memory_ldst_phys.h.inc | 5 +---- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 0e8205818a4..902ca1f3c7b 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -38,35 +38,6 @@ #define BSWAP_NEEDED #endif -/* MMU memory access macros */ - -#if !defined(CONFIG_USER_ONLY) - -#include "exec/hwaddr.h" - -static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) -{ - address_space_stl_notdirty(as, addr, val, - MEMTXATTRS_UNSPECIFIED, NULL); -} - -#define SUFFIX -#define ARG1 as -#define ARG1_DECL AddressSpace *as -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" - -/* Inline fast path for direct RAM access. */ -#define ENDIANNESS -#include "exec/memory_ldst_cached.h.inc" - -#define SUFFIX _cached -#define ARG1 cache -#define ARG1_DECL MemoryRegionCache *cache -#define TARGET_ENDIANNESS -#include "exec/memory_ldst_phys.h.inc" -#endif - /* page related stuff */ #include "exec/cpu-defs.h" #include "exec/target_page.h" diff --git a/include/exec/memory.h b/include/exec/memory.h index d09af58c971..da21e9150b5 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -21,6 +21,7 @@ #include "exec/memattrs.h" #include "exec/memop.h" #include "exec/ramlist.h" +#include "exec/tswap.h" #include "qemu/bswap.h" #include "qemu/queue.h" #include "qemu/int128.h" @@ -2732,6 +2733,12 @@ MemTxResult address_space_write_rom(AddressSpace *as, hwaddr addr, #define ARG1_DECL AddressSpace *as #include "exec/memory_ldst.h.inc" +static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val) +{ + address_space_stl_notdirty(as, addr, val, + MEMTXATTRS_UNSPECIFIED, NULL); +} + #define SUFFIX #define ARG1 as #define ARG1_DECL AddressSpace *as @@ -2798,6 +2805,9 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache, } } +#define ENDIANNESS +#include "exec/memory_ldst_cached.h.inc" + #define ENDIANNESS _le #include "exec/memory_ldst_cached.h.inc" diff --git a/include/exec/memory_ldst_phys.h.inc b/include/exec/memory_ldst_phys.h.inc index ecd678610d1..db67de75251 100644 --- a/include/exec/memory_ldst_phys.h.inc +++ b/include/exec/memory_ldst_phys.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS static inline uint16_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw, SUFFIX)(ARG1, addr, @@ -55,7 +54,7 @@ static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val) glue(address_space_stq, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#else + static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldub, SUFFIX)(ARG1, addr, @@ -139,9 +138,7 @@ static inline void glue(stq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t va glue(address_space_stq_be, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Mon Mar 17 18:34:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019858 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 514431E1E0D for ; Mon, 17 Mar 2025 18:34:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236473; cv=none; b=IU6duaQd99+F/LlMLq1tWrmRUYSkOXhkMkprq6i04gGI87Onk6Xof9hXTLfVDBYsESgdhdM2d4YtfjHKF8VURqHQ+cYdWnW21J9XLjdK3+IwgzGKA9prUCM0R5N7Aj7vA3ET+MALMitn4AdKqlBi4q5tBbOTZTIHSwTQh1UJU1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236473; c=relaxed/simple; bh=o5ngxEogoPE4wzfGJK+6GJ+kqB2vK52Q1QHqnpgsaHQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N+5ZN/tuUqbUI1Ho7i+cyiXRyUZrwassiibCAl9NQqRSK7yJLWf9uj3QnaX/UjLYzWZzO7aqEf7oI8ieyPHKSxWbXbG/aSajniU1knWtHb8vyCBE8pP7Kl4q2i6UpPOB346GLZRAfhEdPiwpIOTEA4Bl5gNFR22tsKqwaA5fYUA= 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=AMbxgOg2; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="AMbxgOg2" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-22423adf751so80102905ad.2 for ; Mon, 17 Mar 2025 11:34:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236470; x=1742841270; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wT5ohu0Ui7xrH+jgYqMJMpKemGPcZNvy7jzdyuAyzEs=; b=AMbxgOg2WIyRpnIEBHaG34Iy3Iowj9qfCdue+y6m/MgRiz6d3bM06C2OaDJyZJgnfA K+HWorBvkn7xnvFIA158Uyt6FMWrmfXMtzvXQzl3LPm47N11teGvRI1gzQfwR8OSdigF bbKkgytUmfx20lnMCrfctkcJFvh/GINsPubi15hMQAeUx8KsHGpxQMis+efwW4Yj+H5c /m815DatvUxFMDZrNPZOaJu48fuePxaYkqE/hdiBTiMei1+NKJR8NtMQiFGkWCwy70FP DdiyH7nBIYYyMlE4Za1O9dpOBTJh1qYNZ1A4cIr0CkR4TJ4+EJ1exnZjxP/82FM9nHH6 5jYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236470; x=1742841270; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wT5ohu0Ui7xrH+jgYqMJMpKemGPcZNvy7jzdyuAyzEs=; b=Xqjr+XfD2vOtzXZTxY6eKBA8bblEeKQryXPbaT0pVoTNAZQSdOJkKxWQBxm3vgnJM7 C1a2Kp2eUM/n5KSOPqb87dcrKjKyZgDTnvK0DHKHUoj8JsBM0Fmx3g5hBNgE5/dD4yMi 23I6CRmkMn35T2yQfEMFM5mmteAxJOi52zWKAET0SsgzfycCrTqNkxLM3H8O5nweFFMW t+aIWKP1J7VdR66/6Xi6A8SLMaHbrXJ2j363h5vS/x1bzENTzX7kWz8S7z1RpCnvvScF ls/cOvon2VWiFYXudJHijRHAQmfQjE3NizmcK8C3P+iLrvSOc7O7x7s0JNSNEtLKbuwx DtrQ== X-Forwarded-Encrypted: i=1; AJvYcCVQTjPI1Yx5DPVJugS22FSCsZSKcYfAlpL9qtxTkbVzIA7yXVFJqnV4JB8FubXV0vuwsiw=@vger.kernel.org X-Gm-Message-State: AOJu0YyYO7LArYvD3Yh0J0IploZyWyeXTLmsmYYFUMJytw9/QS09e+RZ l06oJ4xyoOKnOH0bLBJIHg6BynFFWhysfm9lJYSC1lEOLPDfOEdjgPUwc8QyDPU= X-Gm-Gg: ASbGnctpaRUD81my1IhmR4Nuy+SE2BoApoTbcmFUd14xBewIlmihFTjlpdPUQ0ZuGv+ +yQDx1/kkgpek8JNz7koOEuPs3gE1LwEgtRqWiEdn70M20uAmhMFdZ86RdojN4GDk/tOIrnN+aK RjDvk3peFWx3J+B7gDjMDRNwPLjyoCINsI6SEaWNM8rV/dKIBWUnzEU7m9o6LrVgPbCruK+gRKm A9DkDIbvfaEgRPWudSbok806iZ3IoavqoUFM5pOSG66WeeZFSMdRncua1neX0Kf9ZBnHsQBX9wL 6z14sNNDJ6pflz0DIIIREZiw0u0VsJ3qMXdYTnVxhxk0 X-Google-Smtp-Source: AGHT+IHwzlIJ6LxZBvPsjg5l1kKbXhEFWIu9N9qHSrE9Y+TBbc5aw9FWPh64Zl9aShUUkawUwyHzSA== X-Received: by 2002:a17:903:22c8:b0:223:517c:bfa1 with SMTP id d9443c01a7336-225e0af0323mr191813145ad.38.1742236470577; Mon, 17 Mar 2025 11:34:30 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:30 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 05/18] exec/memory.h: make devend_memop "target defines" agnostic Date: Mon, 17 Mar 2025 11:34:04 -0700 Message-Id: <20250317183417.285700-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Will allow to make system/memory.c common later. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index da21e9150b5..069021ac3ff 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,25 +3138,17 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -#ifdef COMPILING_PER_TARGET /* enum device_endian to MemOp. */ static inline MemOp devend_memop(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); -#if HOST_BIG_ENDIAN != TARGET_BIG_ENDIAN - /* Swap if non-host endianness or native (target) endianness */ - return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP; -#else - const int non_host_endianness = - DEVICE_LITTLE_ENDIAN ^ DEVICE_BIG_ENDIAN ^ DEVICE_HOST_ENDIAN; - - /* In this case, native (target) endianness needs no swap. */ - return (end == non_host_endianness) ? MO_BSWAP : 0; -#endif + bool big_endian = (end == DEVICE_NATIVE_ENDIAN + ? target_words_bigendian() + : end == DEVICE_BIG_ENDIAN); + return big_endian ? MO_BE : MO_LE; } -#endif /* COMPILING_PER_TARGET */ /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., From patchwork Mon Mar 17 18:34:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019859 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 7F76E1E51EF for ; Mon, 17 Mar 2025 18:34:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236474; cv=none; b=uwGj5NkjvNFqIgikfW5uFwNkMo9hH79HEGp6MYibQsyB8wlFLbEvB+vLLjTLjOrJX9F/y0916jQ4sSCaQuzrJNEhGStdv3Uca7H5t1u9JLufP0Gom15f920GFgiXHGp60qP4oBgTjXS3Bf0TllqF8e4ciIdTIKNL/m0Ihh8F7O8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236474; c=relaxed/simple; bh=7ZCuTPyFqkaspTwPhH/SEirOAPA6rDicmFwNtDxEP7g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UYx3ydRIKZkHNM7hjnzxheUZ2hG/8J7iGBd+MwIMBPfHbOJp+EsgLfuCCoBvV3xDtG0MkJzfDO7vRLrmsFi7z8mkLPFf3/shNLtdcn5W7C55dJwdtASbeLz8/E4THpBzCAPHpsqFVjAD79aot+HJsf/LDHOjwH4jDWGk0hnFBl8= 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=F6j25ppD; arc=none smtp.client-ip=209.85.214.178 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="F6j25ppD" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-22401f4d35aso89734795ad.2 for ; Mon, 17 Mar 2025 11:34:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236472; x=1742841272; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mZcjdDtX1Z7JVvsuWgguTldfqVr7ZBWkV3i9i17ooa8=; b=F6j25ppDTWrwRE0ekl9lOcjxTzkCYdBZ2QGB5jX67hKSOwDV2U2gdgHn6BDqIuHMCO Qz6BO2Efg7Abkf/iAqio+f9d/lU5rAwwj0njA98TkV5fqHqW6IcWpPi4c/82TDQ8h5jo O466sCvqfbuKbur3vMMAjewWmMnuw8vWJzeQOQFCMEdHec0iJgTHo2p+H3G2GwAt6zH+ Icn/4RP1KgPSF1LIcDHcXP/DihvBl9su0386k9vncGtKNROL3TX0NCvv31GtrVycQ3a7 BwQuXj2UQGWuMlPIWx9+mKQwyUHshP46UEP1M6G7hkoDKsy0FJXkuqhGLFAouemhoiK0 qztg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236472; x=1742841272; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mZcjdDtX1Z7JVvsuWgguTldfqVr7ZBWkV3i9i17ooa8=; b=bPKO0BnRcfiCf1IzsldsnBcpN2lr4zencIPolF7yGs+WtzsgbqgsZGPSAYRxTcZ+lD chE66YRk2d4ZkQ9OHkXHCT28LXTTYwvKMyjxSP9bTW3hf1wthe7Q8QNm7ElQ8UZIroBh W1JZ8ROA6eSZEtqXOEul77B7+i5OkvPcgt8mmxoPA/NZq8hIlOS3p8jofaH0NA5S35ad /asjXvDW3J5XzbXXnH9koXxXeXNhSVTXdCFmpfgSpVmlpZTuTnLvgKbvcwdlAS/4LmZE +HY37sw5vyzzmhy4oWW7sYh+85BgRu2WAuyoJRMMC9RF8AINEbdiUI13M8KSGM+7uGin o8lg== X-Forwarded-Encrypted: i=1; AJvYcCVLQuhYcJHVVNKbSQ0jK2kIPNzDCB7pKamOQscIqbUYVvjVjXjHXf6SFIuBN7Mv/4YI8pM=@vger.kernel.org X-Gm-Message-State: AOJu0Ywo222bBqBarShe7aHTa+exnmVTDmewarPKdIfQ9AlQDLoVDw8p tHDmF5e/pkfRBLgDjuSw07pn0LrpF/z/x1ksxrrY2RIItMEFOzYKVBEvZZ81Rlo7FMN/+pLFdds o X-Gm-Gg: ASbGnctBD7byy4UKHhfJy8WaniAFyBB6MASKPIOJCkIt24sZG4IHxXF+ebnb58acpYm 7F/PdjV/4tzTaALCFcCLrNZaiXfxIwLkW391Az9IYioXyp2l8xbNNXtJoXOMiuwLtc5D6SA9drB vA4HriEWNF7MG5O7Vc6hHbtByEjyV1gafgvU/boz+kS+F/fhSQfhU+bP9IyWAXlTsx0DrlovZRt QqpEJc1i6Eo+RDygdbmZ1TlHg1uXgggZLXG69gKGVFzdSb00EldjN1u/6PlaTdNS9y6W03lIMPV 0V0cFR1z9WtNYeJAfgvG59nKvEHa4yMB6Oyvxz0DAGOB X-Google-Smtp-Source: AGHT+IGNO8bUyUW0Tf64WVNf5jONex1ECKej9xrvhw7mQgHMktiWmZ+ZuCh9rC5TGEXL07arJnJidg== X-Received: by 2002:a05:6a00:3c81:b0:736:5544:7ad7 with SMTP id d2e1a72fcca58-7375723f949mr818617b3a.14.1742236471771; Mon, 17 Mar 2025 11:34:31 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:31 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 06/18] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Mon, 17 Mar 2025 11:34:05 -0700 Message-Id: <20250317183417.285700-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/tcg/tcg-op.h | 1 + target/ppc/helper_regs.h | 2 ++ hw/ppc/spapr_nested.c | 1 + hw/sh4/sh7750.c | 1 + page-vary-target.c | 2 +- target/ppc/tcg-excp_helper.c | 1 + target/riscv/bitmanip_helper.c | 2 +- 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index a02850583bd..bc46b5570c4 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -9,6 +9,7 @@ #define TCG_TCG_OP_H #include "tcg/tcg-op-common.h" +#include "exec/target_long.h" #ifndef TARGET_LONG_BITS #error must include QEMU headers diff --git a/target/ppc/helper_regs.h b/target/ppc/helper_regs.h index 8196c1346dc..b928c2c452d 100644 --- a/target/ppc/helper_regs.h +++ b/target/ppc/helper_regs.h @@ -20,6 +20,8 @@ #ifndef HELPER_REGS_H #define HELPER_REGS_H +#include "target/ppc/cpu.h" + void hreg_swap_gpr_tgpr(CPUPPCState *env); void hreg_compute_hflags(CPUPPCState *env); void hreg_update_pmu_hflags(CPUPPCState *env); diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c index 201f6292033..a79e398c132 100644 --- a/hw/ppc/spapr_nested.c +++ b/hw/ppc/spapr_nested.c @@ -2,6 +2,7 @@ #include "qemu/cutils.h" #include "exec/exec-all.h" #include "exec/cputlb.h" +#include "exec/target_long.h" #include "helper_regs.h" #include "hw/ppc/ppc.h" #include "hw/ppc/spapr.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 6faf0e3ca8b..41306fb6008 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -29,6 +29,7 @@ #include "hw/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" +#include "target/sh4/cpu.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sh7750_regs.h" diff --git a/page-vary-target.c b/page-vary-target.c index 3f81144cda8..84ddeb7c26a 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "exec/page-vary.h" -#include "exec/exec-all.h" +#include "exec/target_page.h" bool set_preferred_target_page_bits(int bits) { diff --git a/target/ppc/tcg-excp_helper.c b/target/ppc/tcg-excp_helper.c index 5a189dc3d70..c422648cfdd 100644 --- a/target/ppc/tcg-excp_helper.c +++ b/target/ppc/tcg-excp_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "qemu/log.h" +#include "target/ppc/cpu.h" #include "exec/cpu_ldst.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" diff --git a/target/riscv/bitmanip_helper.c b/target/riscv/bitmanip_helper.c index b99c4a39a1f..e9c8d7f7780 100644 --- a/target/riscv/bitmanip_helper.c +++ b/target/riscv/bitmanip_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" +#include "exec/target_long.h" #include "exec/helper-proto.h" #include "tcg/tcg.h" From patchwork Mon Mar 17 18:34:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019860 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 754171DFE12 for ; Mon, 17 Mar 2025 18:34:33 +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=1742236475; cv=none; b=n/QjYbUeOcogGhAnWoUSu13GqTXEZ02bpcyjrq5BMmLO/G7GSoSG7gvDIWrYFNj7V8O0S8MlbwM73A01RyciQhwb/XcU5Oz2xpeUAj8jDcc0ZgbWFClxTB0QaptPhHYmWclZg/7bjgqtyQ9n+9Fs1FezzdM3Yu7ds53tyIzk3Ns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236475; c=relaxed/simple; bh=aHcHDSCEQG/Lxg84jg/rjAhvQowTiiMszTRoQh+zwoY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lWInED3hVJHLYBPSOnsOJMtsfORwYd5Te0QvENusv4/L9i9x4sljRMhoXdDlD7/UGHhMbvgqyT5g6YSv++TvPh8tlpxNAWs/lqAJ8p+EuOY+9ugw9d8crI+TKXY1ksg7vOeuRxgXTbDIgDz0fCJNyjFdVXsAI0bFUAqjgn9+uyc= 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=INzTnpcf; 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="INzTnpcf" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-224019ad9edso39848825ad.1 for ; Mon, 17 Mar 2025 11:34:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236473; x=1742841273; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bYYGOsy+zcSjxVOnigwMonGaAhWbZB7W76ZyOX5Jlgc=; b=INzTnpcfZT6rwCfNax5BAPvP6fy05tu91p6sQ/YB8LbTPN5cvT51M9wMrb7/DUrU95 Hz0EsLuNa9ffdCzcm7cwOPCIYBEY/DVapvcuQ0rPqUefVBAbE5tUM3/XAMuHtuKjYjr7 YmT/zdT6HrcYJLj8AuvX/FScWq5jkLlO/0arQ0ujqSvlNtGbkCIHvjfIMNSHBLapqi8k 81jMlOPCQ8viLTVUxvM90Y9xKsIVd1Sk3vX478j2hNyLmWn1rHkGeLTIRQyzNWrv/qgV 2ktj2K430ZSbtnc1EWqB+VHunDtXh7vwd4U2C/1jLcy6CGxzOwufP1MUp/1LwNVJCOSQ G7Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236473; x=1742841273; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bYYGOsy+zcSjxVOnigwMonGaAhWbZB7W76ZyOX5Jlgc=; b=N1+ws2G7BIVe/qq6RqNKqAcJ942tFyUj3Y/BXr/OhNMhfo3GK1Jdg2mGiSvZ6Q0kWI cbrvZ95HsKi1WKPgArXCd6A2bkhiUvTq7ka3uXMtlCd3v/1MGUfKuh3NXafpm00d0dQa 1hqrp9fwYX4H7Tx/1/4Pz5gIprgJEmqS6MCQ5v3tupi4EnBsITt9ogYoR19fL8KuwwJG nC2e4eukHuI5+rAnH1OYq/PX1ElyUhfispcA8wnSFY+sqy8L1LOCpzWyoMwDXSvrXo7u VLRDBbn+5AE+CLNELMURxCSqZCFVWW/zd5dqCQjtlFQu5/472gfvl6GKjObq0eVUEiyp TE/Q== X-Forwarded-Encrypted: i=1; AJvYcCXvSqIc6rF8CwS74TvCJfRMtv1dwMZ2N+63dlxALlRB8dkvLDowuiwvv9ovNdqOaib6zms=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0X4Q/MJow6P1mHkbAZBbia2ICvm65FCJrpe4x/DIBKDkVD+Nc sGDiiCLwUkKy8NOBQjMAHFWvzY5UQ+hDy0Tci54NMuYFHKzkgAXciRPIO5f8iXk= X-Gm-Gg: ASbGncv+EdeCm+AsJGphQacxi7950QSj/fRV9xvvNmQt0ef7kd1gTH+gtpiV5npGSu0 N0pPbx5cmlj3OhWFs/aRel6TWfkohFOR0OPUV/T20AkM7xnhkX5MzD71NqiCP7Cp7y7tDQwQwxZ oQXskMvNAq6TWrNEZD8qDgXivrZh6VIcIaHI8Vu6tHPAOP5Cyi9gTb8jpL+i12rGriSNlcyYtzg TIP3GeyXDnQRr+7BeFC/D1me4oBAb+PIAneexpQZ1z9OSJiM3wW2i2VL8CQKzW4E7JSOJv/ekkg Thq1Bl1+wp3d9jlEdTNy0TJHGWRlEaGNyzT2fUnWE7fm X-Google-Smtp-Source: AGHT+IFV6DhukzDJTQhxKL2T76dlm4rDEmTDcVzAIQ6vxy9qm1/fBJU2mGtWaSFzbonBb3tr3G7FIw== X-Received: by 2002:a05:6a20:a11b:b0:1ee:efa5:6573 with SMTP id adf61e73a8af0-1fa43cbf794mr1071010637.8.1742236472852; Mon, 17 Mar 2025 11:34:32 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:32 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 07/18] exec/exec-all: remove dependency on cpu.h Date: Mon, 17 Mar 2025 11:34:06 -0700 Message-Id: <20250317183417.285700-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Previous commit changed files relying transitively on it. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/exec-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index dd5c40f2233..19b0eda44a7 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,7 +20,6 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H -#include "cpu.h" #if defined(CONFIG_USER_ONLY) #include "exec/cpu_ldst.h" #endif From patchwork Mon Mar 17 18:34:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019861 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 C0CAD1E833A for ; Mon, 17 Mar 2025 18:34:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236476; cv=none; b=e9kRMfGKTHMgYa2yd9Rz1f+gA9CLUVFOjSUvy0bRjoJqOR6jdL79eI9BovuvpvKUbWX0VRP1uzYj+nrpoxIJ97VTLxaUIy+flSAujAaDdfACDT1n3BfuuCW2eFON3QsqMc/mjUPtq6cAmI9m8QsPLg3hvrG4CyptUzMdk4Iua4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236476; c=relaxed/simple; bh=072rJgb1v8WTOR3ndNWM1YDjHaA2UGkZkEMRddxYphA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TmlmxRrHhkt0omBc8I2yhT+RrG+vfBKomUVMlswCLW2soSafYb9/GLpevFrIutl9dRH2K4nKcJVvNvfAVN7ALXcReafLd0tfdSq/RacTGyTiVjIZ6051FJCLSchOZgWwaU+ewYNz99KMv+ljCWe4I+yPVwq9c+I4Of2lA8byFes= 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=H3Eyq5vP; arc=none smtp.client-ip=209.85.214.178 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="H3Eyq5vP" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-223594b3c6dso98913805ad.2 for ; Mon, 17 Mar 2025 11:34:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236474; x=1742841274; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Rp8GQC6vA5rTxSSazblnkjuLZPjrJAYUOFg9uGM493s=; b=H3Eyq5vP2hRLGSY3hkwVPk0vXSziMAxE1SL4RI5DJljGWECpWWml193s6mh6cnxFW/ 3h4jESg7aGlyLM+GZfHOEUOh+73hiXIhFQy5VzREAggVbnN/Yde9ClT5QplnQsUxdoZg Nnt5YKWaFw5RB8LPqU8BNILCE9xNnM/hWOkJxmlTrROD7xFsfgPRtHkv9pwTopw/Yqbe mE6SDLF439cYnXCTOctMse3ApYQw6c+LIgnInihQRFu1hBeEZp0oIP8py3iFhqP1ViB0 OOTK9XvVZs+fGXmGjhfOjC9gdBjVqcW75+MsTg9wVaqkyN2UgxlGv9VtN9/GChj4fsE1 R6JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236474; x=1742841274; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Rp8GQC6vA5rTxSSazblnkjuLZPjrJAYUOFg9uGM493s=; b=hEIiR9T7Oftz5rMgUV3wPLlCHqceTsY2BOwsTjDnMpgb59JVAASDc0rHJCHfEj3CBk qC2eNOKSv/TuJUm+EyZKuT7x1SzCAM9X1ER1u0m0Iq9dOoWGjiA58Aomtd7vU8ZGCEbH YX51kHAqu2gNW71JtaipxtY37NQFKNqr2XUhAKNGpazA959XLx0D3Za7cjqTnkGac8S3 Cnovu89D2BdJSH9WPqzaQNosDF5L6MW5Qcyja8EtjiFRac9SO5omOyKOcpQniLdvztHC ePZY9nPg0Tro6Rd63pgoZKD1L9gGP2JI2M8UKUlDH54BNZ/1Gjj2VcqB/oKGZhiA1c0Z xCNQ== X-Forwarded-Encrypted: i=1; AJvYcCVrTZ7RmPx4lG4XS00bUqo119GLsw8FVXQxnGb8x3tpPpQ619T2vSAMOYpDs47ErmQ+dGk=@vger.kernel.org X-Gm-Message-State: AOJu0Yy0DjgXWWDM30wSaULCyDmbtNyyySjranSIxjlKA0LKFbF9Bqr2 fknRvtZYoe1jKHp9JAsxCWw3nfcG0EGrjTYqYGWe4FKvhzJsDjOeubKbI+pjM40= X-Gm-Gg: ASbGncvkbmK1+lmNEvrZOrVGNTzg/Bq5Gic5ISIYyQXnefOG0L5uwEVlewrx3xkXCpv Du9zzynZ9c4YwwtbgUsdhyhvvSp8mLxLt8wOkuFzmlvt1FjeAxiCacpqGI2WBZM3s8XLavfc0k0 cPNo2BInuYQx2uKRs6oUJN+bqeE++Yf9vhqBlJxBXBtA2kERuQqdVw0BGMsQ/PD2oD5QonR496W UyIy6Bb1fyCaXl3Q6QDolHsiDvc4TSfoDvLWTtNvJAv/51fnIJhSvewM5Mw+Rk8wSMQrd2+ggF+ xOniDkwv3/IuEbWA1svyd7vRNLNJ3whq/l5AjujO//P/ X-Google-Smtp-Source: AGHT+IHGRjUHfsZhtfemIo+dlcyT/9a20csro4vrsnSjWHRpRL87+9vnxPcq6naL2TxBdu+3gDVtPg== X-Received: by 2002:a05:6a00:9a7:b0:736:6ac4:d204 with SMTP id d2e1a72fcca58-73722375218mr14371340b3a.11.1742236473962; Mon, 17 Mar 2025 11:34:33 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:33 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 08/18] exec/memory-internal: remove dependency on cpu.h Date: Mon, 17 Mar 2025 11:34:07 -0700 Message-Id: <20250317183417.285700-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Needed so compilation units including it can be common. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 100c1237ac2..b729f3b25ad 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -20,8 +20,6 @@ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H -#include "cpu.h" - #ifndef CONFIG_USER_ONLY static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) { From patchwork Mon Mar 17 18:34:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019862 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 ED3D71E1E0D for ; Mon, 17 Mar 2025 18:34:35 +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=1742236477; cv=none; b=DnkMxLh9P8/mIxROrq8i8AsHZ3Za5+nLIBlhVXAaCEM4UGgsTDGZ+GazUEzpCkvHaldjmWSq02GnveGkA6KCCORa4Usn5Kej9ciT5AkER9Rr4UTROpjcotFlShwQyUABbUob5x+WEAtAd/7nf4pWAo5UuWGUV9zd9em2QPFfSLc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236477; c=relaxed/simple; bh=rOapAhxsucTXmmvj3a2Zy3fKHxQeQMgYCuWijJzB6sI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QMje94E1POT0uehRbnhH8W1R/vGhqENP67HiI1ko/XFNyiUZCpVYL576pjENuQkWjgbclgEy0jH1DeeaamDgHnwjOt4tu6AnhF1+g/nCDY3Gxeu9d0oQ0xoJ/94pwFUS2uJN96kr5nCzOo/fOhrVNo5KVExiJZebLII+GzxfGwk= 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=uF1GTfM1; 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="uF1GTfM1" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-22423adf751so80104195ad.2 for ; Mon, 17 Mar 2025 11:34:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236475; x=1742841275; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PfpTTedni4gUGfvRcfnvXw4xTvY7JO0pNjOjXTZ7pI8=; b=uF1GTfM1NcrVzSEhurpRTwLo7+z8FOTrvoguiasWQKOBDTubMmt2ughLHugBLJz2+W NITTXKVojBao9QRmEE6iodb9cWNByfKcqBytS4mHtwN9QS576KdJblVG3Ng5+DM8Lumv GllczqK7BI2rs2HsFqGwgisb4+wC1tw16oVQn/uqU+jLGqKAwh641GcEIJrwEY4g9VsA 6pbbLxaPR9Wr2DAclcsVzTIdBev4SR6Y7pYrEmjHzRGKmC8rFSxyMdW+qvRhSgyWNUB8 ifc+i6fnr0AWiiygb8xV3wDTPrWd7R7j9Eyd5MUZ0pSTTUovpzImFvmYZgQoMLKrMG6g SbvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236475; x=1742841275; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PfpTTedni4gUGfvRcfnvXw4xTvY7JO0pNjOjXTZ7pI8=; b=RZorkISZpw7vq2AbkSRTZBVoq+PhUFHKYqa+gvMFWuj+KWMy52gBrPFf6NCwp/0WTo zQOdwDhtk7h5mhpIxrV4XULVjNylhr8HIE7J8WVWcCnqd446sUynNYytiCl/t5Z5QagH +RtJ3J3ws7WsC/1rv3lCHMkZJH+feB880kHa6Dct1wRBd/SclIGCaHwFPaabcGX2lnCY mTUU903V7LBBWWfKx0XxsOWkOcDKBlDs+CknPNur/fq2mYTQA3h0tdqRXJpiQA4flUWq dGaos5zWJJEeF/nkYC69e63YdoSHfIK8ZGnRDcpOy5Bjy50YPsJv1THMHbzgVQ6AAz9k P3qA== X-Forwarded-Encrypted: i=1; AJvYcCVWgo6wBCIbXY/+/Q1Jv74r7lfV2ww5bv2Yz2bkXz8b1OE2cT9sGCO6ty7MxyV5XPgBSnM=@vger.kernel.org X-Gm-Message-State: AOJu0YxH/kDfOFJf61lCEQHYWGs2wXPvO8geRaakY6TTbS5OL3oDAiHF EjbiBZj23rQFlbOuauQX3ZDSZDliEyozn+MQ/nGJBr44aNpIJOIEZxo94tcwYgQ= X-Gm-Gg: ASbGncuJTsY0TmxrTIflvZcWmrBEkV/uEM8qTF8yxcXrtf6gmv2CanNrUyeLGhzhy4o r/y3AgQvvlLQ23d0rTQ63Ow9Qd5MPBTaSOkjfEtyBQ0XwJupbFkwhk1Q8inv+xHp2hpjexK/V10 VX0fR+wRALLOgPhiv1H7FdFpIrDFUVJ5/Ok9e8GRs4TzzhIhepzjE6aPbQdRmYXm3na08uyzFkt 1DYDCYYpUUO2XUpJxAqw8bGdlOHO7FY+C8/RIyX1T6vn0m9EA4aLUqOyTjB9oi+Bt+TK6zWTQnm ++8a7dLcxtTmwNfMp3gh3aUK/MuJnFwBBUSc/sxiQ2r6 X-Google-Smtp-Source: AGHT+IHhIUK7t53+vTI188pQaTMyR7EJzQqReYcVMpj4OefpwS1cjUKc4hsfvFYLapAGzkczRRlDcg== X-Received: by 2002:a05:6a00:2196:b0:736:a6e0:e66d with SMTP id d2e1a72fcca58-7372238f773mr15973995b3a.6.1742236475108; Mon, 17 Mar 2025 11:34:35 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:34 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 09/18] exec/ram_addr: remove dependency on cpu.h Date: Mon, 17 Mar 2025 11:34:08 -0700 Message-Id: <20250317183417.285700-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Needed so compilation units including it can be common. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index e4c28fbec9b..f5d574261a3 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -20,13 +20,14 @@ #define RAM_ADDR_H #ifndef CONFIG_USER_ONLY -#include "cpu.h" #include "system/xen.h" #include "system/tcg.h" #include "exec/cputlb.h" #include "exec/ramlist.h" #include "exec/ramblock.h" #include "exec/exec-all.h" +#include "exec/memory.h" +#include "exec/target_page.h" #include "qemu/rcu.h" #include "exec/hwaddr.h" From patchwork Mon Mar 17 18:34:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019863 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3B8F1EB1AD for ; Mon, 17 Mar 2025 18:34:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236478; cv=none; b=RIRxyrj38y/JdwM+wni41L0oX1kqiUtpuGbLIefw//R+/96GMOgAy5MtBrJJerGjRhBKLBllBHnTsx1ZMqAh55SZLAArYrunXlMILt50Tspkn3JqGAf6+N3yfr40gXoFAFiCyJG6mI4pUi7npctr+x28GLCdqcFnP/NrQmd6fBU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236478; c=relaxed/simple; bh=eZxW1HUQDLqOK64QD3ZvyFTEod5DwQVKTFd8dmVQepY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dvkMPA2+NaquOWyLmkCKvq58svg+8/dOyuXCD03W8Pj1O6tNyEnyREZHiHiq+MWJ159XiLzuH7WVy8EznI8JK173RMh6bBLhRe3gdIv/FyZH//bmyPW2XbHcH0VeW9djCepsFioQ1AVeVXs/nYjvg9kzAxma/Wpzc6FxWt4Aoz0= 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=JvU1Xktd; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="JvU1Xktd" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-225df540edcso61414305ad.0 for ; Mon, 17 Mar 2025 11:34:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236476; x=1742841276; 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=JvU1XktdPr825gXA9WP9zn1CeD4kjniwihek21Zh+8tc0XfBFNa8o+AMFhMZvOClaq Kk8R4n9hKAjOqG4yK4CJGniOoTryO0HVHlS386v7mKjPeFdM49Ft6GExHhN83Gx37j8A gGacbMRvfMdziSc4wTVfO4rb8cyy1upBbtC+uL9oyxPfmTPU+nxWNUf3QThOvxhtS+ii aEYu1tmnEgydXrnqt0gzF8cRnmFaKfrsskrJ75VM8ZhJpbUn7alshAHtB20BWapr7RIU U52DdW9w2sB3Hcku4oUJ0NQX4EClQvIxq7WDAXqp8alOqxKXmUOSgwOX3yUkmcwpp/sJ LzIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236476; x=1742841276; 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=CjlShHdnXL/0VAhou0n20nnJ+tunuGdfmgoh407D4fOH9D+beOUoGYaXB4jWWlDXMa IkZftB/FOboJkx4o4v51xbD9u5n2oSu8cj8gdcI70YjKe3xf/P6yqRNlt1jXcpaRtNrq OyjqBRNEGskpT6Ovl1OmZkQuU4c34EdThyU99nDBbETmag9zoxr1xDWWshorXp/xAxdp limTh/YOIub8BYsk2dtWXXm+QNmSoBnoSwb0EO5M5w83JfZrfSyOcXlkRMwCEhRsyq2N sJ/EpaIHlD8Tyie1ZRWkaPLNOSSDRUjS799ykGMyNQM+oP8t6tCQlO4luV2QcMcgi4ns Lfww== X-Forwarded-Encrypted: i=1; AJvYcCXFhEfcVdngaMLITFfWWOckhJ5IqIPFOOuQfrOJUJd1drvaKn3m4l97IB4Gi74Q0vmom2o=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7/0GuPI3kYwHicnK7HeN6F8p6JINWoaGdMJjl6ZQ2ur0qUcuq txkTP0rSIlLwhXnBTWbyx54eCYQrkizHE2kApg8XFVo2xoTMhRZjL6mB3rQv690= X-Gm-Gg: ASbGncvo9KupDpaiCgP8FK4fCBtWVoFF1jGZUJ7JXX3u7uLPoFpD48FRTW7GsC0ZoXa eWFUXyT9sGIMv22brRViEsvM2Qdr7LhHqYdg1tT767yi7dHGZLQbDSb/gjGNe0ZQQey2Z9boAy7 vEKCuwBbumfwAl4nrz2eoiJbsXhWY1koYqsrDtv81vAEXE/n0bW0Kw6YkIKFCBDGLnrEvAfr65e g5VW8Ox2aXpyqGyYiHjpxN74vw8njsp7lUdv5z24Nj9uv54Mw+z1iqCwRmcaeeg0hTKaqCXHPHi X++XLelo+LvnoMqkZHQuRJkz4aGhGHms75zAnLqh7snv X-Google-Smtp-Source: AGHT+IFrc3E9fUAh+z3i68X6oJdtySmjNUcFSLSYjTurJl9vG25uO/0RkrUhFSmr8bwDc6/U+8pjrQ== X-Received: by 2002:a05:6a00:3b8e:b0:736:b400:b58f with SMTP id d2e1a72fcca58-7375752916dmr715700b3a.0.1742236476193; Mon, 17 Mar 2025 11:34:36 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:35 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 10/18] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Mon, 17 Mar 2025 11:34:09 -0700 Message-Id: <20250317183417.285700-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-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 Mon Mar 17 18:34:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019864 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 0F0E91EB5C8 for ; Mon, 17 Mar 2025 18:34:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236479; cv=none; b=PDVc9ewAvG7p/hs0/LgM5pNH0Tbfw3vLS/Qae/LE3JJ8hx2VIcEaC3D1WJWAsW2MMWP8q/LT00tRtkM1LdImACZmQ68sGY28m5RPZzne92sW8Ec6kjF4BWhrbNMrwUHQs+RxXOZ+MZ7f27JoiuJqfCp3msO/g3uZBtSEejSWBNo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236479; c=relaxed/simple; bh=ym8vi7HBFMN71o/ytWbPTEvymne8dwvUZJtelFdMdmA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=B9P5m8aDbvrWgvaM3oKwYW+d7e5s/boLR3MJQJnCCEnQZJf6tXcC8yqclHUE5CKM4Ho2FeWXt4/Cuf87gnbXiApLv90419HF3PnrqJmJ7hUgd34LeOZjje11BrA+OSwVdDDf1TMjlsB3mRolL2jtAoYS3N0SKhCFcjSgnWRSzx0= 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=g65ACxnw; arc=none smtp.client-ip=209.85.214.178 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="g65ACxnw" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-225df540edcso61414625ad.0 for ; Mon, 17 Mar 2025 11:34:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236477; x=1742841277; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PABH8iZPN9WF+wJr72ZMp6Lm7i1C+9jWBJAvssLik90=; b=g65ACxnw2mr/bPPWo//ZKBsAX0WXcaOjUFCEKK6pZDFpiWN///RPfB/YZ0Wfdno8SF 98chrxVnVbPmAp+k2a5i7VBGDC0BZYdahtLOPMw/lKDTUzEjLEz+BSf3B1OIUmFO7+29 VkpL2CavQ7XrVvUZ4hKn/FXd98mzjwyCNWtVy6B/GSX0QIYwrpPbCSzypVlEEBvxn9Hr RTPfoSGrlzYMeH0lYqt0ClrkR8/JOc5Y8d8BEM4OoxRCe472pZyxsSCeiJvV33YyDZi+ y94z65G3qjjGtrZCzG8vYvjQKRUpzeFmli5K7jXW556c4yyi/u6nnappMn74AgbO8VDL Feaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236477; x=1742841277; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PABH8iZPN9WF+wJr72ZMp6Lm7i1C+9jWBJAvssLik90=; b=J/ihwEeLP4DCJqTF1foxaqvXHwgnX6i/9d+DTL043NOd521r8Az6cy63RM09Zt9vdD aLrLlwl9WiD0vHGTj6AsKkw7SKhwQujzbqlveOlgR9l0mGlEntTElCNYUz6c/82rgEAa DLykZ1Ce3k2FN0d2EJVnHP4P8ETKBcGNqHv4YgjkgJg3v1pZczCDm1rp6BaFZHZ+8JHE 6PplWe2cMRsFr/Js5paIkS45tqlIuSIfiOdbA0cIKvaCcPDEQ1wG/Ea/POkz3O6queo9 HEwYysQpX5hYhby0ILixg94JEor8Bd+WFl8f95kXSk4VGr42kS3OfTxZDLETp6W2mCKn f2NQ== X-Forwarded-Encrypted: i=1; AJvYcCUtG0vNtePMU7l/nslWLbPOrjSXI0Aw5/NtEYCwOGRsML4H19YXuNeCDSJrGxOP+P2s10Q=@vger.kernel.org X-Gm-Message-State: AOJu0YwksKVLtCZeOCL9ZXK1362uRIOlCrGhBvhM+jIwRZal3UyRnueI t5/UtrRL35e9nB9q8RhxdTlvEW84YgC7lAH9fE6iQ9Sh0ima5iCDz/6ssZLL0Yg= X-Gm-Gg: ASbGncuAHONpOr67IiRRoSOxfMlJZKKYuuak1U8C4qFu/vo/yhH8kOYktHpBD9ZvGJO 26FefS9N35ZEMzyKqEWquyXVUzrw/z77FuQdV54lAGVyyUT0XAE2CjWe+CT6V3tffCYQTfRP+0c y4mMPpX9upGqkyFuL7WmW/1RV62cdBt8OB4UC/UGmYTbmqaYYGg2HPkruA7MzfjeawM5GHkxSkw Dyk6hayBgoYKmuLpZK+MgQVvX41TnomN9XJiLNgM7Y66pgDj6DDhreYyhHHYvOwWi5P8rtqLxwY ElpFTqg+DVAyq4k4c0ZcnmJPiaiOWEHYOYJWF0Q7SWGs X-Google-Smtp-Source: AGHT+IG3g1g1/S4GhLMViIQmdttYJlPvvQDr2HFvFncsoI+sX7+pFPl4do/KG0rupNOCudw5OLu0nA== X-Received: by 2002:a05:6a00:2d8a:b0:732:5875:eb95 with SMTP id d2e1a72fcca58-7375778c1femr704383b3a.4.1742236477316; Mon, 17 Mar 2025 11:34:37 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:36 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 11/18] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Mon, 17 Mar 2025 11:34:10 -0700 Message-Id: <20250317183417.285700-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index f5d574261a3..92e8708af76 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -339,7 +339,9 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, } } - xen_hvm_modified_memory(start, length); + if (xen_enabled()) { + xen_hvm_modified_memory(start, length); + } } #if !defined(_WIN32) @@ -415,7 +417,9 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, } } - xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + if (xen_enabled()) { + xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + } } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; From patchwork Mon Mar 17 18:34:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019865 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 1CBE81EDA19 for ; Mon, 17 Mar 2025 18:34:38 +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=1742236480; cv=none; b=P7oHjj+Naq+nMX0g1hu3RDpS2EZRe/xTq3lkC5p9Acu7V3t8QQLjy5jGZqC2ZNmcb1Q6MLcFXfawa0POK/PEiTXNpNAJ3p7TjHCU5NHo4z5wOUDZ5KofRs01//Nas+aAab4u5Akr7TU6kkWdoZdYfZ1IOeUUDjavdFIElqkDtyk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236480; c=relaxed/simple; bh=iKKLIJd9FNajHq7HD2C4hiCWB531yc/zeXL34A64mgQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N1r6IvH3hVdZ+Bw98TeANi7zjKI0LLn3+Oc42Z42bzZBf+R3t/04gtapfiYwSmXt5HpxFj0Y5nZf1qxFsaUkbXwtV+X4nDu0w05m19TePqEA2exMBXuFJ6/Bsg6veJ/NRlZkhfxXXv/hGVjrYYnLiHoANUapGr4ipeaxPnCJaFo= 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=rAocUVsi; 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="rAocUVsi" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2239c066347so99592355ad.2 for ; Mon, 17 Mar 2025 11:34:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236478; x=1742841278; 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=59c6JEMS6FIy924v+CKtazEU0ebGAiMufvTS4mzCbJo=; b=rAocUVsiFgzbN4fDEaLlR1lnRABls8yHiDyeRWQxlqw6iKHz0BWcmdz4vgFXTG7AWp /0Poj+FPpIEtl9MUD3syE/7o4AkxbnT14JgtNkHYEziASMLaH+VN1nUJMlaASOjHWjMM hLRA9Xi/FW/SIXNGJ5Tw7yZMSl7OGLf2gf/u0kNpxcvQ0m4fGEz1M3/oLt54DQOXRDgr UEBjfV3+clP8P8LT28XRQJu+IClVaqcDk2AErhpGSZBqJ1EDQi0+/MPCqtUkuAQPuAzq LQMHjwuOKnocimXMZgVlgtKg9vGaMHlEhXWUhumFfGuOqHTbpWT2pkxQpKbYOpmCQzah NNRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236478; x=1742841278; 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=59c6JEMS6FIy924v+CKtazEU0ebGAiMufvTS4mzCbJo=; b=FUnodSGjSiu0QwvEoWofFJ15jFnVDekd2FZN3B1xEoMpE95HW5VG4vuoPwzs55jWAn SOreJtTb1rN3R/IZZVg+fBciZjnDWggYcDvXJ246o2ttSyohYK0fHfbSrPjG6nNWvCxq I/NpeZuah5H1dCR5+c5t3S+SzXkul6T/jP1MobanpE7wrpp/0b5BN509uPVZq7bfyKWL doYXeXLJsV7Mn/MLkM50eeHJT51dwgU7fx9uL2aacQF4r3FNPeMq5nqCsUXfY3XNnMkH m0UKKqFBctz1By7TUXifbOcN7E2o/QjyCXAwy9YT0wHYMRY1KeCVTKl7nH/wQFH1mRxR +CcQ== X-Forwarded-Encrypted: i=1; AJvYcCU56U6iOy1inrCJl+3i29sNSY2eaZDk3YNXb/+5URTbatBcc2TXYICSre2+5JP7v/BwPec=@vger.kernel.org X-Gm-Message-State: AOJu0YxUPZJEfpmAbqp3KEKcDgCLnqwcsW5XfRa9I8rv9FEWvdlJskU2 nsRJ83QrifQvqzLI+jhrCmUMrzJx1HS422q7ZNbD1FssSQ05LFNuC87UY1HlBWE= X-Gm-Gg: ASbGncvYjapjks0/Li/WuFZKQKJGLxC8teSdlukobZDUhAz3pP9vnvURMSqFql8R7qC /Grwufz7pb6nbUUYWR0ewU41MJKNNKduoj48tSJhDchtSf4l5c3hS748p2fJQlNvhPFiPEttErl MH6Xgs3mMRZm12jesDs8v/B/OaTUVD2rDivbQBcGiXCejwWDUdrvDrrJV+9BpR49PqtBk5BGbaD pVP4HFIsnQ1K9/iYhPP01B40i+8gUp9Fgz+1idcvRMDbmborF1wJCWTEqD9mnWd6Ph92IXoqJqH qFbIghDhMHM9Z1YoLHtPoaOqyFF7RRkIfi0KC/jwuioN8Jf5B5ZCKxw= X-Google-Smtp-Source: AGHT+IGMBPlS4723f/QfXCi2z/TEFSVr/xLDSBzcEDnDoDIjYYHTKxD7//19rhfel7oXOjNf8/+suQ== X-Received: by 2002:a17:902:f711:b0:220:fe51:1aab with SMTP id d9443c01a7336-225e0af4f9cmr187594395ad.38.1742236478508; Mon, 17 Mar 2025 11:34:38 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:38 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier , Anthony PERARD Subject: [PATCH v6 12/18] hw/xen: add stubs for various functions Date: Mon, 17 Mar 2025 11:34:11 -0700 Message-Id: <20250317183417.285700-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Those symbols are used by system/physmem.c, and are called only if xen_enabled() (which happens only if CONFIG_XEN is set and xen is available). So we can crash the stubs in case those are called, as they are linked only when CONFIG_XEN is not set. Acked-by: Richard Henderson Reviewed-by: Anthony PERARD Signed-off-by: Pierrick Bouvier --- hw/xen/xen_stubs.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ hw/xen/meson.build | 3 +++ 2 files changed, 54 insertions(+) create mode 100644 hw/xen/xen_stubs.c diff --git a/hw/xen/xen_stubs.c b/hw/xen/xen_stubs.c new file mode 100644 index 00000000000..5e565df3929 --- /dev/null +++ b/hw/xen/xen_stubs.c @@ -0,0 +1,51 @@ +/* + * Various stubs for xen functions + * + * Those functions are used only if xen_enabled(). This file is linked only if + * CONFIG_XEN is not set, so they should never be called. + * + * Copyright (c) 2025 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "system/xen.h" +#include "system/xen-mapcache.h" + +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) +{ + g_assert_not_reached(); +} + +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + struct MemoryRegion *mr, Error **errp) +{ + g_assert_not_reached(); +} + +bool xen_mr_is_memory(MemoryRegion *mr) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache_entry(uint8_t *buffer) +{ + g_assert_not_reached(); +} + +ram_addr_t xen_ram_addr_from_mapcache(void *ptr) +{ + g_assert_not_reached(); +} + +uint8_t *xen_map_cache(MemoryRegion *mr, + hwaddr phys_addr, + hwaddr size, + ram_addr_t ram_addr_offset, + uint8_t lock, + bool dma, + bool is_write) +{ + g_assert_not_reached(); +} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 4a486e36738..a1850e76988 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -9,6 +9,9 @@ system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files( system_ss.add(when: ['CONFIG_XEN', xen], if_true: files( 'xen-operations.c', +), +if_false: files( + 'xen_stubs.c', )) xen_specific_ss = ss.source_set() From patchwork Mon Mar 17 18:34:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019866 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 47B531EFF90 for ; Mon, 17 Mar 2025 18:34:40 +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=1742236481; cv=none; b=UwgnSnd5THOZb4GTYhX61QY4YpgneCj/M53iSxyvjAoMEjSK080biWuYi5H/miOV2PiJCOHk9qWckWaPiXtJpVh/+2Mu14Lj1VBOhHvQLnN1blFqIm7Wai/1sKtb8M7eqz8P7gCJAD+gcQMfkHfVhiliPPC/XIaE6tXIISf1ClI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236481; c=relaxed/simple; bh=s8RXw4zrEgx/HfXiIysdDtYZAgo1iz1ahy1OQXodoK8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=tUziGDZPtfCgjfQqMRjtmVhfokenBruR+8Knc08cLL8I14/MY5NqXpmxzs20f/0pX/UlpCkjYr2Anas2sX6ja9q6A/Q2xihZ7kqMJLNT/2gFj179tsneWrVpmaBMwDdPkSqvKwJZOkW421/fZq1l1YjAG08wVy9FmNEpJZMg4ZY= 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=wYQ2qG7j; 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="wYQ2qG7j" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-223fd89d036so95211185ad.1 for ; Mon, 17 Mar 2025 11:34:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236479; x=1742841279; 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=RL1NPApLGPlk4f7q724/4D7b3IECBRPwWShMeYRIDxA=; b=wYQ2qG7jbMYMhkccV+n2hrv8qxspoVffdYvpA7a33g2XYjz1N7kqP7QgZN9gA6DDZL CrAyZbzPeAnRcTQKVc0EQDFcqzwqqKoJAstPF6Ma+AJZu6AdU2QxVva0MdiHvr6Utldm RJRn0ehnTzHBIg9PMmBdmKsC1gPZiBFb892CtPFkYmeZ58As+Lfzj1I1WtmnmjaTDYKA 0hS98mJWYbdmx295SCoCKn144vq1zo2vz0ZrcPsh4zSpA3KjW7WcO2LPvpVkE2JuF84L 5/bAtcSVq1mftusZSZk2n7VfCmqrdoR4U6Lj1rHnaP9KaIsKZK4a24PH45BVsjC/Eu8z aQPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236479; x=1742841279; 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=RL1NPApLGPlk4f7q724/4D7b3IECBRPwWShMeYRIDxA=; b=b2c+GZMPfKz5ffE503FKaiKCXCskQyeP5TuMpJh3m/JdDbx1/rJ+cjBT550buGSSrE lwS8dcggz/7I52qXokVbLHyF9aIAVC065z40OV1pqKSyZr/XaG6JWiqx4rpah/DoVu2a 2iL7BcX7uOzcMFpRqF3BpBeIE1CVVV9k1livsNSofT+sQoFyC+9nVectMaS1CqZG+eBh tXiSxeBm7d/8fsbZ3tNThaHbHI4vksnrRsDKFDmXobvsTwe5sjiW9d6hyyuOBOHYG2u+ 0IARgnu7x9petfeTIPbGlmERKPP40okC8Kv5abh32HiXD+GjUCoNjsH+uSzTaf2/ayxy whOA== X-Forwarded-Encrypted: i=1; AJvYcCXj+OyNRVlHM82YiNVvYNGh25goGUd23v6iF4lSCa0ygyQIZi8MnUPfs9RZ2mMYbufzrj4=@vger.kernel.org X-Gm-Message-State: AOJu0YxYXf9mKinpmFWnUKUlMYcS+is3RRiDL6odJElsvG9oANafUkEC zmzsyyoM6MQ1doDnRAFtLMwEDP0sF7sdzKCOA8U0Hjkg/eOMbHgOLyE0GzRkJ8w= X-Gm-Gg: ASbGncsyUm+GYKCcpcMqfbl1wJrINS2fWG9SbIiZa+9EDGeLQvJezufcj8uFTXz2tL7 rtXr/tIcKJ0BCDIaOY51L1O6u5ME9BfDmwHYTwl3r5Z1uvhJldZi6LYNFMv28pX3fLVBiOi7u2I cDpEvDjCzy/K8nc/PvEJvDTWvCo2BQz3YXSGI4Tiz9+Dzhc+MKfTivQkqFbJyiT5E07QFecdMEH h/V+s5IwxbxBioaoXFB+Bzi9tx8VYRs+vJ2qSNxJt6RnGmKeiGEi+KlY5C3ZyiWqJVjmdJ1S+Ek TiqGuqWlvOaYz0JTaAf9ze1cxNaeAbzEEfb1H6AglHcx X-Google-Smtp-Source: AGHT+IFOOeyV31jwF+pNrENhCRDzbP+OAMMjvkw2JiLIZfPvEZk2AdzmBDyPiAzaxdBUCsyNl+0UJg== X-Received: by 2002:a05:6a00:1c83:b0:736:54c9:df2c with SMTP id d2e1a72fcca58-7372240f41dmr13708249b3a.15.1742236479639; Mon, 17 Mar 2025 11:34:39 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:39 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 13/18] system/xen: remove inline stubs Date: Mon, 17 Mar 2025 11:34:12 -0700 Message-Id: <20250317183417.285700-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-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: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier --- include/system/xen-mapcache.h | 41 ----------------------------------- include/system/xen.h | 21 +++--------------- 2 files changed, 3 insertions(+), 59 deletions(-) diff --git a/include/system/xen-mapcache.h b/include/system/xen-mapcache.h index b68f196ddd5..bb454a7c96c 100644 --- a/include/system/xen-mapcache.h +++ b/include/system/xen-mapcache.h @@ -14,8 +14,6 @@ typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offset, ram_addr_t size); -#ifdef CONFIG_XEN_IS_POSSIBLE - void xen_map_cache_init(phys_offset_to_gaddr_t f, void *opaque); uint8_t *xen_map_cache(MemoryRegion *mr, hwaddr phys_addr, hwaddr size, @@ -28,44 +26,5 @@ void xen_invalidate_map_cache(void); uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr, hwaddr new_phys_addr, hwaddr size); -#else - -static inline void xen_map_cache_init(phys_offset_to_gaddr_t f, - void *opaque) -{ -} - -static inline 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) -{ - abort(); -} - -static inline ram_addr_t xen_ram_addr_from_mapcache(void *ptr) -{ - abort(); -} - -static inline void xen_invalidate_map_cache_entry(uint8_t *buffer) -{ -} - -static inline void xen_invalidate_map_cache(void) -{ -} - -static inline uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr, - hwaddr new_phys_addr, - hwaddr size) -{ - abort(); -} - -#endif #endif /* XEN_MAPCACHE_H */ diff --git a/include/system/xen.h b/include/system/xen.h index 990c19a8ef0..5f41915732b 100644 --- a/include/system/xen.h +++ b/include/system/xen.h @@ -25,30 +25,15 @@ #endif /* COMPILING_PER_TARGET */ #ifdef CONFIG_XEN_IS_POSSIBLE - extern bool xen_allowed; - #define xen_enabled() (xen_allowed) - -void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length); -void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, - struct MemoryRegion *mr, Error **errp); - #else /* !CONFIG_XEN_IS_POSSIBLE */ - #define xen_enabled() 0 -static inline void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) -{ - /* nothing */ -} -static inline void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, - MemoryRegion *mr, Error **errp) -{ - g_assert_not_reached(); -} - #endif /* CONFIG_XEN_IS_POSSIBLE */ +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length); +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + struct MemoryRegion *mr, Error **errp); bool xen_mr_is_memory(MemoryRegion *mr); bool xen_mr_is_grants(MemoryRegion *mr); #endif From patchwork Mon Mar 17 18:34:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019867 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 789BF1F3BA5 for ; Mon, 17 Mar 2025 18:34:41 +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=1742236483; cv=none; b=s0nXxABkf0hAr7/4WBZygCyCKZIU6BxXsZPg8MTXT3PSj5lC/gvHs0onALys7thFhovtcRXu0sIJTYIGWp66WOrkgW6PgJjnPnnc5o56v9Ad3Bt7CPGZ5u2M/W7Derd+DKoyKXbMk2g2B6t1tOrAX3Ducn16Fr85tqNp6WxLd5c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236483; c=relaxed/simple; bh=CzPhR8gRelKLEDtp1LKolN6jwIOO5jPAQq57RMOd2W8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JgvBdq32FmQl7bWdhVk1RIEjbVvnntbc3vWgtm6N82ardxNqwEZPlJnq4khl5bqm+4ozfBCBtdtWbudzkVnAUGZobUmAldaXF1lvTqGkTuu9OZ2narFbi9SgXt/KhrzTQmCbs/pLQX/XYf0ENuWP0OpqNjLqHj2TI3v8LrT7Kug= 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=qCltbtIL; 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="qCltbtIL" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-226185948ffso25819305ad.0 for ; Mon, 17 Mar 2025 11:34:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236481; x=1742841281; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cOa15ppvF5kxsldjPkSIJYe5T0c824L9GaUvR3via0Q=; b=qCltbtILQKAFgK6w2hvQqh0GP8EOHvhwAaqvLX+9GaMID1NkjGLXMVPbUSyAKnqlLH s0RNtCUopaWCjle7Xn/KVJFiL/8hAa3+5nHLaSDenSr7uE11DdqvsflEoYr/CqhoZiri OPezN/8nnhs7ECu7jA/gRaiJzw+T9jkiTsKC9fG6CHv3+f/2rGymmEpZDkaqyURI2rs3 X2/nfSDw5OLmfYjTCmQQP0cFUIB7XUlFOQHR1UiW5V+oj9EkEoGq5U7dKC+3+G5BAX2T qVCwlnqgCT1SEuH7P3Ei4JWuG9mxk6u1fssm3kfkHFPiWOQfOBf6pwoWaP2maawBn62I dwdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236481; x=1742841281; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cOa15ppvF5kxsldjPkSIJYe5T0c824L9GaUvR3via0Q=; b=OrOo1g8ci1dGIeeuwbYzIe7Wg0cbJi8Ayewxivl7aoLTzhOf/Mx+mEsbff0Z6v0mKZ ysDeT5faIsxbsfFth9LEJjZmFvCnZ5R667WVxHoczluMJJgmnECZ8HlmKM5coIaBZbx4 U8w1yTY1mUyRORpe7qiWfrn0s++x5fxWQ3RDRJDAbZSp/+LDfCU6AFtuq6hM5qu/yct9 hRoWCkyaSOTk4bTeMmqp1DT0LhaI/19PVnyEV9YNe3kHkurOJUQNuB7nbtnjK/u0YPV3 ZWrwKZlHsm9GpvVG0anowa9hmY7hhNGVLNdXmZnhglKjnMeWwqD7/aF+UL09igKxZz1c Pq6g== X-Forwarded-Encrypted: i=1; AJvYcCW7hwx6ieGjmZSAeRnjRIsSX8fKwbn8CjRnzZFjkBhe369Yzh/Y5YOMwX/8/VZ0gLJVYG0=@vger.kernel.org X-Gm-Message-State: AOJu0YxYtR+chdvNNlN59eoppcFgpXek/c4yN+goIAxHa2IXj6HMDAzr Qo4/uiiwixftKL1lGz9r89xr5J9rxFhtRyzvrsKNvFO0sA7jTtx86t7NGv6tBvw= X-Gm-Gg: ASbGncvx52a4xGRSRTioWKNNZUTXU73MIlA2D3iCCjADr1XuYLYZc8K0aX9NHYVbWaV fvziWlFP/jOcYgjg3PjI5VPRcYVGqebpXwA/LBOiP7ZKsfODqOgQz9grbLf7b5OGE/AiNQ74u4p x+8w2FpYitIoerC1sD7ZRsM8H+9z64Qqsv9MRz7/dn67+Fus5SaxMX3FxrLuV/DoV6wSOXJVARe ThjVoF9VL7j8MhIzYK4gmlos45x12Ma8mpwA/iqmfF4wfUlCaAxHl1BnECccm/UV8m746u+9GWk jK4hOh+vTxam2ssnzDL41W/4jaXdZq2IzEm3g3A37o7O5VvBJggl9YU= X-Google-Smtp-Source: AGHT+IHJvFyPD498ouch6ktpEIoYmR6xx3vtpzwDFb0ar1DtZX7lkpskC+JCwilCa8dJd3A5JvQbZw== X-Received: by 2002:a05:6a21:7895:b0:1f5:9961:c40 with SMTP id adf61e73a8af0-1fa43acdf8emr1048891637.8.1742236480716; Mon, 17 Mar 2025 11:34:40 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:40 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 14/18] system/physmem: compilation unit is now common to all targets Date: Mon, 17 Mar 2025 11:34:13 -0700 Message-Id: <20250317183417.285700-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/meson.build b/system/meson.build index eec07a94513..bd82ef132e7 100644 --- a/system/meson.build +++ b/system/meson.build @@ -3,7 +3,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'ioport.c', 'globals-target.c', 'memory.c', - 'physmem.c', )]) system_ss.add(files( @@ -16,6 +15,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'physmem.c', 'qdev-monitor.c', 'qtest.c', 'rtc.c', From patchwork Mon Mar 17 18:34:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019868 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86BF11F4C8C for ; Mon, 17 Mar 2025 18:34:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236484; cv=none; b=SVGJVY5gmjl724+o3Z7B4w/Od0gtnxqSKAKSJJyDaMME4VKYfJ76dQjgXOsNeZCHDfE4idos/ZOrnUoxfLX9finIYgUwjsVvMDHPd3KF7WXVtVrlY7M9fWfjeCnRhoc4Iodn2kQ964NJk+IGXS80TTqp55b3MbJpbESmV9CEJqs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236484; c=relaxed/simple; bh=HWCRrm0GaxX14ykibana2jy+mNovavf3Va2YjCViNUU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FGyd0ANrLhs9AbD+InBfvrIw5M8kuHsqAppGa2ogT2CJtw0e69asXkp0nk6Ds2tDw06a2chR4lGSS8qoDq/i5EqnTQDFRBODQsru05bPE0gUvoykdD38d/pi5HsOKKtK3/Q5P+PQtGNp3fB206aZYcgd6kvsxixJMptg85t+e+0= 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=RyR2CbGm; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="RyR2CbGm" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-225d66a4839so58053235ad.1 for ; Mon, 17 Mar 2025 11:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236482; x=1742841282; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0vI16NHb2tKWbIxjnq/SoVUTdY/Lep770BkCc47k0Rc=; b=RyR2CbGmQ4y1axzsN7Wpdj3klb8xF4x+Pfu97FFewsREGj//Zs2d7FSvtP80dHuer1 n0Z+1L41iEnlAacS+4YK14uhMgYVppHiS/p/QZ3YlcGEcPCqo7warPxLKu6/LPcv3s2o wisZzrjln1povajwiT+Cbijthvl5vRQqpntDls5MBAQg5JfFKN0WqGs3H1aNH6kxAGdO 5zsK3E+J5b1qXuTzLz7pcxJcXiTeLkjFXds5zhcxvsQaCPLca6R8oj35FtEMru2dmlJQ RAP12PfhqR0WTKI21LOSR5cCJuUdWf5I2DhQYfBZVH8kzhydgZ2iu1SNHWtlVvbtPu5g pKJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236482; x=1742841282; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0vI16NHb2tKWbIxjnq/SoVUTdY/Lep770BkCc47k0Rc=; b=o5qBjkywcSPB+FcY8p1wY4KEIpUnnV3tAafykdb9tfdupFAmAGbPnt3ISIixpsE1Jb GjQlYGanZUyKQJN+GlNNV1HMvioxDA3iroAwmLZx/dr3ESkidI04QzE/qjxUSlrN+5xc FLKHY77HsMardztMEr5GnHsv9AnONz3vDrXOWC/raM9Ucu1vbY7nZGuZ1itAbADkUY+e TGR4nJQQi2E6XDX8E3daWsAqYrrCB8doCjgIQ12VMLuUvw33BxG7xwSXaOq60icxu3LJ wm/7P7Muvg0sMG25Q8uB3ihRM67XIkGmYUn9qq9XoaubTPJp20cK8irOkV4TpKGX21gZ VODg== X-Forwarded-Encrypted: i=1; AJvYcCWY3sv5JIJniNyvLourNEXfIKkjCvv1mvNUiEBIAW1MPYfALFp8HfsJXID6+IRbkAJzk4o=@vger.kernel.org X-Gm-Message-State: AOJu0Yyc/LQihjAxj7Eex9G4vQBIut5fESYHOAJKXCuNUzxfk2ljoxJk UKYgvhZdNd8SBfd65GK9TsdOHH2GDPj4EpVhESVlI+1LQdUmynPrAuOV1YavYJ8= X-Gm-Gg: ASbGncu1iox8X0DGaFQv8jcfoCcVw60HstQsjkL9dpLsnVYAphxEtlSvLta2ZhDVhde 9omvv3QX76QKbxUsYjD2+JBGkGtujJqaXpX60mn6SjOefrT9/qDzguO+9AcRyoJRGimHD9x5ni6 v1CHkNrPJL/ieOFn0aSHkTUOihxf5Ax2BYNCRYT84igSIeToLCVWYgiOJ/HL5Pc7l3lMZwSdFeX 7C5uMlS+41nHH0eOdsj8oO+VuZY4vbxg/yCYXq7fNBsCwDrvZqmloXQSvOv7GgXyEzUo6+J+d4j aKygwuj3/u9qe60mYKqD9Y5wSrdUqTpB9dLmGS94zG6DS9u2BNiEKbU= X-Google-Smtp-Source: AGHT+IHLCVfoMXXafvmlUL+0Gr6I93fx5MjwwlixqoYIvnF6wjRbfJSSJwsXt8s9Rnrm35OOx0JfRQ== X-Received: by 2002:a05:6a00:a15:b0:736:9f2e:1357 with SMTP id d2e1a72fcca58-737578016a8mr692906b3a.12.1742236481805; Mon, 17 Mar 2025 11:34:41 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:41 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 15/18] include/exec/memory: extract devend_big_endian from devend_memop Date: Mon, 17 Mar 2025 11:34:14 -0700 Message-Id: <20250317183417.285700-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 we'll use it in system/memory.c. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 069021ac3ff..70177304a92 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,16 +3138,22 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) { QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - bool big_endian = (end == DEVICE_NATIVE_ENDIAN - ? target_words_bigendian() - : end == DEVICE_BIG_ENDIAN); - return big_endian ? MO_BE : MO_LE; + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; } /* From patchwork Mon Mar 17 18:34:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019869 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 A444F1F5848 for ; Mon, 17 Mar 2025 18:34:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236485; cv=none; b=nq/eWWYiP/btZmQM/4gpB0SZC8OYRG6YJl45MUJ3KdSc6wzg0BBmExV+XfBMES8C43mgpte5gJfJWs/yECrVfbOzHoqXexITSKNAPo0ShNmijrx6beOYuBwZvtQgGCTft/0L8Aq1bbrZL1EF9Z8lI57AW55R/xSdn+QndrFKrck= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236485; c=relaxed/simple; bh=UarIdRlI7g0XIPw6CARZE3O+/eSUMq3JBtzD8zpo2Ao=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BAQK4HSWtmq4oCpIovilZjv7qO9wk/3K2lIzPJRn8wNjvvsg/hLjoBfwr0ZNho88lOsBdSYDHrtrZ1LAIir/8gyB3Q3mr9jrASMPcDpMV4p0PJvA/XBS3gEpp2zKL9xY01Dlc4Tyw902VI+Nzfix6LSbeHI9VOhx6VmvzSCtfeA= 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=tFmp2wSD; arc=none smtp.client-ip=209.85.214.178 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="tFmp2wSD" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2255003f4c6so82571535ad.0 for ; Mon, 17 Mar 2025 11:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236483; x=1742841283; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ipPAyCMNYKQgJ+e1Pj22cNEjWMul6XXi9iVGdQZJ7Rc=; b=tFmp2wSDw0fx4WEBIkdnurrfAvmsv50VGAHE8mpkIOrKhlYgUF8LXpOcVwT2e1CfOU 5GiU7Jsgrjerc/rLzdZa2RoCJfc5NSoMbnpghMa0A/MNU70U9VRPGyaovUUbqv6YCon/ M+qhLLFpTiQdjyXZaDV1N7ZHkEMTGg0RbDTrSwrEbnoGWLzkv6l4tPUgZrW0WyxQBXUS wd1EULEuXpfsbX2Tdk3G1KB6/ffBSGp7MpRTzWjvAq+bTCxNqQMA+gXKd6a+Tkh/gKYJ 1mCMCB+wZ47yHXEJkcdih+Ke/PZ8ajIMR1MTvxyD9ID9Vt/zEpRNj/BhXrxBIHjcyh1O CutA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236483; x=1742841283; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ipPAyCMNYKQgJ+e1Pj22cNEjWMul6XXi9iVGdQZJ7Rc=; b=PzHkFpZ9JSqu47uXKoi3tSWmALoHc1kJPU2IyLnQ1eohjX+XVuQo14KAKPaIwy80Cn r7b5rZZxUfVFANH2pqmIOcVClu92cMKUzYl7FSyHmboh6jhA4T3Ls1DdHvry7lYeAiR2 JEmjU3kqXrrRS5CGwVOMSVENucH6W68nYLo1rB6tHhgUfHnMB8xoNIM0XEPLAl4EoVdf +yqrUGP01D18p2HurWTY/vCvX0/Ob9jn3pydCjB784Z67IR+KEtsn21ZowEVkS8jnIOB KTVKz/V6Gniavd7fRd7SS36BmKwhMSXDQm8+P/7cqPCsxpVCG7iY3a0c7DX19B5RWoXo cUuQ== X-Forwarded-Encrypted: i=1; AJvYcCWv4UULLgoGEENan1RehX9cfLETUKRKgM56a/CiTN109T+IzX0qXDoKf8RLN5Ts5UpjLKw=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4Dk/EHs0Bc+OGDMKoPKxZcKag3RUiRnvsb/vlfGsMZHwbNMtR AXQ+eOeNGztvHv4dmLwzOC7kYqfyH41VePjLXCqiMyc918ihtxOuiONvncHpMb0= X-Gm-Gg: ASbGnctmZxGnDGIaUPtZPlBduZ9JDm37dkSZnfUeRo8ldY2GlbK4iqFi9zL0uSrRhHH BBIrUSCaHTX7DukkX7fxAbA6UEXTpA4R117/t9ZPn54WtEU/pO0uDaFDfC86YT5hxtCiFAegL84 orFwfXZ0xUwhwN0evlcTpbbruE/UygzgxihRjbwkJWTMOllsmwILCEZ44fHixfAW5kFGXZEIFOr F5RnUsg81ESf+79Ujl+WmZrFd3Iwbg4G8OU6cV7FXo8IG6toQl7k1ibyHm+6b0EUopY1tC51afv cgrwiHagq1sFgjz7d4TlBkjUy5OfoLXzT4pxKTKAtp8R X-Google-Smtp-Source: AGHT+IEkZnLpN2CL+GDmBOdEKBU4dHJiRJeeADCMAkJ+O9oEFhXHqcZxYnGUH5GSlkI3pMVX0bW4VQ== X-Received: by 2002:a05:6a00:1a87:b0:736:5725:59b9 with SMTP id d2e1a72fcca58-7372236c6b2mr14484100b3a.2.1742236482975; Mon, 17 Mar 2025 11:34:42 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:42 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 16/18] include/exec/memory: move devend functions to memory-internal.h Date: Mon, 17 Mar 2025 11:34:15 -0700 Message-Id: <20250317183417.285700-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Only system/physmem.c and system/memory.c use those functions, so we can move then to internal header. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 19 +++++++++++++++++++ include/exec/memory.h | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index b729f3b25ad..c75178a3d6b 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -43,5 +43,24 @@ void address_space_dispatch_free(AddressSpaceDispatch *d); void mtree_print_dispatch(struct AddressSpaceDispatch *d, MemoryRegion *root); + +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) +{ + QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && + DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); + + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; +} + #endif #endif diff --git a/include/exec/memory.h b/include/exec/memory.h index 70177304a92..a3bb0542bf6 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,24 +3138,6 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* returns true if end is big endian. */ -static inline bool devend_big_endian(enum device_endian end) -{ - QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && - DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - - if (end == DEVICE_NATIVE_ENDIAN) { - return target_words_bigendian(); - } - return end == DEVICE_BIG_ENDIAN; -} - -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) -{ - return devend_big_endian(end) ? MO_BE : MO_LE; -} - /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., * to manage the actual amount of memory consumed by the VM (then, the memory From patchwork Mon Mar 17 18:34:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019870 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 C981C1F790C for ; Mon, 17 Mar 2025 18:34:44 +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=1742236486; cv=none; b=G4fKl7kUQttSis+fVxwWwmWYFYogxOfgZtb+1/ESaH3R1E48PDuUWhZOGRNGgzvMqO6EQxGDiBqL5EW1lQ7/qXHBG1wp86LSMSDZVoWTqKfd4dK5/+3oyQvszeQ9GoK7O8Y/xpf1ik7TaS8k1RZ+gevc29Dadb46JtxeyoL+v58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236486; c=relaxed/simple; bh=IelyUoYuqLIAw6DPSyagCvFpNJxQiv+t0JYUBox7DYg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Zlhi2Mn4F2GgnsUIYAHeFpn1oAxLvSgt6shmODxKm18HL/k8V/TQWCKJPJpWlbYM5asCkYQDhRt/ipXt88WpJJ+Ie+a+eMGuNRlWRX1eYcw7B1z/o0vC5MYGHaDro+fgwHAuzEM4YSno11bXcNbCUYoXmF4szlgATaaYuOamiK8= 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=V3lkpcpu; 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="V3lkpcpu" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-225df540edcso61416785ad.0 for ; Mon, 17 Mar 2025 11:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236484; x=1742841284; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EBRugwqnxw4q7Phz2P050i5IjB6Zbf1WGwdoEilqtkY=; b=V3lkpcpuUAXZlejWVnO/bTguj31tVs4GAyJeQKf254IkKCcCrUIyiqAoRFHNrpm07/ SMAudOVF8OlKlfr5OO50kUKsyD/drU6NTR9P8O2WJfrth4CuPWzAIOyanyNkt2Cw+NUk tbyVuJq4um/b0q3Tv18nxqk//D4LNslM2u6lX1PcPFfzEgItidVIlWH94nRComaZ8/jD FWTMjfcNCOMXDidZKkNUIhcuaJvGro42VbYw3R85H1e3vAFBu+zDe4p/N4TS9PsOlQag 16jCUYK1RjGj3qzaGwwuUL8kEZMo4Ah/aL5XXvk91CdcMjoR+1gfEY34wC8INQC3ub7G mkog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236484; x=1742841284; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EBRugwqnxw4q7Phz2P050i5IjB6Zbf1WGwdoEilqtkY=; b=EEQZjkBC2kh/gauOfbZDPB5n+pBw5YEGPlPBdemWZsb2C5vT8Kl3bI2tzxGErr5BYL y54JQVreEccbrnNs0mL95kCMl+KHdUHaEOmH8gecRG4TbW5hFwd+goNNME01KPgbp5uG llSH5tj2mFJ/SvlYaBPvrgRJY9dsdKoR2L0DePTrt7SzApHWZF4k5G2uScwXkd1aMrcF NkuXXc9OuT5lvC6p85uuHBOW1pcfctkkZWo/da0zJOk9CXhgCInywh4e3+GqC3ZrYXCM PfhoKepuwszVaWj278J0Iwu23zuld+epxAGJm20HAwQ5boq0C1ASn6k2cxoOvJblUBzL FdDQ== X-Forwarded-Encrypted: i=1; AJvYcCUL+0bQA4gsHAlJfY/qsfssOnFv6EwNhVb/C5en7iV7N6VIAZ+me7szFMrQpMfGqEajZtA=@vger.kernel.org X-Gm-Message-State: AOJu0YyQH60Vvalkm/MaqplfzQYXPG03H7qEetZRM6qy+Wzb0kz0fi5P UU4zzPD0RghIK3cz9VzyPhPEyryCjBT5ECD2k+5LsU++YqRJll6PFsUP285Z+zA= X-Gm-Gg: ASbGnctudRonlxeHOVP0hkfIF5Z/URbiH0+y3yqWeDkyUXUT8rmHer8USiEJBzKRwu0 /80x+5im4NXV3o/+fXxh/GcNhlRUPgKR1+3Y7q4aAMxj1LMyj7cflNcCoifLPKQ2EQcvg3QI88J 1ySint/X6LX36H8QIBa2DNvSZ5djLnZzEUYW62EOClpdXRiS9rGlJaFAS1SrdbRLqEszzJoYFV4 7Nqazg0Ax/4pk9GfR2/L2/1XpJizPqmecBJW98fyX9EPazHHuVOp9c98LlhFyRWwrt7nr+mydQ4 nl4cU7DFC4YA/lei2cSxmOJCwJu4Ec4mNEpGOclikBeQ X-Google-Smtp-Source: AGHT+IHaIWG93SjaignFKD4IVBdMoq9cQTxlUlmFhZIj0sg1/yp4Pm5Fp9URm2R1oo2C+UJzak1b5Q== X-Received: by 2002:a05:6a00:2e84:b0:736:476b:fccc with SMTP id d2e1a72fcca58-737577c60dcmr700300b3a.8.1742236484037; Mon, 17 Mar 2025 11:34:44 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:43 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 17/18] system/memory: make compilation unit common Date: Mon, 17 Mar 2025 11:34:16 -0700 Message-Id: <20250317183417.285700-18-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/memory.c | 17 +++++------------ system/meson.build | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/system/memory.c b/system/memory.c index 4c829793a0a..eddd21a6cdb 100644 --- a/system/memory.c +++ b/system/memory.c @@ -353,15 +353,6 @@ static void flatview_simplify(FlatView *view) } } -static bool memory_region_big_endian(MemoryRegion *mr) -{ -#if TARGET_BIG_ENDIAN - return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; -#else - return mr->ops->endianness == DEVICE_BIG_ENDIAN; -#endif -} - static void adjust_endianness(MemoryRegion *mr, uint64_t *data, MemOp op) { if ((op & MO_BSWAP) != devend_memop(mr->ops->endianness)) { @@ -563,7 +554,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr, /* FIXME: support unaligned access? */ access_size = MAX(MIN(size, access_size_max), access_size_min); access_mask = MAKE_64BIT_MASK(0, access_size * 8); - if (memory_region_big_endian(mr)) { + if (devend_big_endian(mr->ops->endianness)) { for (i = 0; i < size; i += access_size) { r |= access_fn(mr, addr + i, value, access_size, (size - access_size - i) * 8, access_mask, attrs); @@ -2584,7 +2575,8 @@ void memory_region_add_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { @@ -2619,7 +2611,8 @@ void memory_region_del_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + MemOp mop = (target_words_bigendian() ? MO_BE : MO_LE) | size_memop(size); + adjust_endianness(mr, &mrfd.data, mop); } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { diff --git a/system/meson.build b/system/meson.build index bd82ef132e7..4f44b78df31 100644 --- a/system/meson.build +++ b/system/meson.build @@ -2,7 +2,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'globals-target.c', - 'memory.c', )]) system_ss.add(files( @@ -15,6 +14,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'memory.c', 'physmem.c', 'qdev-monitor.c', 'qtest.c', From patchwork Mon Mar 17 18:34:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14019871 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C36421F8ADB for ; Mon, 17 Mar 2025 18:34:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236487; cv=none; b=U7InDEpHm2q7vJl4tShGN0gvXc0IEWF64Qyv1P7Wec7GNiiTIhEk2rwdwJy9sMdTG1BeVPvxljVdDXqFU6j3FyDWLuUNA27Zdq9ns2FX8lSJTfbZie+8ZS9pK5BFxPLIvdAHjGjNHOK4SupEpgLsNjxmJNmByZrG7rJ2wQWiwtM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742236487; c=relaxed/simple; bh=8cc5k/dBJ8A5yXdLs7/Et5ghEBM8BXgwEWxHnVDm94A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=E4o9P8PAF9cLSQIBIqffnyeOSeSiJVFx+a6qHulKwO9oLONM93AKciAdlzCL4T2JxXToKC41oufCXuOvKZTgYvh/bw/XfzeSTUq5zOYwoHVtmXBp4Ke7zEeLH4OXYxLKJmykoh104exfKJdp3PiupQvs9gSu/ZR3Xv0BhjPpxRw= 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=BbikHszG; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="BbikHszG" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2260c915749so21694875ad.3 for ; Mon, 17 Mar 2025 11:34:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742236485; x=1742841285; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pdsNHldr91xnqdGHk1DTLXuYnmkD/cCe/HKmA2EoKL4=; b=BbikHszGJNEIomx8wNzp/QJQ/yxXnubAaB5Jpn1x/f8kDsF5mF/kEgC6CTRNaNq0Bm 6zOKJjvukF5ExzKU3AM/ChxMX3Mg1/drqISCVPItJHjY97yvuLijyvnlcvGDQUjjdtmB 9NFWmNV9v4AiKnV9hmBEN+e1U+/dynNm1gHGdluyGv3qwwIOAbtkVKmPHnu97k/9RxZS 1JijufkmpOl1l7TurLWjezwtNJHlj0qxJGpnvO9MDiCFDgLJxnU9x1LbOiDtn+Pxo/T6 Efo+GhZjdGuhw4zHGXxJYZHXU+6qEft8f4tin8T4uITe2hYAMXHqKOeXwQ0ctwo59MVx UDNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742236485; x=1742841285; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pdsNHldr91xnqdGHk1DTLXuYnmkD/cCe/HKmA2EoKL4=; b=Nsk9E2UlQxtnhcZj2xEg4fpInpdIjuj67MesjQNLM9vYVdJPMe30KL1BFZ+HhkiSnN e4IDQJZwWJ4FixW+QQXLy7a75psceEs8krrRy3b4sapIkAS9siOe1w98O72Y4E2KbwoK 29Iob+lyLeKkCcSYLLrySQa6uy1hICZXswBRRvJ54bWdVX1sPF3PAhOWpXAlVm0uwBOa CLz7sy30pZZgZUBCUZ8xnt28CLyhBHighVd7D8avo0CFwxOAbHydJaf+00pwyys2nwK1 znrX30V8X4az59/VfFPLzZJtlMWLuo/L4tItCHBdDahgxr6hUVIgL6LiabHIUCp2Dawl JBVg== X-Forwarded-Encrypted: i=1; AJvYcCVFv1ICds9Faw2KmSeVMGN8jctsBEdrV7w8tmLvIlkOpVqDnHpk75yErljHoepWg0whc1w=@vger.kernel.org X-Gm-Message-State: AOJu0Yy63NJTuLzFddc5DJalaVkvI8MwGoRFdkM1VjLrjGK1CMNXCmSW J38CedV1LEvmYA2XSrZGQNLpP049o9KI9MztJt4JVh6Afqbhz8WRlLplBu1mhYE= X-Gm-Gg: ASbGncubQuABvfAfKh5iqTobw84xL2I5K6EoZzk3VtEBvPPH5H5oLtyo2Y78Gnzt0BC GspsShAQaDHCDqHvpxfUCH22p68sbu1I2uC6ss+OoQZLH97IFOVuXHlMmRNr6YztdDhi1HqCg9f FoWRT466irgMdYgqdHSqMT/60QF5RzWqrxI/TiiDaVgt2ZkgzDE0M5n5RAKLrDEReBr85vqh88j 1LNFWKnOVXlaSDhClnC9JBkArzHriYSxTlbWD7Qv5t+jdSP+95tEjdS4pRks6t3ofw58BWACLCj 39cW9vTOkyfj46uSUokCVcq+JTfzplLKM/Y7W+gH0api X-Google-Smtp-Source: AGHT+IHzNNUW3sLQt1T364FsCohrjLgSsBCXmjd/XRyR5B72Si2GIa2LUJ+5Zkf6gr6cDVKPRd/CWg== X-Received: by 2002:a05:6a00:b95:b0:736:3d7c:2368 with SMTP id d2e1a72fcca58-73722353269mr15820164b3a.7.1742236485130; Mon, 17 Mar 2025 11:34:45 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73711695a2esm8188770b3a.144.2025.03.17.11.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 11:34:44 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Paul Durrant , xen-devel@lists.xenproject.org, David Hildenbrand , "Edgar E. Iglesias" , qemu-riscv@nongnu.org, Liu Zhiwei , Paolo Bonzini , Harsh Prateek Bora , alex.bennee@linaro.org, manos.pitsidianakis@linaro.org, Daniel Henrique Barboza , Richard Henderson , Alistair Francis , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Peter Xu , Yoshinori Sato , Anthony PERARD , Stefano Stabellini , Nicholas Piggin , Pierrick Bouvier Subject: [PATCH v6 18/18] system/ioport: make compilation unit common Date: Mon, 17 Mar 2025 11:34:17 -0700 Message-Id: <20250317183417.285700-19-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250317183417.285700-1-pierrick.bouvier@linaro.org> References: <20250317183417.285700-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/ioport.c | 1 - system/meson.build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/system/ioport.c b/system/ioport.c index 55c2a752396..89daae9d602 100644 --- a/system/ioport.c +++ b/system/ioport.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "cpu.h" #include "exec/ioport.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/system/meson.build b/system/meson.build index 4f44b78df31..063301c3ad0 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,6 +1,5 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', - 'ioport.c', 'globals-target.c', )]) @@ -13,6 +12,7 @@ system_ss.add(files( 'dirtylimit.c', 'dma-helpers.c', 'globals.c', + 'ioport.c', 'memory_mapping.c', 'memory.c', 'physmem.c',