From patchwork Tue Mar 11 19:57:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012636 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 90ABC25BAB4 for ; Tue, 11 Mar 2025 19:58:12 +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=1741723094; cv=none; b=TPM8dVMqsZIicBgllMtI/5CoTAI+y5zlQC9alFf7M7mIMJC4xH4wJEXWceiddi45X+VIZu0UrE05hImI/gIn9KEkjthssF6MmKTxjO/QR7sxk7VzCGw7/61mwy2CJEzXg2jZ8Icum/+9LDbj/uUS2eT8E4IVpZN2h6zE9V8leuU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723094; c=relaxed/simple; bh=D7kAKGSn4zAKkiSs1hQlq6vEceALs33too5mFmMr30Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=capdHt5b3NTbpmd/ku+MQDPlQ/9lfJx2lw3lZaz/3KxYQLwQkMHH5PtIvVkjCxi4UyiLQ75f0TAE8P1duN9J6jbFangJQGFToDBw9YVX4X9pv9aeyua9q8GQyiw39YQClL8UJgzfxxNVVBs/SdjtkO1EHMK2Cfkma2N2eHYsEow= 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=jHFoQze/; 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="jHFoQze/" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22580c9ee0aso38783405ad.2 for ; Tue, 11 Mar 2025 12:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723092; x=1742327892; 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=jHFoQze/IFcFIWY3GX3zS6ImelHx1HsBxHBO9qT28TObl9SJdCo7jT7W5lTyR81Bd2 2idFZBVvJ1xaioaouAiMiNTnQWYGJUVwj3nMwIgvJ3Ic+YDS1YROLcz8kBgBp8BlswE8 e4uoMV0qz4RDEbBEiL9Cz17TGJutBARL3TU6QxgYFq8USEuQHIOJXbCkdr4qHsMjlQDG ORpZCzP2enMnsGx4J/haHvnfv7Im0H7BceXXrUEFnuLkK9z248rsosjt8FrFPObOV7jS Osknv3kDBTkgqchDYcdkkrT/NMsLMwGnY2ylolxs4YsVehOxMQWXNdHnEDzkh1LHkauL MR5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723092; x=1742327892; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=949DeBQijWmgHqYCdDdupcSTn3rDdND8nLqwkILEwEI=; b=WlJJoKnfKC38r1bnP6vt850/bOXgOIFny5k+MskJtNR/1MBdAuGF8YBB7mSDFOQLad 1NqkQp4vYGqsQL8FwAS91HC9LyyC40JMNJHrnGowh8G/Ziu35p8gYZIfh7JdTZzOw5j2 uxEBESuP9hvybeEjiT7rgUpAoQAidmsx5DB02xO3DKf8x1JhavGWUaJfpGp/BvUpCH6T GS3vIuett/EJYqKR+5ToHDhzKvQGvbsY4LGFVucs3UmfnxKno4sFMXCrnT24l0InLYav /0gHJ1TYgXPaG6SOJD3AAI/QWsB9Gzlg0T3S+QFRJo8vcevun7gNjZO6rKpdzCF+IaD7 X5EA== X-Forwarded-Encrypted: i=1; AJvYcCVPibrjvwwCY4a/FcwTwa5hdI5/02Q+iEhcRPEM556wRYIMO1i3Gm2Dk3xbzvghL3OGdz8=@vger.kernel.org X-Gm-Message-State: AOJu0YzZFbgg06yVzMgGxuRxta7uwjtZUDkbRBIJFdgTIu/X1OL4Xlb7 2iJDPnV86zSn8SXL4sp2HuEa1waz9375NLmyp8ZdAJu2SWPlenO0YHsa995RMgA= X-Gm-Gg: ASbGncvJYmH0nG3+UWXAmAP4WPRHN6GBn5yS5T4qg4uenrZf3Kvz2rUgtkuXDrcnqZV V3t2blzc/bJniYiLIMn09q8e9Ce4CKJy9cq0ppcctZtJk3HBdcPcXvf2y4gW4gYg4TtUHbT+zQF zbJlX1Y+70EiOhjgj6BopJmihieW1vH1YpsX28Ri9b14/PfxJRQP0DuUJ7njMEf27zdHqgGbAPj BFpgFOvkPmEzNdKY8Qvh5PNC59bJlEPIKvOiD18GivmlwE0ouvTGXjicRjw2C0TePjKYuhqB2s8 kc2nGDH2Sol5J1COZF8sFM6CCIRY9GSKVn6KWZ3HnohoPEuHzn+3AA4= X-Google-Smtp-Source: AGHT+IEdn0vUjdqWf+0ft6dtNABWq7WqhDB4TNeuQtg0nIMIUQeKA5OeniZU9oewAupJBz+i092ynA== X-Received: by 2002:aa7:9e43:0:b0:736:d297:164 with SMTP id d2e1a72fcca58-736d29703d5mr9263457b3a.1.1741723091837; Tue, 11 Mar 2025 12:58:11 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:11 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 01/17] exec/tswap: target code can use TARGET_BIG_ENDIAN instead of target_words_bigendian() Date: Tue, 11 Mar 2025 12:57:47 -0700 Message-Id: <20250311195803.4115788-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/tswap.h | 11 ++++++----- cpu-target.c | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index ecd4faef015..2683da0adb7 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -13,13 +13,14 @@ /** * target_words_bigendian: * Returns true if the (default) endianness of the target is big endian, - * false otherwise. Note that in target-specific code, you can use - * TARGET_BIG_ENDIAN directly instead. On the other hand, common - * code should normally never need to know about the endianness of the - * target, so please do *not* use this function unless you know very well - * what you are doing! + * false otherwise. Common code should normally never need to know about the + * endianness of the target, so please do *not* use this function unless you + * know very well what you are doing! */ bool target_words_bigendian(void); +#ifdef COMPILING_PER_TARGET +#define target_words_bigendian() TARGET_BIG_ENDIAN +#endif /* * If we're in target-specific code, we can hard-code the swapping diff --git a/cpu-target.c b/cpu-target.c index cae77374b38..519b0f89005 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -155,6 +155,7 @@ void cpu_abort(CPUState *cpu, const char *fmt, ...) abort(); } +#undef target_words_bigendian bool target_words_bigendian(void) { return TARGET_BIG_ENDIAN; From patchwork Tue Mar 11 19:57:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012637 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 D2B7D2641F1 for ; Tue, 11 Mar 2025 19:58:13 +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=1741723095; cv=none; b=o6W4KrjnCT/VMxBdnTm8lN7Z7XbYJNdkOrHW5RKSRtyQnz3m0gqd+LfWTGwwXtZSWUe/byn3DjOu1XN/MJa0qwOKmcgLzmtvgmfZPQWAVkPhDVxkitSaeCTHYaMqXyBAUmX2DSM48dLcdwXTGsF1HwtNyqzYBxYDETyAak4jFuY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723095; c=relaxed/simple; bh=6cdUkgilZ/OtUG5CSqfjwssNSd31+3Bqv7Sh94x+Hkw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pvuEdoNqq0muHayAvva8qHnpsqjC4IUqAfO/zHycIZ70OJQlaLItjPYK3UJMyhJbLpJCYYz8XHfhsSaPJ58+sJbcqJXhMg+d2HZuM3b1sBKx3Qcz/kHlekNJ040mXwr/3i56Y3FLOY055uvdmt6soybWkoIgICZL9Pr4lDZAdFA= 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=X+x8NZ4M; 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="X+x8NZ4M" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-22337bc9ac3so114171205ad.1 for ; Tue, 11 Mar 2025 12:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723093; x=1742327893; 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=X+x8NZ4MfR+5e+6GZTL5b33Ee/t6GP2CGgT/Iw4mxnCmwu1Nl1zHZPPmVnpgxnBW22 AZfeOx5AnHy/J61IHmvBWxrFejO+30sqEb/81Yx7wPXJ1XK+jBcp3LuqSN60sgoVeyAO tEPYUaGTPnoSGOpdkh2dXsDmLfDf25AAoM+d8k8lsyS/p30QHe8DUBQ9/TolHDnFqn2P C8ZS6zl7RcqXUZqOEDYt40NPaQrUMyG7+3NAIU2Y/t/RDKiTfWf9hbBCpwVvqGad2ObU Kr+q96iCxPnPOtnzeHRBdIsP9sZ3hInbbEpZ22WvJN5fYRiqFCgLLtdayxpt1l919ajT yX0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723093; x=1742327893; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fjQjYNlvDIsMbe7+veFF5h4s6vvln32m8yANkT1fS5Y=; b=iUN/h6rw9kjkGVToXxFkz8DgEUYMqOQQ0cqFSrT9DuXUn30Rxmsh3ZkTyGQdFkp8i3 pEU+MnZh4NZl4lPiFL5RJSvd85fSyaW4cupflF888B2uHn33yGaG4KBBm4qc7rzf4HQT CB9t5vCb+pFeBvxvg1S08OfJ/BIMKoJ1Dm1E8RqGD8pTt/yW8ek8nbzxbA+0olHGnOcJ IWEyZBs+VFVQma80PzIoGfnJKXxUlyb8SRXIQuM8jOc/mvzhVThV5PPdJZgHK8UHaDoI 1guz1gO5ipyGobb7d65zuQ5/s/uEHZNsKfqqBlm4is+8Rpa3XXXFOiObnbXiG9RAVtFG BuXg== X-Forwarded-Encrypted: i=1; AJvYcCUJWRnaZVJCBwvrhsmPA5SUopu6TpunOFnOTLsJ8ken8+ZL5UE7kPMQ1EoLveo8ihd2wa4=@vger.kernel.org X-Gm-Message-State: AOJu0YyZvhjbvTfEJlX7I6teqLsI7Nq+y/XxRc+upyuyhWtzgEmzR3fO +0Lc7JO0uWtVl7LhlI++UNyJzKtODknYkIUTWZ2l00fRDxzCvy5Udc6nx0Ij/2I= X-Gm-Gg: ASbGncvvywNwAUULcrx/vAWMtCHuBNp+0rwIjibsPzl/KO6yRh8bEdm8heMqcPCyxo2 ZuzLdcEsOefHfJShusATk5OhOaOx2IhVOy/lpLA7RMB7AQzsv+uQPnLMykXUGKOVhPISzTRiLsx Ii+tW493I/37DfXgZb1ZLY9vbFiaEf4hXsuJLbx7NUdBEKZ4HHoVxN9bF/l9GOM1HN0kYtSH1dn CpuGg83hrngWVPrUdEMO8SQY2sJqhpCCFbz9mldYIuPaEFFFaU9B9e6QlR+GtKeDOIbqx9m5Ea+ 1L9WRS0FbaaIet65CXVvVoLt2iB6BVnDqLDTjOk5afFW X-Google-Smtp-Source: AGHT+IF/o3Z1voLQASAUjPWBawCvXOSnOMhb8Nk2igLOMO9aCbEfuSVrBfikbaQLM80fsMV5kN5HDw== X-Received: by 2002:aa7:8892:0:b0:736:a540:c9ad with SMTP id d2e1a72fcca58-736eb8a17b5mr7090307b3a.20.1741723093074; Tue, 11 Mar 2025 12:58:13 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:12 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 02/17] exec/tswap: implement {ld,st}.*_p as functions instead of macros Date: Tue, 11 Mar 2025 12:57:48 -0700 Message-Id: <20250311195803.4115788-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> 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 Tue Mar 11 19:57:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012638 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 ECA3A215F49 for ; Tue, 11 Mar 2025 19:58:14 +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=1741723096; cv=none; b=a6Y/ns5uUc5GDasfgwSj8J8p1eATG7bMg6XtV+moKiaodbvgOsj67xpOqVZH30rX0WiuGAOsiaszqR1wiCZqFFObOq6QkwizZjP7bOmcGo2W459Ec6m4/FN0AoKBmlnqsisKdrhCJnwuNhbc+1VqJt9KhKHyR9vMi8PIBfaIIho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723096; c=relaxed/simple; bh=oqW9tTQslkYwWgYQ4FVxpgiaLvEuigwHwZLhfUQTCic=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=idGFgmzk1Zj1WxpGEKMHAQatLKyjYBFr1wGCUkb9lhQEREvJBU6J21d3qrGUUeGaqPrWI8DJ6PPJ7WDQy/gATVQb/mQHtH4Q+xKq2KVhcpW9QWgs4vNp2ukKxltH6HjCOkvhY5FAtvSDXHxf6+QI0VJJhcijfZsH8nejPEsHXf4= 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=oB0K550h; 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="oB0K550h" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-224341bbc1dso80068595ad.3 for ; Tue, 11 Mar 2025 12:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723094; x=1742327894; 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=oB0K550hfPujYi1eYsGJTOyjW/V4WqEJXF9MiNdiy6blVBqSpiEmb6lEwSY/h7gLHE M3dnPa3SuI6Bjmy3Lnwhr1Az38Jw1IToEs1DbHJt3gUMX3rOmQM4fzT5Sr2mSkPG/sx2 +hg5X8zdlMcdA7Uimqo0no0WyiEbkNQtksvXr6tiQnOdrRCr4IS0hJ5nsp/35zbmsXNx TJeH4m923CO/7zg5wolb62AVhVQk0Ed+jeuKQU/6Kizkjm0K60S+8FfJo1X6GBmE7Kqq YMzn//1veh796lcSmlLM20x4pjSfk7pyFARPE2aRL/ILbdC8WAmdapJhL04FkpgeAQ2o wDkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723094; x=1742327894; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fcP4MFj0H7Fu3AxOxTbJlPG2KgbdJwiBtz5sSPdKZDU=; b=KMqDk+suCobul7mR6IfHB3eC1Q2IfWL3q6sVFY67zGJibckxSFj7UVSRFGe4qZ06pg 1IAMlwiJsGAinT6sUcaUEHSX1hBTm7nJkZsFIp30t4UIkSaOH7Zg8LErXHqUqBmPgn7k KyDSJXYb1l++8IwXwn1AbLF2dA86ufJwk5x1OflEa5P4O1Q0Z8T9RGQnHf3xJ4pT/W/L BG6brlIkSfdbqs7haXfo0M/sdKK6hKfEJhbS7l9G0hr2QUF/cf5AebfSKWZkEpV/RLhY 6MIHxtJ+X2dlwTwcIR4Qxhi/xMuNiXTV0fhGk8x5Si5QbjVjCIeMC/oTztVrT/vwabH3 AixQ== X-Forwarded-Encrypted: i=1; AJvYcCXE+JMrqcvBO0UiZb2nuAozpxRpWI2SVt7tx82PoOAElbBmrw3v/L3htO5jSssty/PclyA=@vger.kernel.org X-Gm-Message-State: AOJu0Yxodps3e02AWb1idN9ykAIwSB3vzngxNa5m/ECZN7qXRjStuvMc UxhkZn6E80wzKOeBEGauP4GuRchOV0NFuePTLGfhpFavPjj826/p5Z4Ae5Gl/n4= X-Gm-Gg: ASbGncuMFE6o3Hv7G50pYDW6boMXsHHIy6BmI6xFLgkYV64PSoZb00cTS3cal5erLDM QaI2UVK79eagJviRnrHplcOZigWUvHnmQfX9KRx+8qy24iOrSe70ClV4+0RwTZlSkiWwJrvu/8n ycksyC9bhziE8Dzw8GoE/K4G5cy1VLntkOXBA7JDs07qby7yQhl2Rw7+s25K3Gj42fqp6ySi07f 9H84oZyiwGuDHrrxfJXKMH9Py8IxytdTdoQqTTgCcdBCx/n0nDh2b3+b8x/iSgD7C6EtqhAxGap EmaghOMZVsMRLmeyW+Ifdm1/h10OJkmNDDCihOv+qktI X-Google-Smtp-Source: AGHT+IHtn3wjueX80hXlhR3WWJLzlWQ/GjOadBaAC9ISUpU84/t/abdjw/+6bEkcmiHY0rapbw+ALA== X-Received: by 2002:a05:6a00:189b:b0:736:755b:8317 with SMTP id d2e1a72fcca58-736eb8a15femr7017121b3a.21.1741723094173; Tue, 11 Mar 2025 12:58:14 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:13 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 03/17] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Tue, 11 Mar 2025 12:57:49 -0700 Message-Id: <20250311195803.4115788-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> 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 Tue Mar 11 19:57:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012639 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 00444264A63 for ; Tue, 11 Mar 2025 19:58:15 +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=1741723098; cv=none; b=jAqz4w6Ufn/iQb8yI737pyyMngeFsn5xGZdlu6rdXLzyf52PhkJnBO9vlAldXXVZzGRcubxCetWjnY8ixBABmNwTktrYFlajmrpdxAuQ2MBMDpmGLFEZH4fwAhhhoAmbN/UPfT1iqRCgJksKF7bDeI2j6X/W4XbkBGNXQocSjmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723098; c=relaxed/simple; bh=tsr8Vu0yCbhmYRJ+c2Olh9gVNG1abA5bAWFfRS2LzZg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=V/W/M7CWPE5kXaIDHby4auPSW++6Gxso0uDtAH+M8h5WMo8wiS4g03LS5R2VtpauQumIe0mX1HXTP7/4lyPo3u5PnacpxIQvFdQUAwHgqAAd4eJ5PZJboA6k7SSuyPgp6omoFcZnipjZb/BtR15Is6DPVIFq60teQ7EScCdzVEM= 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=HW7OQtM6; 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="HW7OQtM6" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-223a7065ff8so18595885ad.0 for ; Tue, 11 Mar 2025 12:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723095; x=1742327895; 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=HW7OQtM6w+MuJr691icW/65/ZbAYVzKLsPZy53kCm5DuT2z8F7Slm6syd5AY9yr9QU 8rptwNgYoJz2lreK6Vpij94XoebK1st4TKkEKWgt8yIVHlEnwuYktX0USr8jjX5XIsov D6lnT1MWWmCav6uuF6I5RB5rXFxTGKjkksKhmAJaJyW26NCNJ6KeVSZr1m4M+GRhImhQ THL/VdjONZVxKSQI7HRXCxCDmkajTDrjiFNWmiNM8B1GOBGosilW7tdzLH21Kz4t2B3t OHQYkJGvIRsQqE/ttvZ8JZvTbAPK1LDZPWUOSlNwzjDyk+gHpaAnf50K+X4qwirJly9r cdmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723095; x=1742327895; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G6OuFeXnonCJBRRaCKlE2hD3nLeAbwsquVgoLJADjfc=; b=AHzRUfM7by9/IHvFvEeFJYRNRwA8MnTe/17U9s/m+m+01uKUBxNtyIeTUiewFV7nvT pdEmszUfBFtku6oftKRhmGEMwN16nnpO0gWIthlv/SrRvQtDwicRNVhMzTPoXnmV0OuP UKU6k5CnKl544NYLOfXc2lQu8gZ0boW3iKhhoohqAGXzN5h/AyuQ/oLSwww2GlBQvVzV s8lm+dMv0zMAADNOMh28hFNU/UZKJD/yJTTP0e0VPu3O9HIucVfybBoan64GqG+jkfVc f8mOmk8OUaBGw1m568jIfqVESjWOA9sxzF4uApd6IzAXW8zeyzmK/Oqi4U0rfkgJQSXm nbtg== X-Forwarded-Encrypted: i=1; AJvYcCWuJaBmL9RWHsOY9rixoOmhO3FvPVlQiQDXFFQbpN52z9XE/5jY20LlKIyk7ecdpoi1wlU=@vger.kernel.org X-Gm-Message-State: AOJu0YxaGzeT1vwty2NQoEO4M45xy0AKGsj9RmkhlzzzF3S8gLbW+qQp HTuskPRgBlBljDAfFnc/D+EjPXlQrUvFdb0jPcDRc4XdTo1xIdl4aIwkjlFwYrQ= X-Gm-Gg: ASbGnctM/5EUFxVghm/fB8OfRwfBXrDzFKhc42wAdrtlAL33sttGzAx5Zxt7J8Rm6UI mQx5/Zq1NLu0qlrXVjNa2drXr0A45c+LxNxM7UaUHc+a+57ACa5DWvhYVnzYlyXcijR25C5eh7V zQHC4RB2e3Js49M1NHrEilz6QH9SymdHGYTYHIi72+s91nricaNBjAvAkYiq2pKsifLt9dnOVIN V2ATdj20NPb6VLY9/vpJGy5xWGrRZq3+cuIJh0pS57VvHD/ql724MAxQAZG9jlPPGveet1QX4Ra rmJ0oMJ3f5ONTnQeWjkbm1tBc3yUf+G3mFm/37qUH2aK X-Google-Smtp-Source: AGHT+IGNWEO4mZBHpAmOvbPEdLBPlFyMCMG4ZRJsA2UNTnkEr6ujtHjiyajOo8ag/l99JEaYOKJfOg== X-Received: by 2002:a05:6a00:190a:b0:736:31cf:2590 with SMTP id d2e1a72fcca58-736aaaad27fmr26132051b3a.16.1741723095319; Tue, 11 Mar 2025 12:58:15 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:14 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 04/17] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Tue, 11 Mar 2025 12:57:50 -0700 Message-Id: <20250311195803.4115788-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> 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 Tue Mar 11 19:57:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012640 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FE9125E82F for ; Tue, 11 Mar 2025 19:58:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723099; cv=none; b=mtxB9BmWrQuRrZiJX1dpz1gy/DDt0rkakNRML1zCXbjocnLI5gii61HhSVMQnUSIIHMgM8O29AJogSnVKfoGNKg8O4Vk7Msjm/pOHCiq5A6ySEjkR4MZz1Tyw8y7KvlonhhWdfjU4y0PmLTP1wbeaWdD9hj1BDxD6LimC99fcgM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723099; c=relaxed/simple; bh=o5ngxEogoPE4wzfGJK+6GJ+kqB2vK52Q1QHqnpgsaHQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fkvjodI3oqRDOYevyZYOIBz0Cf3dH5IpPedJqwhNPLsMXV1vlp8Ym8Q9xcMXW9/CbK9wBljHOi09NRBRgSMQx1a2hX2keO1yJuxvBmjS0tT9NypQP+WdsZt5xls9uZwzFGoaPzAHP4ibcEfaIhXhkLX38iRyxNZbRUl3finsQJw= 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=Rl/1CCoV; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Rl/1CCoV" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-219f8263ae0so113520435ad.0 for ; Tue, 11 Mar 2025 12:58:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723096; x=1742327896; 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=Rl/1CCoVGS0dHPCgtJYskvuArZRc/jk/1JDwOJB+52UAww3UB69Osn24C56E/87nzY XPI2h067C8wu6W3q20WLXJnhx5ORT4Sl+vaPDP6H1ea70ZzncEmyOKqpqvq0nNjyAOC6 UNUPALVk2804u7BH9hNyrFOhQO68CkmtYBHw6ML1lnZPzgvBaE6jgQXXmgSIBuN7+KS4 363OT6/T0IOth0nRxd537j6BczW7dDslQ4veyTrPfFMnpIjT68eDZo7F1wYxcAtt/nP5 qVGkPpUjIin3+J7F3KDpoHPzmiCG1l/JHmNwuqWn2xh0bIoNMGkOBuAdef/0MC7BfMus iSzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723096; x=1742327896; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wT5ohu0Ui7xrH+jgYqMJMpKemGPcZNvy7jzdyuAyzEs=; b=A7OBaOUehbs2qqQec7VtjWK9FpTJsYmwKkFBTuzrp6W+MpmPdP9uTLpo4NmsBeuDR4 Y1Cc+R7WMZ1eJvpdQOvpvJQ7ueaz697DqzUDNITaKMYvAn8ZIhmUeIi5Vq1xJvdKPnJ2 mxrPtzFdIhtySARwHH7tojKdQGOp2nzfsJEFIfzNJlQ6bOrcihMqg3NZApdaX57xOp6d Ev06EJkZ2/fPGMnDebeabkkfOZLowJIjONBQHUI2gPsjv9N8C/aBHR9B2S+rFceRy+5J ohuxXdb5N3A2U3REQJCr8pxXrKvxw/tKd58ILc3IpSlgFPLjwcv4HsaIuGE2m4tZ983N 6mVA== X-Forwarded-Encrypted: i=1; AJvYcCW8aN1lbrjs8ETNEcA1olFCihhOr/9sR0SVTlst2sl7q0Y+8pupl9Vq+c20zoiFJSFqPQU=@vger.kernel.org X-Gm-Message-State: AOJu0YwyBjiLbjBaDVWLF9CxI8cyoohU7p6RR1JOPoM7muQ4veNIVNRQ K7LUz9ta9wcmSvirUm70ipN3x544iEjjasq5fJobFQKAZkA6T1evF/7U5/WTYbo= X-Gm-Gg: ASbGncsLO5/ZLQFKkZ7eniONnGO6hqikTXO354NUO3kVsySPreDocuHQOFgI4D+JdZw XTp85W67MZTl3vA6k2DGT6Y7A5FH9V+oPQ6LcjfIxra8SxeDLQvB7PhkBsNcvdVN9XeUTwgfm7R TSL0zp5GAgpo+ytU0QPK8T9A6rlUQ2xda94p7gtfWt4HEtssqYdx/hFpXrPQd8EaMwvAJjS2Ub2 KmSWoEXK45S6TxnR1q8jv8mSkNB+jiZ8BkdBUOQUOaKMACxUHnc+DBN+AkHjGaIx/Bnj6lQ4qaH UuRJWFg05qPNtIOvhvLBwT3a7oiqZt10/WLgn94mURzz X-Google-Smtp-Source: AGHT+IFol9xcK9Mza8BcbJc/CzML1UZwkH32uaLlj+5vumcl06S67T5kaVFtBRtM8pv/UzBlFhWjBg== X-Received: by 2002:a17:902:f691:b0:215:bc30:c952 with SMTP id d9443c01a7336-22592e2009cmr58302965ad.6.1741723096508; Tue, 11 Mar 2025 12:58:16 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:16 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 05/17] exec/memory.h: make devend_memop "target defines" agnostic Date: Tue, 11 Mar 2025 12:57:51 -0700 Message-Id: <20250311195803.4115788-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> 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 Tue Mar 11 19:57:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012641 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 511F2264A70 for ; Tue, 11 Mar 2025 19:58:18 +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=1741723099; cv=none; b=M6dfC58KX4J288Vuel6K5uN0nMaXHGgXH4byEMyG5+5i/AS3mMsJO3X2VQErmPHnCL7po9a+2dcfVSU4XQ9OIiOm7rAqMI7JIeInjijkKzOkvwuxGIcYNligZXvvFKge1xVUCGM3mOS1LXrkRm59Rb7hYQ4TiL9aGT1Ix359LCU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723099; c=relaxed/simple; bh=ZZ+AiZUTunZXOtLpOLhEBn3+u5OhZNz1tND1065eVAE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=I8AfiAHBfNhjxAGubiwdGzwXY4nywbHT10HunNyMssrenhlggjr4EgfNJn2T6B3rcJ9HCOPAj8IEw4Ek7vG4TjSJldqX8QA+jEukpriHojwcPL3aXRDtA7mVtXCtsXsXKgS/6Fn3BZ0KD0fWRffYjcwH/DQe7HkFYXo/PJTSlCk= 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=E60uDPs9; 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="E60uDPs9" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22359001f1aso140554005ad.3 for ; Tue, 11 Mar 2025 12:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723097; x=1742327897; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wYUY7egDw13yHwOIShpp+yHE9Lg9eeptR3FMaPhbw5Y=; b=E60uDPs9gEE0gubg4FxqJqeA+A3QvZdDGS5JBCjWSs0L5nzSnzgojDET2hMJoAWtfD EoWuZqN3rPfwu1ejUchIdrtH7JXupHogDM+xuf8whPwJrFbXI9n2YOJbMNEDkiTdGbG8 7Ynz3295NYTSdc4NOKzaEtOAMYD5745rL+M8x4/VW14LuOn1FC1ohXjERGjfmlFR0wZi aGGg0ZBgzriKupEW9A16TtRX52BHfE4PNkL9w/PqBcicnazKaltOtEWJ8yhmY+QDsfmy VltwW70lpfzkVRnTr7D/Qpkr6lpyeFE4s1NH42P3on3hTsOVvnzj+RPf+OrkR1D5nF7I xHwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723097; x=1742327897; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wYUY7egDw13yHwOIShpp+yHE9Lg9eeptR3FMaPhbw5Y=; b=dZRAZeVbkEnrBxh5soqyJprADKJwwjQ900KtY6UYYWe448q8634tNvdZw2ejlBWjYL zmCm4yt2FJeccIDo+sZzu0g43mvIVyKp49jje1OOX42gtfB72qMYBdajnV2xtyTj5nCF e/7gzdYXcuzXaPQFeO6kCwEirpkpIy8Hf+Id65kwMAiDJQSg37eL4LA9uDSkM9L+4jdM jykARZoCIUk1mRxuqs87Y874TyhlKDiGu4b4qxKr/LRLbp1/StH3Kg/4ClYs1t5tsTh8 Des/7UvczG0pHkImvPvk1Cpzkfz9XbT6cJQ8Fyim1RlTWl/fo7cEbw4+XEdENjYrR+bS tC4A== X-Forwarded-Encrypted: i=1; AJvYcCWJ6yucVB6hEjhKcRkk9c+RkEPWd+I5R0bbijXARJZjHWaSEyUygl1gZ4k9a57xaQusHt8=@vger.kernel.org X-Gm-Message-State: AOJu0YzHsg80lIbbrHgoB/kVCYhuUkx8+m4cOlxZijE2Qw/39dvzmaps A0YqW8YGHZxhRaACTZD2hSAzk3ni76/6uZOPZrJkQGKwAL8PKb9zqEknJf/zdps= X-Gm-Gg: ASbGncv1qv3pJ7yg9rsu3BeTDHNmK2rKkYWH3KP/wDXJyVJJA8zxLT2KgaGDPRCuer/ MMmCAdYZJA51cXXlzq5MptVHAVUiSpSHYUEBHpF8rv6G30LMjci8rYHcm5U9fRUnQ7pcEfpB6f5 Fk+YxCrkFFCHXw6IFKcDKB809VgPiVDF2yKUuJbNhUs2YPfXHMU5A26UgRcBACSH+xGF8MpI3YJ jlj9gN/hZljzUUw9L827g56lFs+nDxJTnpcjQ7hALU35VwVwRzy/XqHVO8D5zObYw/YQtI/XXe2 OoqMhD3JicNRtdvtc1MhCbMVzaFlSk8GafEYxYNEwP7z X-Google-Smtp-Source: AGHT+IHUxq5bEYzFkU8q2EMgwzHdCRPdTyU3cSt/scNg1CwBg3gT9IGXS4Ltng7xzXvu5gfwiPtTEg== X-Received: by 2002:a05:6a00:7218:b0:736:ab48:18f0 with SMTP id d2e1a72fcca58-736ab481a99mr17386794b3a.1.1741723097629; Tue, 11 Mar 2025 12:58:17 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:17 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 06/17] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Tue, 11 Mar 2025 12:57:52 -0700 Message-Id: <20250311195803.4115788-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/tcg/tcg-op.h | 1 + target/ppc/helper_regs.h | 2 ++ hw/ppc/spapr_nested.c | 1 + hw/sh4/sh7750.c | 1 + page-vary-target.c | 2 +- target/riscv/bitmanip_helper.c | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index a02850583bd..bc46b5570c4 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -9,6 +9,7 @@ #define TCG_TCG_OP_H #include "tcg/tcg-op-common.h" +#include "exec/target_long.h" #ifndef TARGET_LONG_BITS #error must include QEMU headers diff --git a/target/ppc/helper_regs.h b/target/ppc/helper_regs.h index 8196c1346dc..b928c2c452d 100644 --- a/target/ppc/helper_regs.h +++ b/target/ppc/helper_regs.h @@ -20,6 +20,8 @@ #ifndef HELPER_REGS_H #define HELPER_REGS_H +#include "target/ppc/cpu.h" + void hreg_swap_gpr_tgpr(CPUPPCState *env); void hreg_compute_hflags(CPUPPCState *env); void hreg_update_pmu_hflags(CPUPPCState *env); diff --git a/hw/ppc/spapr_nested.c b/hw/ppc/spapr_nested.c index 23958c6383a..18bbb1403c6 100644 --- a/hw/ppc/spapr_nested.c +++ b/hw/ppc/spapr_nested.c @@ -2,6 +2,7 @@ #include "qemu/cutils.h" #include "exec/exec-all.h" #include "exec/cputlb.h" +#include "exec/target_long.h" #include "helper_regs.h" #include "hw/ppc/ppc.h" #include "hw/ppc/spapr.h" diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 6faf0e3ca8b..41306fb6008 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -29,6 +29,7 @@ #include "hw/irq.h" #include "hw/sh4/sh.h" #include "system/system.h" +#include "target/sh4/cpu.h" #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "sh7750_regs.h" diff --git a/page-vary-target.c b/page-vary-target.c index 3f81144cda8..84ddeb7c26a 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "exec/page-vary.h" -#include "exec/exec-all.h" +#include "exec/target_page.h" bool set_preferred_target_page_bits(int bits) { diff --git a/target/riscv/bitmanip_helper.c b/target/riscv/bitmanip_helper.c index b99c4a39a1f..e9c8d7f7780 100644 --- a/target/riscv/bitmanip_helper.c +++ b/target/riscv/bitmanip_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" -#include "exec/exec-all.h" +#include "exec/target_long.h" #include "exec/helper-proto.h" #include "tcg/tcg.h" From patchwork Tue Mar 11 19:57:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012642 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 77385264A76 for ; Tue, 11 Mar 2025 19:58:19 +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=1741723100; cv=none; b=e7N9ss6IWPooNBZTEFo17N0DfO0mG3gUmFdAQYbvmF5pBrnrhL/b9mtpE/9VjGpfVl+CnsuB2kjO0dxPzfIteQUZ81fdwwRgOZMeDJgXDCAu8LsK3tSjmo28l7AReEC3wQebfIZmP9bRQgkD8RtLKaGPQmqSRDIVt2eeKd3Ktkk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723100; c=relaxed/simple; bh=aHcHDSCEQG/Lxg84jg/rjAhvQowTiiMszTRoQh+zwoY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mV57VUx7BDjs4BZ2wtG4KF1T0wT1tEiBPOylI6I965h+yBraoI81gzTUDO9FeEe4z0fv25vu7/Ausj9s1cbjrXYZbJrBcGqPLPdzAbWyfW9QCxOO+eXVc7Yr4VuMSWn9jDxH0L6EXzSTr0buubMRSYatwKUgsAjvEKPOmpC4CQ0= 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=HxSloSRd; 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="HxSloSRd" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22113560c57so111409165ad.2 for ; Tue, 11 Mar 2025 12:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723099; x=1742327899; 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=HxSloSRdQGXpmdOswZJXBI4nv40Zz/Iy/WrmIH0THSFa/DwS/y+w/SWizn3dUh0f3k xiHPOF+DxDbmcCkBtvxYum+BzWcO5sIaMxR5CaLrZemR42usY1YNDKyQLmlidpoPzSpM OKZ483qnGDkSMTuLw5duFzMSPA7jPX2dr9xl3sjKoGbH2ElFCjMtvcD67cpIrAlhamo0 2qWFrf/HrF1UcmPUf4IA0/ounWdqfUdc4DUdlloKZOZoSrhAfd5l9YHpQfbOx+1X9Xv6 ro9+2QdT2SfIZeTOQMyvcO4A9FwMAuVkP5pqBCyno0rF48f9O1lPG3elL46+Hsjg3BUs GT+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723099; x=1742327899; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bYYGOsy+zcSjxVOnigwMonGaAhWbZB7W76ZyOX5Jlgc=; b=UnoHaHaqHvfdevs6pS+qfZmuttlL9NLduYeXC+CjnXe8BsHAwe4+ksm01s6AHmqAkt d8Att4s4OYa0fGnlX9FWn1U30DguFLJ+vux3+ktczPozpT/qphNw8N3LSTGjRCFj+Ie/ oCG7za43e83ZFXwC2GZdMThGt69E7iY3EUVjHievBrT8Qtj6uzqdMTt5LB10mLAv6WSw c5KDBef/GPHruRl+lSJ3To6IeVNKiJkzK3C2V/b9EXsK1lREXBo0jsLV33LaU5B+pOyK K+aBfmXChzj9Lb37PycNMyJnzPme1keXFDTI2/m2vHcmpZcWQTeAwSmZASEIcaHGAhrE I1aw== X-Forwarded-Encrypted: i=1; AJvYcCWv6fDKyvbyLAGf/R1MbHHCJX3OYF/M+kpREhdwUPeeWKbuSqhAE1/9/jGu5Ju6FCa9zhQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzZvJmoeiajoY+HDh6nr/HoAGB1xascxxTxuk4kbDB4Dtqw0e/X hDgjf2UuSCaTsgO7CqMRbO1QIu2h/ENVLw4ZZobj/cQY6OTwZlisZ/ofVrBc28s= X-Gm-Gg: ASbGncsvu05aT8UUl4/Cfwbawd8B0cDVM7HVOaORrgbEKXDT8Qjv9x0omth0AXuLB1z iFCKJLp3XPPRP5JAJbtKLp0r8TiTk6+Kq2mKji6ZUzm1AZcZuLLzS8MOgSdERETaSc9yIR9AbpV DmO7xLyLaU9U+hVmI286nM3Lmd8Q8V+9NK3ytMN2NZ9ssODaS44zngoGx+BwGW7ixUS/WuBy6oX FmmJGUmBgNxnDR+50qtiR3s0ApUmFTUReo6OiHyBzz2iZ4JQ3fHHxRTS3yaxjBobfBsvU3UMWfc xu+2p6zcuX9PAIDSSQ1WBIP0LY/wKM/gdZPAIBa8orV7pmkdy2KTtds= X-Google-Smtp-Source: AGHT+IFbL/EikEqHmQH7/+hOB9jflYFjv2fXkewmYVpLTsSrUYTiBJ9zTgGhdqBywi26rV+yUM0nVQ== X-Received: by 2002:a05:6a00:1708:b0:736:43d6:f008 with SMTP id d2e1a72fcca58-736aa9f0b0cmr27815913b3a.12.1741723098739; Tue, 11 Mar 2025 12:58:18 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:18 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 07/17] exec/exec-all: remove dependency on cpu.h Date: Tue, 11 Mar 2025 12:57:53 -0700 Message-Id: <20250311195803.4115788-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> 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 Tue Mar 11 19:57:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012643 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 8EC97264A89 for ; Tue, 11 Mar 2025 19:58:20 +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=1741723102; cv=none; b=tm/o5GNcXYWMgZVINKVTX8OQbgPX8Bo48U3pTtEnUFYaSugVhJCAsEup8NUIkewuGFSys6BWjf6pbxwWRs/TucOGfcrm9mRQrVWMby/D6PTJ3AWTdtC3jBxkYE6RUDeEaaE7OOnFFjgsxxKf1jGCQfoIcu28G2hTgSEOtJSLYXA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723102; c=relaxed/simple; bh=072rJgb1v8WTOR3ndNWM1YDjHaA2UGkZkEMRddxYphA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bxC83AdShzrtURXEPaYX2Fhnp8Uk6cRfgIJPnhub/WZum/IUcZl//+8MY31dKrf2gvB5GBasQCKXo1kZ0CUq0OGMiS9IgX6oMzIM8gmL49kXo1L82xc8gWvgJ1uvi6/mP2T1YrLauFYGJrfJCJj5hMagBo4bf2s4Jxa6AaA7DsY= 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=VQKe6e1/; 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="VQKe6e1/" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-224100e9a5cso113423635ad.2 for ; Tue, 11 Mar 2025 12:58:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723100; x=1742327900; 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=VQKe6e1/xzAPzzsKM4rEpWhF6XTrwbC/XR+Z+DKJKBOiIjlmC+vV9r/KP7+IERqrjY 3o70WCSW+VT5ol+riMniW5Acxf5pk04eEjKlCU2Pz8gLBPa68a1xaxVSDA6S4zQEKbni SrW2sUPj6TpeySQSFV/QeE/fodXGmBW0l7sQyqFGyQq77fjxuEeick6yZq/lBzngERO2 s1s0qV+LE9reFAbiD9x1ozPTaqHMSdzN1k2KrgOZ6RtYBReHrWnMqGFYgoXzkvYaJNkc IUd6QxePTQHoyyXiUi3IQp1O7nbBx5sK6fxzKM6o3G5f11diXU5EXczFMZyAh4COb9Ar 2s9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723100; x=1742327900; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Rp8GQC6vA5rTxSSazblnkjuLZPjrJAYUOFg9uGM493s=; b=pQE7IN79lWhxq/F5pJvAShq9xtpY8GgM8lTx2ssjbwefsPLzx91DaevmKBZUJzFxqU AD0e9DFs0OTEgoAuLyZyO7dJQyc88GzZvBnZfrKfHNtHpViuGHhfXItw+UdH5FjeWL2Q wxLYQ2SEY+q4ImCFFv3UfhUwvt6eYvuafGNzXvWAP4Vestwr9fZV06+FM/ORlYEZKtJs HUz3ezRUs9CBTgjmIoGL3CaekwmjtuKOM9e3OMj8/t822zzlRBLo0YiUhRoJWNN0AFwV jpZawfUBGZQuvv8YDgBu2cmd27oWccIM8S9FSLYFbvFWDL+eCf+q8pssUaz3/KCzPW2j PCog== X-Forwarded-Encrypted: i=1; AJvYcCXdK9DwTEXx0kULZ2WsaCtOymKAMrO4iHz4zZF8tXIZhslKe6L06s8ANkol584XXP89VZ4=@vger.kernel.org X-Gm-Message-State: AOJu0YzPvznfVXADomTJDnjhgNSiFy+xpHZvT6Yc/y3d9k74nv8v1eYs Sm6k39UiuAlU9EagiZwLl1KI5vozzaPBmVcTCqVwYtY6HMVPuHk/SryS221EwnE= X-Gm-Gg: ASbGncuiM2db6cNWeVWQ0yCpz72inT7WTfn9o/HAFqFaYux+MnYDNPcQuRcVUZ2zfDV nN8S9lt0WtYQ/cwUZRUnJ4ShnaMKFA5zOfo/jsyCkltnKWUjWXsF2iuh7OuLXfYjSRKQMELcbFg hYWpjqoDiGK22UJ/NgFaaN7EOk9GNzUZkl2M3Ua8dZhPwTVZaQTQryEvqwKV7+21vtghDAiQkXW PHowCnIQG1uIoNyW+/Uwz5hGi3OhqhmnyItlcLlThrwPWAVnW+Tj2RetvRc3gZRTposkgRw8xJz QimOrvOTZ12La8JcscjUB0rPyeHeLeDy8ojCyNOFKob/AIOPxvVZ6gY= X-Google-Smtp-Source: AGHT+IEBCxz8tAPvpmfBsP3Ukq6OIHQbs/5ODtSLSGAs7fop1NjSulQH4pEJZaQn/aXi1ghSaJLALA== X-Received: by 2002:a17:902:cccd:b0:224:256e:5e4e with SMTP id d9443c01a7336-2242889d3a7mr298318035ad.16.1741723099862; Tue, 11 Mar 2025 12:58:19 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:19 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 08/17] exec/memory-internal: remove dependency on cpu.h Date: Tue, 11 Mar 2025 12:57:54 -0700 Message-Id: <20250311195803.4115788-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> 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 Tue Mar 11 19:57:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012644 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 95C7F264A9C for ; Tue, 11 Mar 2025 19:58:21 +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=1741723103; cv=none; b=L/Aywcx472v5nIo4xjGJc9pWk2VP/la1siLdWW3ZF+NzZ+voULX8KBdjt3UrllI99Gso79DHig5L9w8iS7G2mxS42kG8bvjZGwzkMgSE31b65wcFqyAzt16tzF+XwgUR87M8AsLtiFeWmSb8ow9NyxVr0d5YpXKpui+SVFeU8KM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723103; c=relaxed/simple; bh=gsSv2px28tuWsGYFfY5TQSDt49mfWpFIGYwmtj+tgSc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aWexIFUIw8NOSwjV+EiJ37BQvB2eBNHuq03rK+7NmED4PjJtsMY55mt5nDYHjWSiix+PHSN23Rorq1v0Y+E/aHWgl/k2JwAKCh6sP1rQ4CCMWbIaIzkK9yjydGWayfi4KSCbEQxVRE6pJdDiiHqwfBl+SlYyatw+j+FjItHyXrU= 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=qXSR1OUZ; 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="qXSR1OUZ" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-22580c9ee0aso38784895ad.2 for ; Tue, 11 Mar 2025 12:58:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723101; x=1742327901; 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=s8l5XLcA1+OCzVWAzWmOGo6RbdXUAYo+RpTNM4YWpKg=; b=qXSR1OUZ/ozIqDe0arlp/OcIpL8uq0XoUhrYxnuxyeYSYskvhpJWT9mE0UI1Mn3ZRq TyZ31PZ+eoBCc6dfyCyyADw0DV//jo/ThpKX0bXliPWVQIEnMm0MpYyLPi38Zk5nwaz7 gAE54/MCwbBqsGWLwUPRtFlepqiiCPLdUBhehOA+ZHdDGTm/uDc4ZntbjJdoegVG3lgl t4L+dE2LoDajXNkR52uKvfxkI1yz0XF1yMvSlK8P8L+dZuqH9E4O87BX9vppt9dR9HMm tqGWpaTTiFN/FSoHOoM0/YR5QRp1APtuXc4FmXJOnf8nOHgVbRjW7+1Vx9qdhh/hGEK2 yrUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723101; x=1742327901; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s8l5XLcA1+OCzVWAzWmOGo6RbdXUAYo+RpTNM4YWpKg=; b=R2xd8lb5kHQWtTUWTm4gz3nBKqsQ1X5oZWeyyiuvjJDS8ir7QlTnpST1NqpR/7Z9mF Eumn0KtwWnvOEee0LCSy8OELYGObBPxsjsGab9YN7NkVgnfp/eOALOSEfDrb2sQzLI6t 6i21vuMXc1XDQZyxnsD2UMZqO3z4wPh6qvtddMimARoRaojX1M6xNQWyoZYImeSJdaqF i5hnmt2wfA/OoaMWec8Wb73cpNvh/TrDwOP6gy3vTyLsh2KWlSJoj4XK1mX94G+q6GyA 6Ek+YdKOmymxbXFkl073W6dKs5Pk+kAoRLw+8l8M12i3jtk/BngXELXbkdHiploL5ExH V1NA== X-Forwarded-Encrypted: i=1; AJvYcCXpvJZVzPSF713LJ9Tru1fiGBSJGkojdqD9UFJUtjFI5bCCHFupTWuW7rJ0E4KC7MotJm0=@vger.kernel.org X-Gm-Message-State: AOJu0YzGkQboUkMI1A4szx6tXxV4BgWdMlESQQgHe7aNMjquo16DQEz2 GcUWKtD9WpBc9wgspxwFDQ4xOF5dLNy7YPJWVd/nF58pDNvrlhtpEGHuFqIzENM= X-Gm-Gg: ASbGncsp12bp9yqpsgIZqukQxuNceghO5qV+P/S3L+EHcKXWdS2LgbjMs2fpyG0Ejsj cVfVaDyatKwhILN4m7eOqDn5vC4nTo1zNhV8/IfZXKr0+ucQ3/rzgxPtXVdA2tAI/r3GhP0CiYW MO43D+biVagQ8ZxVstlWu4tDhDlYASaFEjn//Zs0q9lDn8DcHrMe/RP7Tis2v04W4D/WrD57Dw/ 6iljIR38U7FkR3m1asvQ0arAr3FMIdqqANiiwJFejigW7QpHTY1ylSFns4rAq1YXUGrnPufq7WT +L5GDwPa7BDN+LLDJlQPRP+Px8usd+74yc1r9PfEIP3W X-Google-Smtp-Source: AGHT+IEgYvc9dMvCeCMS1wOBfk7GI8sssnnWj2guiDlIPD98ekjEveZX8r3rPhR4gVsvHIzZwJ8+qw== X-Received: by 2002:a17:903:1a05:b0:224:1294:1d26 with SMTP id d9443c01a7336-2242888bf0fmr253744785ad.13.1741723100980; Tue, 11 Mar 2025 12:58:20 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:20 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 09/17] exec/ram_addr: remove dependency on cpu.h Date: Tue, 11 Mar 2025 12:57:55 -0700 Message-Id: <20250311195803.4115788-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> 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 3d8df4edf15..7c011fadd11 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -20,13 +20,14 @@ #define RAM_ADDR_H #ifndef CONFIG_USER_ONLY -#include "cpu.h" #include "system/xen.h" #include "system/tcg.h" #include "exec/cputlb.h" #include "exec/ramlist.h" #include "exec/ramblock.h" #include "exec/exec-all.h" +#include "exec/memory.h" +#include "exec/target_page.h" #include "qemu/rcu.h" #include "exec/hwaddr.h" From patchwork Tue Mar 11 19:57:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012645 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 D86EA264F8A for ; Tue, 11 Mar 2025 19:58:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723104; cv=none; b=TJ65OZRmRMEQdSXthTfMYIDmOjGjMC6AAhvDn0Hxom0hWYyvfNJhITJfZXIYKtwGWG/qIcNYK97xNByWcvHHkKtNYQES45JrLtfCIXgo55zFoGELHidHS/zEkewQktA8K6rb7i7HaBhBFYB5pd2Ovt/bgYipRRcr5dIo6NdOaVI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723104; c=relaxed/simple; bh=eZxW1HUQDLqOK64QD3ZvyFTEod5DwQVKTFd8dmVQepY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iwVTYMSzv5T5tr6N7YG1SY/ywWpfccELmWGDxZsjszcWgO2/r0tNo1eWh8jwSw+Osod32wZy2s0Dfq3Wt3lKLhcr3G039NmsZuaIsgVUX0+9i4908RmRjqERW2hYFfsJausONz7oifJvVDJwvVA+MUFqWAgbJGT9J48Z71O/08s= 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=bxAVxG4Q; arc=none smtp.client-ip=209.85.216.41 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="bxAVxG4Q" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2fa8ac56891so8939922a91.2 for ; Tue, 11 Mar 2025 12:58:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723102; x=1742327902; 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=bxAVxG4QhB8ut4YekY4ZD6qPoBmUcBbjkEjypu/F6Ypct26zU8o9Komizpgh0FzVPA u6uSmLlV18XLC0MT9ghnvsU5BF7W9CjG7qeWuRa7BHikQkZ+YfnEZ4jQuOtAHn8fEaE1 UdPfHhfGZfu0ChTGJAffkOCe5bnAH/UfT6q0UkFoQ94UZKFYtfQV/Q9QcSOfYE/2r67z c/i1MHhbqBvFT4qlWQ4GFIZw8g1NWfctWSVNoX7XFZdJa7KK2UKoGGH9Oue1OLeQGEFo kOVWTDLS0AhhYJTMbDip4ebcgYYwKIHY2QbTRQ80S0mm3Sgb8BcLS8Ow9KmgSdcFI+4L ThbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723102; x=1742327902; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BsftdeZcZ0LsVJ43Vlgc1kB7SrUHDvnjwuIeYSteybs=; b=Qb4tLY60aKAWERje/l75uKZg8MrUQnbdvFnMRFNqDbwOGb7g9m8dtap4FhVxYSoUCe AWJHab3NxGY9c0g4IHphD/bD9wLizr8QbXwfQB7qxxtqoA9MimStURrIik4pkryzG5ci 08R/54fA1665EpbF8xk1DCj6siyjZZwg8zWQ14erbvJUeuxcrk8/DHKToUcB3ly/hISR eMIgbDtfAiyCxXcI6tcuJ2Khstuu0HIcaRD0UJvTlV0ZzpiFy10b0ltH6hssuQ8Rpas2 4Gf2SrgkDpJ6dtMQi4z5tLUcrN6vmXmJBLx/8L5ANwHWvdXnNSAUaEJALwuOhbx4RTU1 WaSg== X-Forwarded-Encrypted: i=1; AJvYcCWwG4bdb2caPhsNL42WJXJJMDTM4U2RBYhFTA8APuFlmLTk1aoRtYgcyHA4vQln/NPLVCI=@vger.kernel.org X-Gm-Message-State: AOJu0YzwakeXOPpvgwUsX/xV9FmM8eSfPtHRi2SiC04BgKkC4DGR/2im 8QeW5qIJIszT8EVHxqWNs0ICmjJjMBEx245VyxLLB8VGmsozXS/K7zLZn0QeEhA= X-Gm-Gg: ASbGnct6a4Ht6ApTTg28mP6mHG2WJ0zSBVaP5zkdbJgNyIIPiBFnwiFfDbVCODHq55a kZTwlVyMh8LsdAkstOvb/pi7jV78qyEI6b24FwCPXSs6uBOzgo59XCTlFCbaRpnvJbK9bGwP1on pszfhHtac/ZQFGfHWHy/y1QzPyXdJ9vFh55Lk8hGhxaQdBJuTS+lwCw8ZpAwSoh0grUG3PnvOBi fE8ZYiZwmY7aDtO6ClkM9fa6kecdn3ygZpOIIVTxfFWHwS11c0QJxQZV8aNAQSPnfBtqk0gMWTV ujnn/Hts1VgjvT+U7mkBvW0kegzF2BtaJ1ViwgKGlzCT X-Google-Smtp-Source: AGHT+IFuSUSQsgKDn+cb31pnjdNEblE2NjRflSuEeU68kg8s8JFfsQQJsGkDTEhj0ycbJp3/pjIRHA== X-Received: by 2002:a05:6a20:6f90:b0:1f3:397d:86f1 with SMTP id adf61e73a8af0-1f544afa185mr29488018637.16.1741723102158; Tue, 11 Mar 2025 12:58:22 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:21 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 10/17] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Tue, 11 Mar 2025 12:57:56 -0700 Message-Id: <20250311195803.4115788-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This function is used by system/physmem.c will be turn into common code in next commit. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/system/kvm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index ab17c09a551..21da3b8b052 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -210,11 +210,11 @@ bool kvm_arm_supports_user_irq(void); int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); int kvm_on_sigbus(int code, void *addr); -#ifdef COMPILING_PER_TARGET -#include "cpu.h" - void kvm_flush_coalesced_mmio_buffer(void); +#ifdef COMPILING_PER_TARGET +#include "cpu.h" + /** * kvm_update_guest_debug(): ensure KVM debug structures updated * @cs: the CPUState for this cpu From patchwork Tue Mar 11 19:57:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012646 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 E46412222D6 for ; Tue, 11 Mar 2025 19:58:23 +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=1741723105; cv=none; b=UQbX2F8LueZUSA5Z51qqWmaOxXvc9gve2jQAyNI/YizmbDQkYtxr2RQoUrSfm+kocCzP9us9lFWCy/9auEJ6rinVmG9cmihx1Mtl1I3NB14SJU8qCVzSGgJfztXtxOhK2Eb4lyWbxwEDz+6jyADaF8K001vLdMt+JLuVzdk9ixQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723105; c=relaxed/simple; bh=2EiUgDnSIr2U0DMUcevHrrz6cNF3hvjf3O5YcIT7Nyc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=m8UNudR1Eji14Au//FrTeuUWrf4b24tPhL06D304znBq8fWGy/9ivpTRtXtEIzYryGW6NrVtZk+TE9oZkDXTcQRVBb+LzjSk3GvNKGUZF2iFoK7Ug4XbQLorK1l4NZ5n0jo8tQk9qLG2J7DzOxgB5QStPH5D6z61h6D4Pr0uKGs= 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=juyWFU4t; 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="juyWFU4t" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-224191d92e4so104659625ad.3 for ; Tue, 11 Mar 2025 12:58:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723103; x=1742327903; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d9PU2mUUZXceFgFF8NURkIZqXSTxuLUTW3yG3F37dHQ=; b=juyWFU4tuDzqEq9xi3IclMGCP7yIpEwgS2cY9ruUy/Ou3Qd5KtZ+5BxdsCT9MOcyJG biv3P0E7fQnBWiatRKfO7ec7q51EsXJpydUaBx+bFReeU+N0BZFCmdRX2Vp+vLlSBsJf YR3X7fiz3WDw2j1oKrReg8gMKxNM9NXIiQO/2XnL7E0Yn06PTKU7if5JUY0Qm8viTgMy 4bDp4lBeCP2f4dcsF3ao2vAPAPqhLuaTy3vMBENT0+1PS7F6umlmV53QMPi4LrdR5URV 0TTcqDlMP8urudTxPS7ixZIW2/+rq93bISszVw3KWv+L3RY/1OfFFXELp6aiQ94CV/9f 4lfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723103; x=1742327903; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d9PU2mUUZXceFgFF8NURkIZqXSTxuLUTW3yG3F37dHQ=; b=WY8MpPB0KehgqhJmEn3Rl0QfhpnYxpWhFrbqGMEKe7PSjAEYrdQPSVoG6wx0xc/LTS txuCIJB19BdKSB1q0FbZkyMbC8PZ+xa0zNubiQ+iK1ev12GvIIe7TyTD+AnBAa4HGoCn Y7cCfNRstw1zGmYNIDVX16JnglnaF73tFW9UJ2zMr6TE6GqhpuPEhZzoPF18tKNy4dmh mIPpMXxtI+lNxDRxxug7ulfyeNlGSUV/TJ2FE7uzqCZ7Pn7Rkh96BUtjn1K5uGdmuAeE 732nXGkGO+dfQT2bGnxB4NZAJHVp6zTsoB5CzQTYTvQFQGGlEyKTnAUNErgbM45fl3F6 nFyw== X-Forwarded-Encrypted: i=1; AJvYcCUbnJ+Wy85tzltATz1nBpvOXIQICgL81Dhz4PHkmyGjQ1fqDOb+cjDZcHmURE3X9MtM18Q=@vger.kernel.org X-Gm-Message-State: AOJu0YzVUYtc9FaWTkWAOeZB9529Y253fr5CgDQFzD1Ft7B833OI0Vr2 Jm/n4YrG55bOWuaFBZUGuC3wQ9tSAnPMuF7d/29cjdjrD4ou0pxmUBpLM7g1t5A= X-Gm-Gg: ASbGncurlvied++bpTfkRhQcS7xB7aQmh8BYJaWLfPnE6n/PvDlJrvkBVPOX7BeKnPi knchGsHW98G8yEcAj2uXGBbmQ06UNmbIS514dtnp7UpqoXwP/fIY8oqqUrVKndIXqBwcFb8hlCY RnvCSqkl7ncQRAvz/g4SWZHRJusP/eHivdox+FX6fq2P+gsWBfaWSKWCdZ662PtfUK+dLY1R+/T awNQgFhVPt8LZZV9d4G6TSYompafAfLK0Md40Q578dsd4KT9yWj7WyXQ5Vi2sDZjihHntfzlRyq 0apOmXBIxDfBaOytE7ZcaLHaYBjvnexlN8iDoFgDzQRLr7SCOF4aJ6Q= X-Google-Smtp-Source: AGHT+IGg+aQTZ2xq9SQi3eRnsIeXjPhQ74pTHWyL4E+moWnFDewPnn2zGKzm8djm9QcS5fi3hNfHgA== X-Received: by 2002:a05:6a00:c8f:b0:736:34ff:bfc with SMTP id d2e1a72fcca58-736aaab7d8fmr24949384b3a.19.1741723103280; Tue, 11 Mar 2025 12:58:23 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:22 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 11/17] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Tue, 11 Mar 2025 12:57:57 -0700 Message-Id: <20250311195803.4115788-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- include/exec/ram_addr.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 7c011fadd11..098fccb5835 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -342,7 +342,9 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, } } - xen_hvm_modified_memory(start, length); + if (xen_enabled()) { + xen_hvm_modified_memory(start, length); + } } #if !defined(_WIN32) @@ -418,7 +420,9 @@ uint64_t cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, } } - xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + if (xen_enabled()) { + xen_hvm_modified_memory(start, pages << TARGET_PAGE_BITS); + } } else { uint8_t clients = tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE; From patchwork Tue Mar 11 19:57:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012647 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 2BE7B264FA8 for ; Tue, 11 Mar 2025 19:58:24 +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=1741723106; cv=none; b=b7TtE6kONyFSp3figb4CYrNcNrEG7JTjKSqwetJzWBEaK5RKIq/5qSREt17+3DsZEDksOI2cGLXchKPbTk2xMXpykFFuERn07fn7ZCSM7QXPAZ/WxwO3pXqeHWeJPtdCB8nXvK0MBj9ZHn2sSYxqpNEMm8rmbr009x+AXBAvFwM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723106; c=relaxed/simple; bh=2BGYv29y1gAuWbOxLdSmdLhzjdPFXu3kgq+kOyRsd60=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NojEez+VaUis54s4xkd1akPh5ioA/RZJBLQgs98rb16XyAXFAtduGz3yXBl9YyEvZ8NWxw1IM4bEIS7pBNmEmGKyuvbDLLYrQzGDbnPMFdvYJvuRuHC4s4ngu7DWSeTVNOIK6SXKQLUz2ypDrCBRJiDPnSLvD44IxDabzsNeVxw= 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=rJX4cJi0; 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="rJX4cJi0" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2235189adaeso4054725ad.0 for ; Tue, 11 Mar 2025 12:58:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723104; x=1742327904; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YZcwoIie6BtZ5Bqo8BYW0CKBTK95znA0iA8YHmiy7v4=; b=rJX4cJi0dmaUt93sUvWSQXQmElh79kgiqadsHJxHIFKNpFQk8RzL37Em/2GaBviEUO rh2F2KI54f+RymMB5ozYcFIy3x1PgjwGzsEAUHDXgQ2QEqSRhax43bgewJ5l/+s1GOgt LKfcTLuz4tSrJ1fJwIH0L2HFDcT568pdIwRlwhMKD+72nLibAvbXg+z1YsiV9KRO/p7v YY5NhI/C8bYuwQDa/30Ar4a98IlLNgftSXmr9/h/GwSvIHrWLci7mKiSjqw4yYrGlRig MEiUEJQ5852bKjMH43DVVE7tmN9Uhxa6MejHh1+vH8m1LJnBUprGf62aU7RlycbHQdjR HupA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723104; x=1742327904; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YZcwoIie6BtZ5Bqo8BYW0CKBTK95znA0iA8YHmiy7v4=; b=FgLqrYjFVM8tioaBUHnsRURjWHPbSQ/aJS7Jnp/jtUwOi7PfgEVUEEEMUpnWV/PYbD YhYka55vGmEpRdk1UkxLl408Uym2/oqsC+mrsDC50VBCEgj16DyoxUsgxcoro/r7NVQm KTXt6ydkdHwaR7wDYg2oRxcsNxIprye/TrsjAeWCIAXC1EugFHLhCF4Fk3JQ1dSqWxqp MxW0tcwRKahECe/rCM8ZpKAJu94KOMkWJJE2L1ftHtd2TrOdV/+p8Ut8Wit1SWJe325S A3Rc3/SPeVtmnORSp4Rm17VsDcVdr9DSTNW/tmLYL9LndfR9IjMLzh8UfxRZEHUlRCaz iK8w== X-Forwarded-Encrypted: i=1; AJvYcCUFGxid9jOhJGMfIEqAG/XxTyM8tmFX6RuLZqj485BZbLmJ3ZujWx60i8uDAD9dkodJqO4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz57538BZpwcP6kQsCr55A2CrThLHpkmylHso485Qaut0OzCFfJ eVROwBBp2ZsSVrG5LiZmkKmGCrtAW9bmXyI+DsMzXPvtbMNMRqI6M8iX9Y5K0Ho= X-Gm-Gg: ASbGncsQ3rctAabEnbhIXlED9WwfsELX89nF6mUbJ3Z5UUueaOPClyVY/YDcwMuvXly lCZiCVAuWXw9jJmUeShob+HojmybNgesF51bazo37B7Kw9E51gK8mc7ze9eU9b3de9JT1XqI0ju 9HE2V3uhD6fyyjdudljb5bWEhyJ1tTPP9LaRGDboM0c+9Uk5dnYZR9BRXUtFOsM94uhbfuq1OAt tcXtQDlmx2cpi/Q6OvmZ0MDGHsFdWojR4dcmg4iryIXPMdQMY6VGdDwsMvlqqEnSurHfSo875d7 qiRyuwTlwG5LwfZwOjgimprhPhcvgeKZ+qpPMAwmRBpj X-Google-Smtp-Source: AGHT+IEToni6mHy+/TOd0EQfFDFUNLQyZb+aNmkKXcJNYvCuHB4nuxbuNFqkwEKNu7S4yPPDELKJzQ== X-Received: by 2002:a17:902:eccd:b0:21f:5063:d3ca with SMTP id d9443c01a7336-22593dc5076mr68139055ad.16.1741723104414; Tue, 11 Mar 2025 12:58:24 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:24 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 12/17] hw/xen: add stubs for various functions Date: Tue, 11 Mar 2025 12:57:58 -0700 Message-Id: <20250311195803.4115788-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Those functions are used by system/physmem.c, and are called only if xen is enabled (which happens only if CONFIG_XEN is not set). So we can crash in case those are called. Acked-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- hw/xen/xen_stubs.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ hw/xen/meson.build | 3 +++ 2 files changed, 59 insertions(+) create mode 100644 hw/xen/xen_stubs.c diff --git a/hw/xen/xen_stubs.c b/hw/xen/xen_stubs.c new file mode 100644 index 00000000000..19cee84bbb4 --- /dev/null +++ b/hw/xen/xen_stubs.c @@ -0,0 +1,56 @@ +/* + * Various stubs for xen functions + * + * Those functions are used only if xen_enabled(). This file is linked only if + * CONFIG_XEN is not set, so they should never be called. + * + * Copyright (c) 2025 Linaro, Ltd. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "system/xen.h" +#include "system/xen-mapcache.h" + +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) +{ + g_assert_not_reached(); +} + +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + struct MemoryRegion *mr, Error **errp) +{ + g_assert_not_reached(); +} + +bool xen_mr_is_memory(MemoryRegion *mr) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache_entry(uint8_t *buffer) +{ + g_assert_not_reached(); +} + +void xen_invalidate_map_cache(void) +{ + g_assert_not_reached(); +} + +ram_addr_t xen_ram_addr_from_mapcache(void *ptr) +{ + g_assert_not_reached(); +} + +uint8_t *xen_map_cache(MemoryRegion *mr, + hwaddr phys_addr, + hwaddr size, + ram_addr_t ram_addr_offset, + uint8_t lock, + bool dma, + bool is_write) +{ + g_assert_not_reached(); +} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 4a486e36738..a1850e76988 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -9,6 +9,9 @@ system_ss.add(when: ['CONFIG_XEN_BUS'], if_true: files( system_ss.add(when: ['CONFIG_XEN', xen], if_true: files( 'xen-operations.c', +), +if_false: files( + 'xen_stubs.c', )) xen_specific_ss = ss.source_set() From patchwork Tue Mar 11 19:57:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012648 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 6BDF7264FB3 for ; Tue, 11 Mar 2025 19:58:26 +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=1741723107; cv=none; b=qVHmlf6ZXmHTiaUt8JOHNb5VQANSzMtWIW2CC0DCOUER9YrjD2d7tgdQ+sKXuBXtrd5D49i8tosF9Ad5gg7srYIq/WWh9Y+yFZ6UIwpO18hGkrDOhwsad8n0JH0GqEoAZ+9pIjhU+j1vIEDq1h6MGe0HN1ASjzQKpQs/L/Ak0EY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723107; c=relaxed/simple; bh=CPSslnXnrG3PuOzhFaRqUdFyOZWqbvTYRwMrQTpy6Y8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BK7cGDM593IyNdvlBhcUdVmmz+vP37yjFATk2ZJGN1msECOL9iOs85ZxP8aBt1J5rcBnuR6x+cw3FJsHvLzGTuSkNmQeEP7mT5cRE4YqvHx+pzF4w2GILADzKX4PYm9k7nIOrsF412nlKUNYlvyWSrCPA5/oZsdwML1RHbRl8r4= 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=UkZk+kLe; 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="UkZk+kLe" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2240b4de12bso19846695ad.2 for ; Tue, 11 Mar 2025 12:58:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723106; x=1742327906; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q89mBu4b5JYOE58WB93/V2zR/jXmfpOvKMtRO3aXK0o=; b=UkZk+kLePq9NOErPoKpQtIlZqMxBv8JKhPnUOXM6Pm6+As81kU88yu4QxrNC8lFuir PWrGHGII8Cze+olPithsLSUSV9Vbe9JxdTqE9+E4gTHtpx2P2LX6U3nhW7+Q4DzZ7iRf hTLZoM/knfmoOK2VP35UAiBmcg4jz1UhSLNaIDMH6ViO4lZ6auDzrUgn2j5sEsNumImG eTgBrpG6glC3hnR2PTxY84CFV0Ut+2ZO5UnuKFxgX7ygSUXb/xzzrFQyfKkC2yEF1Qf9 KlFynwR5EoYsPII3tU8tBdUu1fTp+SlSpeuWowbf1iDfVLNpzbgemRlZopSR4xwAGm85 ayRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723106; x=1742327906; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q89mBu4b5JYOE58WB93/V2zR/jXmfpOvKMtRO3aXK0o=; b=u5M0t536UBldTtE6RmiNSZUUBpF+w566Xhct7O+++VGZn/W+BJP3vw8cmOAZhkQWHZ LQWYEHzNmgTz4Ny92ZcTET72ZWjAz9JKUsFrt7jiwDOSon491yZXxLamplRwmCHfSlfz EqSVfoPD3uESBDkt/+foPNEZFlo2YTG1q5Xq4pyTFn4GMxZB2JvxgYnIeWxzsZ2U0MB9 Fg5IGo1lL24yH0uvw5aCPNKMNwuXXVMTk8z7eR3HV4+BGxkHmgCL3KOiCkXAvTsG4c1O efJgPboxLbl5l3sxURMAsoDS6oEBr32BlmkE4aZaOOtaemkiJpoCwwl8FXXf1Q9OFg70 IUIA== X-Forwarded-Encrypted: i=1; AJvYcCVXVzEm+aSzUX9maHz7YgAYBg/vGzX9iC2PgpMxIS8WuNwzqPOImw2fNtIW1eh61Unr0jw=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8cJ8Y2IYCAU/IwDNn1f2ZcNraJ0vb+ya4I1patzHt1wB8LrmS q00FQEdMwd+3gWXvDxegp4V5B7bMe3V4pTP4M0Co+l0s/JmIicKzumYwYmFGEao= X-Gm-Gg: ASbGncvrurDh6IeBs2Ughb+WxlsrJnMJzQ1dujdPYJSLzZcL9SL853rQm1SU9MTOYc5 83By/UJ2tu1OCfo+vcTQn6sJtHtKjJbveH33b3/AkEjD4ulSzotLqPoe1eY/LDD82NZ9rjat9MV 5Q7W6hOlVtKcQSPSy/wSsgGD4oUQrBCWMYJkh7m3Ijeyh1Svc9V6oP6znu/0wgrOWyM/JXFvPbg SFHFQmmM0t+gptc6Iiqar6kXfOCqlTkHuNc6P+SPr685JS/q2CgbiY/yesKmXniqpxpnCvh0OlW 03/rhutzUeQRU5tDZaWt5+8YZto4dosXYTsanvQKL35G X-Google-Smtp-Source: AGHT+IGPxcxao/HSElseyaTLTAghrvJ2csxsBfbQ4Udwa0eEZtZIt5xFFqgWZBrC6WgJmJp7FceqHA== X-Received: by 2002:a05:6a00:4b4a:b0:736:5c8e:baaa with SMTP id d2e1a72fcca58-736aa9bc0e9mr26082176b3a.2.1741723105679; Tue, 11 Mar 2025 12:58:25 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:25 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 13/17] system/physmem: compilation unit is now common to all targets Date: Tue, 11 Mar 2025 12:57:59 -0700 Message-Id: <20250311195803.4115788-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/meson.build b/system/meson.build index c83d80fa248..9d0b0122e54 100644 --- a/system/meson.build +++ b/system/meson.build @@ -2,7 +2,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'memory.c', - 'physmem.c', )]) system_ss.add(files( @@ -15,6 +14,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'physmem.c', 'qdev-monitor.c', 'qtest.c', 'rtc.c', From patchwork Tue Mar 11 19:58:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012649 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 6844D264FBE for ; Tue, 11 Mar 2025 19:58:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723108; cv=none; b=FH5evKjaX63IlR+bXS+UHNDcJa/WAkUXiBx2g22tcVy0qgjIdPB+OOoHIZqQto80LrvLb70rFeroq3m7LbXVCqJjMShRf2K1pCk1ebQdqKtTGABK0VmolIjvXYBHWfsk/NTmnn2NkgSIgzw3wED4v6qfJQJsXFG7Ysq90XfwbKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723108; c=relaxed/simple; bh=HWCRrm0GaxX14ykibana2jy+mNovavf3Va2YjCViNUU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ilszPbJG6Wd9TgU9+h9t7g00izf2kt1GAljaJ0pR2J9Sf9HIZwqHb2F6o9T1QFzP1tavaL/3KpkaT7iiCDCUC+1y9mi+T0LbHhpcz1kncn89t2ItPMv0tSWOUG6BkURCjLpQs3QqkK4V1kMKKwq7Tu3MChue5lywmZVRMlJjD6I= 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=muqHUgVt; arc=none smtp.client-ip=209.85.216.41 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="muqHUgVt" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2ff69365e1dso8805977a91.3 for ; Tue, 11 Mar 2025 12:58:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723107; x=1742327907; 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=muqHUgVtl9QLdlNCJATEelHbxrK8GMjSdGC5PLQGPH1RLg9pz5yJ1io6hGRZy7m0aa t9+BJspdtgfPTZlhWAxPE0vpzjxJr8axQTxgTb7dz1CcZbdgSaK6KE6vdtDs+cDBtYQN 9603wlsCZRhDAay7sYVkYZS0/Tvk2/xE0glm1yDaIX5BPGP2ZdxvpafYi13HFv5pbFb/ JeiEZpI0rlq0se19WE1qUU175fENPpCLIzxNTcxDHN1S/ze+VuBI0/HP74e8VCFYBJPP jkOdIwvJppJpDDrCp/R85IBJGbQLBa08o3WXSNIvpITdFOkLmXNKS021FQvHBGh6et1h iLoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723107; x=1742327907; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0vI16NHb2tKWbIxjnq/SoVUTdY/Lep770BkCc47k0Rc=; b=KGRyWfkVqXlF0NaPBnIcPmTO89Ne1Eik4oqK8T+wKHP6ScKdBjgDJ1lzHIk9EWMdE5 mCZQut3EVraDczM+EAjtC6eHlnLeYPCfnMQTFARAA1KLl4X4geyN4Rz9hl+XT1tyBmmh OpMNLs1zr+B1REcplzdvzSTO93fkmolmmdAOU6HWDZr7pibGUpL6GrMfzz6Xh8TL+YF8 IZIZB/obr90zp/E/FcVa0TCImxHIMZptb3KDDFNDzLDRAgGTCHgoPzH6c579y7Sq0lZG jZsQ8mzx2Z8LtxR6aaOiWIXUWMJSwAe2DUw95nHoOB2MN3WMBb7rED8YrpHMORTyjBgs 6xAw== X-Forwarded-Encrypted: i=1; AJvYcCWKyIJGD4ZBw/XBT4BziW61nu8+u8xrz4N0tMLD+6EirL+HnAQoRQCrIZujJRY3imrp21Q=@vger.kernel.org X-Gm-Message-State: AOJu0YypE+E3Lnchh1ne7PkvuRA10+ZlJ8tWowbROPG8DHNw6dezQ+e+ /ZxmJO1i2y1RMoOnyA5RhZvudyiIGikv8rGhZ/SOvyVFAU0/2bdYf8ZvPYCk70Y= X-Gm-Gg: ASbGncsOOnDw89R8tnspwDEtvvA6EgJql41TyQYLpSGMyfwfmURFYO9RErenIM+5Rpg +tu3mIS8T1YatSBDjH0UhCVVa4ZAjTSC1PrBQLS2Yf3kZEsr+ebKx+jj9WFJJIvb6CR/nRtGkbu I8Gj+OUXpWLxCPc7MEyYM+nDdYFhPiyDBGenuSda6Pk/Ipl7w1zQ+0YA3Mvbn4emL+EI+DVHURC qEUYY/JYLhlHGZCja8SnbQGdkd0/ecI1gdVuPDn3kwf4eWrDNb5O+r/4v99QaxWSBzML867z/Py wOfHd9tBvlfvVc7YzXTx3IRo0ZnbSaLABdyBAtRlgK66 X-Google-Smtp-Source: AGHT+IH4DZQtwoxJlYICmsHBrM9aJbv4mOOcZipSBsnLFw41tHWuGL9LYWyAZtn5lP/0QysRh7Mo8Q== X-Received: by 2002:a05:6a00:928b:b0:736:5dc6:a14b with SMTP id d2e1a72fcca58-736aaa1ace3mr27769096b3a.13.1741723106807; Tue, 11 Mar 2025 12:58:26 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:26 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 14/17] include/exec/memory: extract devend_big_endian from devend_memop Date: Tue, 11 Mar 2025 12:58:00 -0700 Message-Id: <20250311195803.4115788-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> 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 Tue Mar 11 19:58:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012650 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 BBFC9265607 for ; Tue, 11 Mar 2025 19:58:28 +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=1741723110; cv=none; b=BtQjJxe37KNm6WImDpQ5BJpcrodHmAXUMhzKly4+guYIUYM6pFuIvnxHAI4Mp6hHaPxf+VmjW577FezuwJ+989+niVBr9FauqrfN868bW44kmXBsCNxqdG/ZknKcHYfKVmk9HgwGRgBbLD7BaxdPNZgkbx6leavrJgz1DEwbqu8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723110; c=relaxed/simple; bh=HPmrxLDFV5sbXdh9+wymWgtr8znrI9mCJnuvPobQYz8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qcwbI5c90B87TW/GYTeIWptE/oKaMAbE8wVVnGc/JkVM0VEgs2knoAaTUVZ1d0doJ0sW4vmzgq6eV8c4492pFinmVp4ORO35lIwAkeg4rT+YIbzRcm+KVo55Qij7/4WKx2HdZ0nlRn/wAuLJgoPjaUccMtTtoaWV1GGkNY+8mV4= 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=u9+AdiV4; 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="u9+AdiV4" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-22334203781so3544525ad.0 for ; Tue, 11 Mar 2025 12:58:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723108; x=1742327908; 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=/B5foK4Qy0OvFQVWNYpVAAsAF+tVTKpBxl4Jl8CdPFE=; b=u9+AdiV4DJEovYEXKjIDLtxVgwFeYFAdtAuM3pq89R3m+boN61rmxE7ezcu24hgufH 5Ze7z7vBGL66qjl9r5L/3Xl62puFaukjJ9F60A7bFJOVp0BuIFO80C23NQjN9IoiHfjQ Q2TM3mf3yxnq+GjieTwFCd8k9uQipaGIcUP8bsD1/nPtzX/WJTCcEH73wYqwxipBBVXC RMuejYMDifIsPSEKVCop754wWcN/0AjuaoS89o0PqWvDKNGcUYgVIL3+8TUF6E6OBcSR lLwajwLVg8yp5eiZOkYmFWzSFGnoKlaARD6vqoxAF4o+P9H05N4azPb1W6bnvn9hOoAn wKBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723108; x=1742327908; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/B5foK4Qy0OvFQVWNYpVAAsAF+tVTKpBxl4Jl8CdPFE=; b=rIC+u9AR9r+ZQuMmHWOjcG+IGjr9w5ZR7pLn5RggLpP3ZsKg63yAX4YhN8UJAjr9Cx HT5A5M/hXrkiu/Ua9FKv/l5BAse0rt8JZ++rkVladwW8dqIgo/fVDvz0vomF1sUUKW3l IjYBHwpj+HXzE83YF1u+XUW0/Yjw5aW0xMjJAztE+BzR4HnFqVKDArpmGgqyIuR+wRXY gNDQ7SH3ZbweFIt/qWXz3DmoYPondigO2eN/sn1vG/2m/kQH5J0+GW7GTOHOGG62T88n PqIcZM1lJjq4GV33fFQWu2Rlwjbru37GFkSLnDD7fSs+tuDY/YIM12Fv+ucZ8Q1UFRrE nJQw== X-Forwarded-Encrypted: i=1; AJvYcCWKs+bbCWLOEtThdguqMxsyzzoOodvu6kpp5DD0ttvNs/WSEs/IOmC5ED0g9TqcbfS9aI4=@vger.kernel.org X-Gm-Message-State: AOJu0YyZdWcEE47Id/twVhXXxc2EFxL4T2GkB+9bE6PxlXcj/b5q7fMk ilz3Z1GhLMjGay3oJ3kvDHFSk9BTDm47WqvcBH8dqoqpFgJjzYcb3f3Z1JU8euI= X-Gm-Gg: ASbGncuBQvJ86YOElfqZrUcVjubpmgwz1zm/z+w+Kz+arhu/XrpOg7QMWGjQ+3U9v2S A+BdhOWBm3KaCfkwOTYA6cu7ltmpKd6QCOZAigqUgwvYBMaH7UgyPfdGu+7ruC+QEkgLg9ROODZ N66ppoWk/aTbh+XyTUfjkL6kdiROP8CsQopbqR/2YmH0Ox1UN6yoDmw2E7gVM5NDQHjkmrLqaba Ala15DNAPUlL8TQ1wPvE6wYwsx8ZsAhk0HE7HuVl686V2HOx4wcc+gVwYVN5DqCLj8umpnQBeLR ieURse8X4NW2zTEreq82hhjbhAbeG8GYtEpiCabVsDZk X-Google-Smtp-Source: AGHT+IEFWhkhOunU64h5Vgyk432uXoYWcCQsdf3Qo3RWjfxu/zqVxr3PiSl8C3ffFvP7C/aGeequIA== X-Received: by 2002:a05:6a00:638b:b0:732:57d3:f004 with SMTP id d2e1a72fcca58-736ec5f1748mr5532672b3a.6.1741723107984; Tue, 11 Mar 2025 12:58:27 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:27 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 15/17] include/exec/memory: move devend functions to memory-internal.h Date: Tue, 11 Mar 2025 12:58:01 -0700 Message-Id: <20250311195803.4115788-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> 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. Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 19 +++++++++++++++++++ include/exec/memory.h | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index b729f3b25ad..c75178a3d6b 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -43,5 +43,24 @@ void address_space_dispatch_free(AddressSpaceDispatch *d); void mtree_print_dispatch(struct AddressSpaceDispatch *d, MemoryRegion *root); + +/* returns true if end is big endian. */ +static inline bool devend_big_endian(enum device_endian end) +{ + QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && + DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); + + if (end == DEVICE_NATIVE_ENDIAN) { + return target_words_bigendian(); + } + return end == DEVICE_BIG_ENDIAN; +} + +/* enum device_endian to MemOp. */ +static inline MemOp devend_memop(enum device_endian end) +{ + return devend_big_endian(end) ? MO_BE : MO_LE; +} + #endif #endif diff --git a/include/exec/memory.h b/include/exec/memory.h index 70177304a92..a3bb0542bf6 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3138,24 +3138,6 @@ address_space_write_cached(MemoryRegionCache *cache, hwaddr addr, MemTxResult address_space_set(AddressSpace *as, hwaddr addr, uint8_t c, hwaddr len, MemTxAttrs attrs); -/* returns true if end is big endian. */ -static inline bool devend_big_endian(enum device_endian end) -{ - QEMU_BUILD_BUG_ON(DEVICE_HOST_ENDIAN != DEVICE_LITTLE_ENDIAN && - DEVICE_HOST_ENDIAN != DEVICE_BIG_ENDIAN); - - if (end == DEVICE_NATIVE_ENDIAN) { - return target_words_bigendian(); - } - return end == DEVICE_BIG_ENDIAN; -} - -/* enum device_endian to MemOp. */ -static inline MemOp devend_memop(enum device_endian end) -{ - return devend_big_endian(end) ? MO_BE : MO_LE; -} - /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., * to manage the actual amount of memory consumed by the VM (then, the memory From patchwork Tue Mar 11 19:58:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012651 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 EE283265616 for ; Tue, 11 Mar 2025 19:58:29 +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=1741723111; cv=none; b=PgJ79xKbcfcPCTbil3YARwE2CNQKogh/arXyMz8BWAU89hcAOkIxMB9a9jxUOGk9N/QA2uS/sbUhYxLftGK+39z9KVjRrzHHPqyjOlpqkS8GCTp+O7qVTk0Q/ZtITaNnbutEOPd2MJYFgIs7oGHScZ4heIkvpkmFe9gK/tHDzZg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723111; c=relaxed/simple; bh=O8oGnViPTQead0Ya9bRswKXc6Ql9v2ktguJXe+BaWec=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Kb3QzOKNeVzDjtCgBugugv/PH1rx1UPggGoLAtHyWDvUeGhwpjj3RQOdCO1Beh5SSPYgDF7OeWRe5ZsZsw0tdbjZZbiEmf3XTzQgZiySxhd62OgpjyEsvpBnfjF3uEnLt/nfoCoI3zOxE8om20Lt8yvD3L4NAXF+J8SKJo6oFqo= 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=l2T+da19; 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="l2T+da19" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-22548a28d0cso26060355ad.3 for ; Tue, 11 Mar 2025 12:58:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723109; x=1742327909; 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=Z06CcN5pABW+zUVUk9wuBNFYUJo3O9KfWdv+N0a9H8A=; b=l2T+da19FDknUsdaR/f64HrxB9g2YRuYQYGWNo+00fopIXKATRMyjFhmmT9GxKeafJ zEG1i9AvbiOIuH27n0rndGg/93T7DUluJhhPWjb502flE0AN3DrCNsnCU/FKjFEDg3UD nIqgsyIeK1jjdGwidFMegnfa0cWaoskzn8OPh1svPmc1IeBUlI6HTDffsSQrytlu+Lxc SpkfGmYP71MPqWCw7/GwnnEyszaTLsZxSlhH+jpCw9b1VwfQmFr2eEeY2Qk2Pocqj25Q OTFaFB44+bL8UcNlQaGHGv7GcOiNTulh2MSdpks/7jNigXlBQDzt7wEOwOHEt38+UBX8 NtJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723109; x=1742327909; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z06CcN5pABW+zUVUk9wuBNFYUJo3O9KfWdv+N0a9H8A=; b=A5kfE9WJK89jr3LKXxiltwZLyqFW8RXSplY/jji1FflSfjL4qpKCtYh4vs+j9EIB2d /8er0LsNuQrKQ/0fff4ZMZ2JGKQYbBJYmheMcxyb/1IhIdNDtEx3ad9qwpPbGcOQCqKS 1e70BymBHUPveXk9AzFhp+f50cI3YklZaHrBOmohUQr2ZuJXCbP/c9QxMhdVh7Sl1x4r dySMbMnmUML1RmbqGSSqTe83nQ5It8XYfBLbqlDv1hpljfaG0O3HlWda5wQfDfCXnF6y C1olYz2bXHe/MZ7j1jt6PV2MzJn/NoNhLYagriszBPkPeLwvwqDq8Xw1CJ6WDbWV0Q9a 7QVw== X-Forwarded-Encrypted: i=1; AJvYcCU3vyciJkrQEd4YEmY15yYZeel9UAgTOkuBPC+7JYCX+lSIEJ79kdHLXtJjwRY8hGOlBsk=@vger.kernel.org X-Gm-Message-State: AOJu0YxSw30s+9MmyItYBiNH3KvNUnOwImGoS27raC5CP2rsadZyRqGO LtVxA+kIXaKG+s0QWWG/7yaXHTAdrsyPY7rgzAR4wYfkbwO/JlYl6WxOzVyXAyQ= X-Gm-Gg: ASbGncuT/eWM5TqmTXWLNQ7koFz0zye7vMZKNi37zYTFU2JSmUnyk/ORR8aDooMr19K obBubNDvKLOMoVwvQGRF90m71YDvbAk5hBqi4LB0iejr/oCyyHdnXqLRuLf9vg9UMcvCysh3dZE tbc+EZgY0+ZEZyYUWIQ3PP4FISP8aHu13OH99MwpAxCYiXkR2Bj3eJkD3UkmSjqmy2huiKVnZBC j3fTtOjAAPTICtmp/tLxEhM9UbxggI48sX8haII59H2hCxGy3nEunRqyWQ+EZVG9AI1qs6DVTif p+/1+gInpS0f6DGE7qq/QCaD+NrCXf1YhbnfHfzW6JMQ X-Google-Smtp-Source: AGHT+IFWZfAhxvvEDgAAce92ETlma5STi2t3r8z3LElksShqNyxmTswS//w9tvWqHBQDxaqLnsB1Kg== X-Received: by 2002:a05:6a00:2e17:b0:730:95a6:3761 with SMTP id d2e1a72fcca58-736aa9e745amr30276190b3a.3.1741723109168; Tue, 11 Mar 2025 12:58:29 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:28 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 16/17] system/memory: make compilation unit common Date: Tue, 11 Mar 2025 12:58:02 -0700 Message-Id: <20250311195803.4115788-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> 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 9d0b0122e54..881cb2736fe 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,7 +1,6 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', - 'memory.c', )]) system_ss.add(files( @@ -14,6 +13,7 @@ system_ss.add(files( 'dma-helpers.c', 'globals.c', 'memory_mapping.c', + 'memory.c', 'physmem.c', 'qdev-monitor.c', 'qtest.c', From patchwork Tue Mar 11 19:58:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14012652 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 0F6C7265622 for ; Tue, 11 Mar 2025 19:58:30 +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=1741723112; cv=none; b=X+VA7M4k3b67fWrtsNJsLn17xzNWCvZg7K5x89mSOhw0wpDo3IH+vaG9yd1N7JyJqCDaS8cc8bTk1TN7VH8B8l4ANf3+wkdbkgHZA0qePbMdbzYyqQX7t4qANWucvGHVtmfszYAPRJf52+Z5XV4MHkWsz8Rigdjhv/gvhjTUvJY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741723112; c=relaxed/simple; bh=BkkUjOWmF7t6i9tbUmPiymzR4gYmq3p8TFOqgr7W9ZI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VnGcVuuriTipxzuQ9FiAJeyi7iibEjxJVKGk7MO2751XRfaF5lQ1KKZVkr+NmetTNmx7daqcozYYZa5VodVcokrECN5YuyOM+s0k/4LBr+MdlTGNCoEgr9DlGHKoAWZT4EODCRlQh/Dl7/dFN7szehiFMotEepf7UNhTQEJwb2E= 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=IayfFNwO; 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="IayfFNwO" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-22398e09e39so111122395ad.3 for ; Tue, 11 Mar 2025 12:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741723110; x=1742327910; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/jGKe5PComzh06JRRSjyC3R7ujh2oauOlO5efOCu+zg=; b=IayfFNwOHZKJx8zCn29uiZejmDk2eqBAPAltzoCi3lDOxdnjFxTtxgQcJOoV044fPv ipVgh4m6LrYtwq5jOfpY2r57FQ1WYXeu4pR7zPCtHYQ18ztojfpjGLgGJEponBXzsCgb BSzuHGcAfZw7YrIKG36NGodoypAteAw+TsZL7GrWxOp17VgwWm6rI+jU4XVHhcShuz/0 sVIRSNTtniud/pYVdrvgfvAvtsoXfOZje8m2jTz0106VpMnRYhvRvtZ+/BLQ4hMQUbGP ti4vZ0hFNhV5dRadUkBuxQvlqaatg4a2s0WuZfH3SsKcmkuVJfPWzSOETOpRJMT2GqPS GMrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741723110; x=1742327910; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/jGKe5PComzh06JRRSjyC3R7ujh2oauOlO5efOCu+zg=; b=O2H4+bAos014slVCDYDbHllUfMyKwZTsc4JXrG0PtnLkKs62rYFj38r5CQL2k/VhSb t7/cFMoNzeZgD/F2hmJlZkGDYuw62lhOG8dTP8dU+l20VwSrmbXbWQO2AQL02Puoehks IImvYCeGhxaWNmxV5k2B8FWOwDQ9kaSXUikJ3BmaBEhHpLGA+3tZgqMY21LOX3VkcNRs P2RCADCLjKN8QAeFSpFXK6EVrRMeuNOzYXovqL2e6mW0CSraurNnLf52sR+bJuKOGf7q X8lSxOCXt4IPQ30dctPmqjxJkwaAR6hQMia6tewMi0JOT6K1Z5Ft92idU7gA4CBx5EdY 8HDA== X-Forwarded-Encrypted: i=1; AJvYcCVGCkmYRgXSpDU26VuugfzBIXOv564B1YOSaXVtVWc0ySrpfBvGCxhbejEHwU+f2AYYeJw=@vger.kernel.org X-Gm-Message-State: AOJu0YzV7LpSR2+GFLZbtClpX1Mgct53Ok42yXHkzFq0ADlUyUTziaTf ubmVPiYJCUut9KtmaTqSCKW6Tj3iP5cUlSK5n3DF7zl5EYvKb6/Y8PCgb5xsRwM= X-Gm-Gg: ASbGncvKxcmPtbABPJ/GIaueO5NSQeTkx0Oacx4CoAJFb7VnTeq9xVRNAbjIuDu6iNQ 8JxRZu3iFXg2Fugx05Qh52Gjh+YyVIiX2OGEiMeICYECzvXvSRcP5gzV2kvTekWfKrybg+0SpJK UepRxmymA/qiTTcwlraHK+kZgKtRssxnDwDJX9c2GpMjLkioYPlwP5TzllbjyjkTDgLrs1RUKOs h2akf7vgvwnaCts/POGrZv9WWBSMl+wrG06MfcD3a3YHWdHHpNwyDU9cIbmgvhc1l92hg96SpMb l9oa4iNvLIRocqbrWU7FbHM44XqgOa/pjO4WEJQ16uBW X-Google-Smtp-Source: AGHT+IFWRSSWAAZ74eVr+KcVmFNEyBuYNdoBJPeRpIUKcbNy7sibb5A9vNOWSCrzmBmp9nxRDwlIAw== X-Received: by 2002:a05:6a00:b86:b0:736:50c4:3e0f with SMTP id d2e1a72fcca58-736aaa373b8mr22374606b3a.10.1741723110296; Tue, 11 Mar 2025 12:58:30 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736a6e5c13asm9646981b3a.157.2025.03.11.12.58.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 12:58:29 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: David Hildenbrand , Stefano Stabellini , "Edgar E. Iglesias" , Anthony PERARD , xen-devel@lists.xenproject.org, Nicholas Piggin , Richard Henderson , Weiwei Li , kvm@vger.kernel.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Liu Zhiwei , Daniel Henrique Barboza , manos.pitsidianakis@linaro.org, Peter Xu , Harsh Prateek Bora , Alistair Francis , alex.bennee@linaro.org, Yoshinori Sato , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Pierrick Bouvier Subject: [PATCH v3 17/17] system/ioport: make compilation unit common Date: Tue, 11 Mar 2025 12:58:03 -0700 Message-Id: <20250311195803.4115788-18-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> References: <20250311195803.4115788-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- system/ioport.c | 1 - system/meson.build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/system/ioport.c b/system/ioport.c index 55c2a752396..89daae9d602 100644 --- a/system/ioport.c +++ b/system/ioport.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" -#include "cpu.h" #include "exec/ioport.h" #include "exec/memory.h" #include "exec/address-spaces.h" diff --git a/system/meson.build b/system/meson.build index 881cb2736fe..3faec7e4dfb 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,6 +1,5 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', - 'ioport.c', )]) system_ss.add(files( @@ -12,6 +11,7 @@ system_ss.add(files( 'dirtylimit.c', 'dma-helpers.c', 'globals.c', + 'ioport.c', 'memory_mapping.c', 'memory.c', 'physmem.c',