From patchwork Mon Mar 10 04:58:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009206 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1A951BDA97 for ; Mon, 10 Mar 2025 04:58:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582733; cv=none; b=dCA43uNTnPSp7V7J6GVXgNZW1rrC+5unvKz+znqdws2YHrUXvyr2QztcZG8xZA5FbykwGw+UaYk423Wn4tVUleK3CBvTLKoShebEz3C4bEmqN/6n9b2uwE/faxwbDeh1YMpHTDWt735Ac/FvoMoQ5qAwyf1egOP5jzMcvo4mdhg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582733; c=relaxed/simple; bh=cdnYDBL7N1B+lxfili+CtgXi7Pm9oJ6ed1wAbTkIZrc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uvI8AOtnj69kZBRXO0AbuQ2YXon+EHofbuTxpkq9feYIFedwESJ6IlhC/N67kbF8VxL3Hxtxv7Py78CQ9Q6LsKdTlbJNmub4RGD5Gg+dbfwEk5FP6dzpQ6Zz8938wZ1+w5sFIDg5n0FDItusnLSxM8KltEylXCgz8b3RBNJsl6k= 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=HU1sJfTg; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="HU1sJfTg" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-22409077c06so47317535ad.1 for ; Sun, 09 Mar 2025 21:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582731; x=1742187531; 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=1JZyw573LWlQgbC9bGnVcpJUmDARxtxiYGI4BMcj5vE=; b=HU1sJfTgCwmppd8nzkMWpMpLoKSV6D/F+cnCNYe+Q6/SJO/ytyjtAMjq8QkQgttFM9 TPqENWAGYO/mTPJ5rv7pk9FIunnuuzIgGFtR6DeKACkD2/kU8d5rDjyH1pUWIR3clnAg D4V+paa4nCTiy+y+90ysXtzAy9x813KkIBgNkFnMQr5rserIotehxkksxdxcbcGWvjBC 5GrypAXNbeuJN+IorRN6UJNZsfOGRjD+7fkl/MxVxPGKE5zdEjPEJMKlSoKW0oJzTvgB Dcj8eBsN4/uEMnp/jfVfOVQCheyRLwco+trYNJItVjLHFszVZQ1nuihvGrvICziRhdv0 /1nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582731; x=1742187531; 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=1JZyw573LWlQgbC9bGnVcpJUmDARxtxiYGI4BMcj5vE=; b=h5Xb1awi1eBFcNbs/Mc3av+gI5Yyws5J18xzRPieif0D7uFwj2JNlp4fnKFc2MO8vb Az6eF8v5thmvcQEwy+jLbImXlj2Ugf/y6HQUpWW70JllQQn/wZXo5ocsPVupTw2Q7sr+ v2L6/+SckcLZ/4x15m2iJ1gZUF4+TIaAnZhJOI2L99EsryLM9ropiYmjWXbtIxPK9uRH WJ6MrT3vZkgm83waF8ilSuWTMfBKGkM2M1CG7Cb+88iF/s3OPJ0d8VSfQwC7nySyJ6hU jR6lRs+YmEDp1NmMvIepEgsHLEL0mlBbLQvVBKJC3cSHMWWMzWkSO2V5eCdHxSDnGI+8 7+Cw== X-Forwarded-Encrypted: i=1; AJvYcCVIwLQx/+syx03ouKF5IhPgauydEFCmB2OmtpSu80vQRTsEaq2ql1oPNEWrNGM1MVqDbHc=@vger.kernel.org X-Gm-Message-State: AOJu0YyRCaM2T8XIrzrNA3YvG5+HiJcifBnadi6mg4tGVAH8dBTOiyHj hNiezMdtg2bj5rvS+2ICaqGcoeV16zwMkytrK8IRRawsIcBPZ+mrRcw6Ygz2qKI= X-Gm-Gg: ASbGncur2kHFbEPfo9c1bXkvw+pzIFkWICzniOWpBPEWckv0N/dQc/LP8h3IhXNDsFq sXVMgNiThJ5sl7KNVfMhdpeF8Ou1r2JV8es84kkS1E9Tn+93M8TZIslWDHYB5V09AmMHPJdt6pG xiQ1w786UZsdN8qRK4J98/xtHBxM8Ij3ipiTrhTTeT6ef1GgvmbwPY/IY1fCUIct6oOb22nxMQp M0WmN5+jq4NwC6ErlRnvC3nfB/EpZoWlnGps9A8kTP2olXIi2ITRPXiHpHmZak5QoLkeyLYSW+g VYEwcnwsULWzVSqFu/pZzTHILxaLf4RV1TWtoNo8/JGi X-Google-Smtp-Source: AGHT+IHsrTctZA7T98GoAjZcAG6E707cPIOSM6QcsZhsVvq9UPUg2kUQ9eJxgIpK7zPxh80fLwzPDw== X-Received: by 2002:a17:902:f644:b0:224:76f:9e45 with SMTP id d9443c01a7336-22428a8c6femr219904905ad.21.1741582731096; Sun, 09 Mar 2025 21:58:51 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:50 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 01/16] exec/memory_ldst: extract memory_ldst declarations from cpu-all.h Date: Sun, 9 Mar 2025 21:58:27 -0700 Message-Id: <20250310045842.2650784-2-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 They are now accessible through exec/memory.h instead, and we make sure all variants are available for common or target dependent code. Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 12 ------------ include/exec/memory_ldst.h.inc | 13 +++++-------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 8cd6c00cf89..17ea82518a0 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -69,18 +69,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..74519a88de0 100644 --- a/include/exec/memory_ldst.h.inc +++ b/include/exec/memory_ldst.h.inc @@ -19,7 +19,8 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS +uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, + hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL, @@ -28,15 +29,15 @@ uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result); +void glue(address_space_stb, SUFFIX)(ARG1_DECL, + hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stw, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result); 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, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL, @@ -49,8 +50,6 @@ uint64_t glue(address_space_ldq_le, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL, hwaddr addr, MemTxAttrs attrs, MemTxResult *result); -void glue(address_space_stb, SUFFIX)(ARG1_DECL, - hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stw_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stw_be, SUFFIX)(ARG1_DECL, @@ -63,9 +62,7 @@ void glue(address_space_stq_le, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); void glue(address_space_stq_be, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result); -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Mon Mar 10 04:58:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009207 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E99DB1C1F02 for ; Mon, 10 Mar 2025 04:58:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582734; cv=none; b=GPrRJK6NoKZ+0eY3VZL2tZjYKazlaYxHZysPNG3HiEBOsILIHxfyLnD8niusW1BJg8VIeQuWx4oAOc2s33jf3fC/94m6Q+APuM8smUPjFET6uUIOueNVTJf0BbWxSswr/PcQG80pqEVQUcXzo0rMP12Tu1hscWfwm27YB3Q4CQA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582734; c=relaxed/simple; bh=o6CNIlf+fgBJTyg+UOitU2imqEFZyMkcskpxXQcwyD0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CT6cDCbATiHhqyCYFl7YA22moOxAEGf9ZyruWC7BhgeJTDSfZhpvdQ5h61s+BqseP3H0iIVr/F5LKO2bJEcS/gsi2vVfyEYTcGf6pmCX9kkLwpO4O761aMWWdyQQSLQrpeFJa7LnxitNNu11bOK5MLpnpSNhpBh+/EIZy/+y3Ks= 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=mQFG2H5v; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="mQFG2H5v" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-22337bc9ac3so70486445ad.1 for ; Sun, 09 Mar 2025 21:58:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582732; x=1742187532; 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=2OIqebmv6TCVHIjcnbRR2ASx6yOnmt3f1dkycngreo0=; b=mQFG2H5vDXikEoiX20qrclrU6jfHDzjtxDQU/xod95BZGvbEqW1jXnCly2ZNoU1Omt cGcFs5bPQ6nUqv6G0TxS6wkzDtp3I/zbJVjaBGa5HUu+309gd69R8eODaz+6XxC0h+c+ BPbFsVbCaBMLxazvB0Ur4wnyCC4ek4QqaSidsU79kRvgcz3J+/+OgRhBG1P54EEtaEah xjHScelHtkgB/D/1nFdbvWq73WmzcXOVmCjcRKoJF0oP8RpnbHfbhwURem3rzVjXFMI2 fvax6odTxjT51rpNEyOS60GeoPl3py4Pw5yrFDay6Rr2s1uaI7f8vNU3WvI0/1O2CViA aY1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582732; x=1742187532; 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=2OIqebmv6TCVHIjcnbRR2ASx6yOnmt3f1dkycngreo0=; b=PIzSjmoZrSPSYocpfEPfZO5kSWw7cfROA3q4bUvEh82NLg/SlmQRn7D0NvklLPwws2 a8cDV68BhlcZe+9hTgc2XuX5mrrTb4Zbs0IWc0RTXuYTbeHR7H+TUHSmc6hgZZ2iKwVh eM4xNQMDjPcsKoOKK/pifzN9wwEtdPBDN1NED+k1PqVqGnlcOJVSDxr5cv1y/aNnQpPc E4h2Vyl7Ne6jbc+YEGcHnJCsPZbKTivenpQ2h+9IC4lMGxCE9CB5fpScWdrJDuOVvECt 802RnRL4e3WsUELquuGAAPTlcPnvIhoMOk4FDuBj+rqosXtwXuraYZEYjh7/pjCfAQYL F5hg== X-Forwarded-Encrypted: i=1; AJvYcCX1GaBYADaCv2lWWtORr014vVVq6d9hfNslZ4gzmv5V2hmx4NyTG/e0VPrPTj7Jpix8XE8=@vger.kernel.org X-Gm-Message-State: AOJu0YyNUxH0WF8Nw9A7anZS6qbaMzJ5iZAaEWCAuzyO14RZsuGcyXyR VP9y2LEICVNImWLbFqJpiWH58izqIOWXMN0ZXZmnwVa+HHdqx7BlqtN0l1idhtk= X-Gm-Gg: ASbGncsV91UNyeds+jIrG0FunXF237IVF9DxYWlJOxFMYauTe3Qmj8nv6KZuXkOxdQy zu3CRhaO0NGhmaRJLtN7lvH3TVE1JmoHZjBvtUqeK8UmOX++RrzWdu50qpH8bKbbPj8o3fKKhhC fCxxkKkrLy4pDYMWtARLV3ZxuPUZ0fVWOw3/x1gUBUn33mVLYnnPEMheG9R/+4VBx2FvjL29f+w pbLJqZMx679xEc1Y2FqY5JTowO+AFXQp4Rw/IaT1C8JmdhVDC4tkxYZRqG7NYn8g7OVEkM2QZjF N/ub6ND0JDEr95h9ddCJdZhaQmtHCo3BItGEnjobQG55 X-Google-Smtp-Source: AGHT+IFiauNE3phtYbHOElNurEea3KFBOmPJM6YIEsLLcuetadtqaCJcJRoQf8PU7u5dj3ax/cwksA== X-Received: by 2002:a05:6a00:17a7:b0:736:47a5:e268 with SMTP id d2e1a72fcca58-736aa9bc787mr17756988b3a.1.1741582732211; Sun, 09 Mar 2025 21:58:52 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:51 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 02/16] exec/memory_ldst_phys: extract memory_ldst_phys declarations from cpu-all.h Date: Sun, 9 Mar 2025 21:58:28 -0700 Message-Id: <20250310045842.2650784-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-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. To allow this, we need to implement address_space_st{*}_cached, simply forwarding the calls to _cached_slow variants. Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 15 ------------ include/exec/memory.h | 36 +++++++++++++++++++++++++++++ include/exec/memory_ldst_phys.h.inc | 5 +--- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 17ea82518a0..1c2e18f492b 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -75,21 +75,6 @@ static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t 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 */ diff --git a/include/exec/memory.h b/include/exec/memory.h index 78c4e0aec8d..7c20f36a312 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2798,6 +2798,42 @@ static inline void address_space_stb_cached(MemoryRegionCache *cache, } } +static inline uint16_t address_space_lduw_cached(MemoryRegionCache *cache, + hwaddr addr, MemTxAttrs attrs, MemTxResult *result) +{ + return address_space_lduw_cached_slow(cache, addr, attrs, result); +} + +static inline void address_space_stw_cached(MemoryRegionCache *cache, + hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result) +{ + address_space_stw_cached_slow(cache, addr, val, attrs, result); +} + +static inline uint32_t address_space_ldl_cached(MemoryRegionCache *cache, + hwaddr addr, MemTxAttrs attrs, MemTxResult *result) +{ + return address_space_ldl_cached_slow(cache, addr, attrs, result); +} + +static inline void address_space_stl_cached(MemoryRegionCache *cache, + hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result) +{ + address_space_stl_cached_slow(cache, addr, val, attrs, result); +} + +static inline uint64_t address_space_ldq_cached(MemoryRegionCache *cache, + hwaddr addr, MemTxAttrs attrs, MemTxResult *result) +{ + return address_space_ldq_cached_slow(cache, addr, attrs, result); +} + +static inline void address_space_stq_cached(MemoryRegionCache *cache, + hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result) +{ + address_space_stq_cached_slow(cache, addr, val, attrs, result); +} + #define ENDIANNESS _le #include "exec/memory_ldst_cached.h.inc" diff --git a/include/exec/memory_ldst_phys.h.inc b/include/exec/memory_ldst_phys.h.inc index ecd678610d1..db67de75251 100644 --- a/include/exec/memory_ldst_phys.h.inc +++ b/include/exec/memory_ldst_phys.h.inc @@ -19,7 +19,6 @@ * License along with this library; if not, see . */ -#ifdef TARGET_ENDIANNESS static inline uint16_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_lduw, SUFFIX)(ARG1, addr, @@ -55,7 +54,7 @@ static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val) glue(address_space_stq, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#else + static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr) { return glue(address_space_ldub, SUFFIX)(ARG1, addr, @@ -139,9 +138,7 @@ static inline void glue(stq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t va glue(address_space_stq_be, SUFFIX)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL); } -#endif #undef ARG1_DECL #undef ARG1 #undef SUFFIX -#undef TARGET_ENDIANNESS From patchwork Mon Mar 10 04:58:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009208 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2381D1C54A2 for ; Mon, 10 Mar 2025 04:58:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582735; cv=none; b=L96e8XiKuBnDN6LO21BPNqdYip4tp98I9lBWm8Ly/Z8BsiRW9X6JVEWvzVTomX1C9H5uUskUAcuow/6Vp2ks+wM7/6ihtM2QBLSS09aSSsTyh3T0k10SpCOHYhIgxOt4qfjIVa9T/Qx7eksgoKHpsJiJx9YcjuUjzmrIew5x0vk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582735; c=relaxed/simple; bh=EHJ4NV86nZgqju0S3FLNfal/v+biiU/OyUthg9HEuSo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=amexvAGmgVoC8s/sYHkhUZoBo0V+LTtReBI1pECVcBJO3BtHNeHzKO6+4R9I6QEErCGzPgA4LSA3fShIg871ZeQojERlSuM7EW3997ZjKAT6nQEudlx6wgqDJCliIpM+aDFsrDlzdZgNMTWFueXyDfJthkBVFCAsaPavc+Cke7A= 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=iB/F1b9r; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="iB/F1b9r" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-219f8263ae0so68330455ad.0 for ; Sun, 09 Mar 2025 21:58:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582733; x=1742187533; 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=OGwlDw5fL6/8/4sqaw9ZjtskhrLsqkJfziSvtmiyf9E=; b=iB/F1b9rHXZraDpIsztclSKMfo9uPZ537k4+zDO01LV/HTrfPuqnC8nwY/axJMwSo+ 5BFyGfXVwSlaTBQZr/Imly6YdHE5ZgPp1D0XXqrAmn65tn1UuwmWiOW8g0vLMcPke4Kw cUE1gnz8LYPzPaxZUiqoihealmU0l3qdEDe7g9hRCefXaBHmOHHYwP4iI6CvgSKW3lRG 54WDXplFI9kpO3myMNNN2REVuotELkVMM0BmonRAUDbL20NFHqFYUVvV3Z+N/Nfx3SoH atdKewqrD+dNJnl3SCEdatMHgRg7Isvrq2KdQVMAp45GWvdd/j6llMb4pWoMiKDY/7b2 1jSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582733; x=1742187533; 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=OGwlDw5fL6/8/4sqaw9ZjtskhrLsqkJfziSvtmiyf9E=; b=eIl0XaFbm+U1J50eozZB8UbXhlYDe93WVOjAeOxDyYYIJ/JgmKnN6SihexxWpv6IEJ ssCVFcp4RIfOWxgg0DYFHJoN9SQhlkA4p02denxP6QnOI+qL+l4hm61L3JpMFPhMq7AN 51lyanbCDgqC+qD8wd5d3tim4UEpLYgzZJm/fAslujGC7LxmF5GNA2PtQwV3IbW0KP/Q Mu+HORdIHDYCbhz3hhxjFhLn5nPi0Mi27lHmccS6LRV3lPjThH3ZOiPvgDqEPQLPoQG8 SY14n1yv3JLhEI3HAOMcMg9ahLHazDBgzddop3XbOqQZJ18hrGoZGfxzXCeg94Tmz2JU eX1A== X-Forwarded-Encrypted: i=1; AJvYcCVq7ZVlYBAsYYY3xfD6t6rSWM3fRrG+YN2wEkiqd+p4/mD/8h46Mf/BOT5TnPr6bf19Y8I=@vger.kernel.org X-Gm-Message-State: AOJu0Yzyu+p0WRUpXpFVKMMULCiwXtKLATpgu2o5J46Ck79p/VsoIx1r XLgBKPGo9StVatzJpJMI8PunNdFUm/gI+hmfv0CICaa9NGT1Ayre4Tyu13BIbSc= X-Gm-Gg: ASbGncvHC4Ly4VqHbprxJeRJzUyqLjGFFN+gCRbcaZmBxOm4vJLUwPPTOeQ+LKrp9yB 4asu6RsL8JIdpIrrnSZh4LBNQNQSet87G5Efs56xmn6F5u/oJpRgs+iRI9fMnUCty9eM2c5sUuu nX5FK5LQUELyKX/bwMxwFkOnG1G36r7WI+DgLHLws35FPTccFoEfouoeMSxblfZ3hlkmPQcfnyV dpcSD8nFr+lfeF9OtvXLSV9VM46uaPqLm8xcXZsV3nxiEAIY/RIZdazh8Pc73pa8Ikzex1bUDLY UxMCJ1TxtbVhwcN/W5JGX9iF3bz0MzrtUc+hgRhcGrgR X-Google-Smtp-Source: AGHT+IF9OJp4stFJ9k/lsvOwoQRvqqkA/ZzdxglsajfWtO3On0dbMxz5MT0xvVfYC1mLC7gyZMGdug== X-Received: by 2002:a05:6a00:13a9:b0:736:3be3:3d77 with SMTP id d2e1a72fcca58-736aaac69ddmr15637676b3a.16.1741582733352; Sun, 09 Mar 2025 21:58:53 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:52 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 03/16] include: move target_words_bigendian() from tswap to bswap Date: Sun, 9 Mar 2025 21:58:29 -0700 Message-Id: <20250310045842.2650784-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-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 is needed for next commits (especially when implementing st/ld primitives which will use this function). As well, remove reference to TARGET_BIG_ENDIAN, as we are about to remove this dependency. Signed-off-by: Pierrick Bouvier --- include/exec/tswap.h | 11 ----------- include/qemu/bswap.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/exec/tswap.h b/include/exec/tswap.h index ecd4faef015..cc662cd8b54 100644 --- a/include/exec/tswap.h +++ b/include/exec/tswap.h @@ -10,17 +10,6 @@ #include "qemu/bswap.h" -/** - * 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! - */ -bool target_words_bigendian(void); - /* * If we're in target-specific code, we can hard-code the swapping * condition, otherwise we have to do (slower) run-time checks. diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index b915835bead..ebf6f9e5f5c 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -1,6 +1,8 @@ #ifndef BSWAP_H #define BSWAP_H +#include + #undef bswap16 #define bswap16(_x) __builtin_bswap16(_x) #undef bswap32 @@ -8,6 +10,16 @@ #undef bswap64 #define bswap64(_x) __builtin_bswap64(_x) +/** + * target_words_bigendian: + * Returns true if the (default) endianness of the target is big endian, + * 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); + static inline uint32_t bswap24(uint32_t x) { return (((x & 0x000000ffU) << 16) | From patchwork Mon Mar 10 04:58:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009209 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 3C3AA1C5D79 for ; Mon, 10 Mar 2025 04:58:55 +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=1741582736; cv=none; b=ufUx9Y2/G56DNHUTS58UNKHGcD8tQS2Y49cPHqgvAgvT2Mpxx82mpst2vKOkHirJ8kgRNy92Z+iGh9ekxtyh/4QPYwtxoc79kE4G+tXoDP8HRId480BAGeNgMZEgaN7wevtKCCIgbBIC91sGTYlJgBNfTEVUaRBd9LSFadqUDrE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582736; c=relaxed/simple; bh=KhEtYNhp/u6iU7U6n40EuuECOZ4DyErr8zAEkm44y1M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UbBk3Y6Cye+GxDpV2epBqbNS7W39VzMr3YLDQtAyqmvbjJKE6epSu8CrFp0UqPJ7JpbavpRay7pzFicPzZQQ0d1urVQlCe2KgQGGpyVQwgBBDXyr5XaVC+vENKTVEX/jnLKw4sZtv2zK7CaeUVOIT0DdBxFmqCgBVAZHJH8z2rc= 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=nnCzdkw8; 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="nnCzdkw8" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22337bc9ac3so70486795ad.1 for ; Sun, 09 Mar 2025 21:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582734; x=1742187534; 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=S8ktbxqhQcYI9crAlIF4CNR4KDCM1LZDZwDTggcCVc4=; b=nnCzdkw8FyS3CMkTni2HVGupjSieuQ21CLPaC9HSXr+ludagSHOsDmkxMJDOmW81Dt V9xwUVlMY51QXjGqirYXS1bLV8R8+u6GFWTf3GiuV85rU55Tcqv/TJz68M4fWz+e+0us M+ozyVsQNxejkjjn81d6Y4w9wgZ8nzCMc92fUJO/+6seZ59S/SOmCwJVZgK0UnlgXW5w pWdCR17EmkQ7wAGQR86rjiVrCYT8ES1Ax0JCCIjvPyMOEz6eu06onc7hhlfebjkJMH64 aAnRRbSDYYOSRme3cYdmHX1YUG8RV2xRTt/sXbqh5JA+xETk9JZZ7BOc6Wl6FWMnjKfd USbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582734; x=1742187534; 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=S8ktbxqhQcYI9crAlIF4CNR4KDCM1LZDZwDTggcCVc4=; b=XHcEn9MeZJM0yFOShsE8LkOYtopnyPJG3t58sPorn4oFRV4f0JN+IAWHOtP+weHVLv mEVcqIhbOk5O3Ou6YVkp759cxumq/5Z8cJXx6u1O+hUuWOhaMSJWJ0S5q8HB32V32Fm4 YgWoxZQ5fyne2E36PThnzk+xxxMgKN1j1aZb7sEyU6TPfotBTzHlv9gdzAB91OO4trGa QtWnrfM61HvyuNkH9kbRldyKAWgefJRBcY9d5NMWYUCoczLnf1RUXIJ1y79kLD7THM0R c8ha6EDl72j9/QHndYs6TxFzmVOMmft0ecyAPl3AzHWqge0VgG8jI6sfYekSXH9hoi0N qN8w== X-Forwarded-Encrypted: i=1; AJvYcCUYP0jq8EOAv3NNpmGsdqFObVUv5JR93/8dWqDkG1dxEjwZiaBGhrtRONyXub5HG6UbXw8=@vger.kernel.org X-Gm-Message-State: AOJu0YxfzWVpaX3f4W4M2+3LM/wo0yReOR6uzatsCqpi5aodxTj+SvDL 8Xvd3xONE7JxWPbXoCY9mufzLdd4NDSJ64icAlo6vG/ifCXOEs3PU7iaIlDTiXc= X-Gm-Gg: ASbGncudj1qP4h//Vk5owcDZ3gmGcbU/0X6nyaI1r1NsloIqcYOQspdNz/HN2aevPlI NIMZU42D2B6GtkztHr7FPYeuVlykrpZXclNXv0fXdJVXOB5dr9MekD0W9X+lv826Z+WICO5SIzY T4+StBbYdxyHUu4JVtR3wnghGs5flgur8e6qR3otHdFd6TwTJP7uvy1kYITUIjKWxJsCcSlnXV0 6oyZ7RlK+NHwWwlLJ8PPfLXPN5cZY8/bezN37idWY0RQ8rjpinDA/2s+OxFQiZyJTu9ZKk1rkCY s+PNhGt3p9gzXnd11CZaShgTxCgzC7VpN9u3HqZtPNiU X-Google-Smtp-Source: AGHT+IHkXXNzkEnz2BccPlbhHJNUY3LGOIbmL0i4gzfHTIIx3yoWhp8OGUsmgyQKBXK356JOEhoSQw== X-Received: by 2002:a05:6a00:2493:b0:736:ab48:5b0 with SMTP id d2e1a72fcca58-736ab48061fmr14740098b3a.2.1741582734610; Sun, 09 Mar 2025 21:58:54 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:54 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 04/16] exec/memory.h: make devend_memop target agnostic Date: Sun, 9 Mar 2025 21:58:30 -0700 Message-Id: <20250310045842.2650784-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Will allow to make system/memory.c common later. Signed-off-by: Pierrick Bouvier --- include/exec/memory.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 7c20f36a312..698179b26d2 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -3164,25 +3164,23 @@ 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 + if (HOST_BIG_ENDIAN != target_words_bigendian()) { + /* Swap if non-host endianness or native (target) endianness */ + return (end == DEVICE_HOST_ENDIAN) ? 0 : MO_BSWAP; + } + 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 } -#endif /* COMPILING_PER_TARGET */ /* * Inhibit technologies that require discarding of pages in RAM blocks, e.g., From patchwork Mon Mar 10 04:58:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009210 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95A6B1C6F55 for ; Mon, 10 Mar 2025 04:58:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582738; cv=none; b=TUzTwYVdRGAD9uYuh2vKLP3jW95Z1Na2/Dtf8/AFIQSgksDIrrs0F2lRM0TfwdSQaSSN+jHzbAwBDv0mErd9lvHU/ZamKPMtZwEe07ITMfKubx0gBWc+EbY0gpvSFianuiEWwI0Y1yg2IO5xtee+gpRbzdaJvX+tF+VWc9TV5Q0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582738; c=relaxed/simple; bh=mpLFw8B8ghgvo+W4mdZAKRhII4Cqk+UYWdUxOdK+FS0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ss2/CuH04qO9Wjygrmin/REECOTWe468cBbTcoql+NkcYqqU3AP3i06TeGXGTc2wfXa8WzysGg9rg0yDhU4esAC/vWfqGw2aDpeJ1gnscyywXFpq2gKC8TQd/oqTsa5zc1PRRQvWJ95CMYT+aCbeTk8k4OLrGOs7qwfNomVTXLQ= 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=CLjG/PCr; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="CLjG/PCr" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-22398e09e39so65589525ad.3 for ; Sun, 09 Mar 2025 21:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582736; x=1742187536; 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=gKLFWb+An2Ks9U+R2rK1VtO2Tw0/JUbGbAmdQc7IQwE=; b=CLjG/PCrNZcxhtd+q+JkAkAi6eGwiSZabHM29ksJAyfuH1N0CXOHfRplBKs5N0xqZB uHXEfvsHV9CEO0UyL4kkBNrxZ3/wG6Ry1wqRxLRi+mTmoxlBIo5AojPkCbyw1gLefLgw XtDg2SAnpcBkgjRxGwFCbpgtkAS7Uk0F101RkAuv9J71oGjMwe8Q9R66uw8EJrFGy42t Wp+gTljZZ9e1CW/Gma+Hiipe7ZLSrUuhtzWDTylc1GHjkMR1OxZ/LbHU5nTGreT7pQJ8 RkUAQhx130rC/FhFXzTDMSPdxmAhnS6BKlAhJJSXuSSz1sNnefiHlt3mSeu6LA1jeRd1 WDXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582736; x=1742187536; 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=gKLFWb+An2Ks9U+R2rK1VtO2Tw0/JUbGbAmdQc7IQwE=; b=rB7oPuTRcAOWPiqEdt1k00n9iFj6PpP6AxvT/gY4CvrugtuCXP5KCySpFEj3MJ+mCF DgPRKSdYyuXeQgXcdgXFL+sPGfkXD+hXT/kOQmz936q7oe/HXWkjBROx5JyHambHjqMb D2Le+LHoo5zmvFbJNuQl8bYnVKtuEbK3MAaTP1JND1IlgG5q2TTXvFIPAwbPxwA62tjL LMDwuqCtSQ/RZ57oKLhiHEI2LXvf5jIqba9MpasIdIeJcHU7H/mCoswsB/eZ666kbrSU Ttz51M+XUZrUm+PuIMUlIu/08bjROopKbpQ7imj1GChI6wFV0ozILOxNdD2yjiTaL8Mb VRTg== X-Forwarded-Encrypted: i=1; AJvYcCVddSdNjVox9b+lJgQKFmxOM8c5T6qHVj9EiI43nVaGpeh6dFkka1MuHdAA554wduO8DMY=@vger.kernel.org X-Gm-Message-State: AOJu0Yza80nt/xz9t3P72NmSoIw+xLs0vPCY5ZcGfgF3te3xU7T0JR6r ftfS3juAMloL7wuBzC+uwiQOawguIdDbkqdkkoUIyPMZ8t108fDqdj+ARyE5Gbc= X-Gm-Gg: ASbGnctmfnLM7+CXcmg8CfQcbFd7XZ7/LRSTS+n7xebWIZSseFn6tBWGfgTBNwWQvae PeC1xFUgGvijJBS+iBvxe5NV494Jz0tYF3tZvqdRYCrve8O9fHGvbzz6mPyNlCwMfjGIn2yrtsv luaGNb3yg2L3XIzL5Zc6lxriHMhLxomRoTVodJKIq2D5dk/evHpgOrUqt97V9y1LZCP66JuDkA3 FpuLMuEMAv83SwiExxkWhCVeEfSn8u2SHQdQR1o6Gfw5K/tJJeQ8H1h0j0jO126sd7098RLEsuu YeH+661KwRPcOh93R2D1+CZRTZ4dCcQC5n2sk9vQbD9S X-Google-Smtp-Source: AGHT+IEAovvlOy2ME9s2bcowigrmpQEpYOhHLOJWN1HotCTdKvUP3vKFXajlsE4wLKble7VBohAKKQ== X-Received: by 2002:a05:6a00:4fc6:b0:736:32d2:aa82 with SMTP id d2e1a72fcca58-736aab17045mr17832470b3a.23.1741582735793; Sun, 09 Mar 2025 21:58:55 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:55 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 05/16] qemu/bswap: implement {ld,st}.*_p as functions Date: Sun, 9 Mar 2025 21:58:31 -0700 Message-Id: <20250310045842.2650784-6-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 For now, they are duplicate of the same macros in cpu-all.h that we eliminate in next commit. Keep code readable by not defining them with macros, but simply their implementation. Signed-off-by: Pierrick Bouvier --- include/qemu/bswap.h | 70 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index ebf6f9e5f5c..46ec62f716d 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -442,6 +442,76 @@ DO_STN_LDN_P(be) #undef DO_STN_LDN_P +/* 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 + #undef le_bswap #undef be_bswap #undef le_bswaps From patchwork Mon Mar 10 04:58:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009211 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5FC81C8618 for ; Mon, 10 Mar 2025 04:58:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582739; cv=none; b=oOdpCNp0jgoDSVJWsbhLU5fmAz4TQIKh/d0D2AF4KtA7KlqeWzSN1XJq89ghFP66LS+C10Js2dTf7aQM4H8JiQlBjcmtGgJuIwzgnGMd8VWnq4WlsT9/MqpFmQrYjBae8LgwBL/S1cdp0iWlHn+VIi03ukvTQUnpCZ6d+JkUbtw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582739; c=relaxed/simple; bh=txLvw32hXKMfA68z8picp0J4Zz7sQ6vy6AdbMmDTuK8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YkuU/unaSfcQcwCPvsJ6KeUogVQBXOGvxOsHCFpayfmOyJFaJCrPBzOsqkw+vEZebUIg8vMFciLD/2fLWZnSFIrtrLT6KR65xaSGaUlOCEqNh2KBnvFCFbtyPIljnZdTOxypnBtUM1M3BP+S+HK82vHACad8YvIq5YnjR8yLDgs= 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=aQHl9Xyi; arc=none smtp.client-ip=209.85.216.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="aQHl9Xyi" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2fecba90cc3so7410105a91.2 for ; Sun, 09 Mar 2025 21:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582737; x=1742187537; 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=ErKU0wbfVZdnsjs5NMSuiTB4KixyX1gD9AraKkIZNBI=; b=aQHl9XyiNliVtEL0ybhrk46JZbR+9Ndy1s97mXOx+o2MkHxvaX4uCcy1sOXNLrLLVe O4lLg1p4i1U3y8cp2OLHeyjK7csyD2i932xwMmpqQ7yyCHnTiU+JQnAYIRFZ/zg9f4Gk AzPt9+LHuryfF9i5p7x+4RybJh6oQro0InLsXyQUrFbHUCQkoJqzq71x3KE+geM6wYF4 YCFccpKGQEFg7f0ocGzmtsd+aFqeyn8UdFY+HRJGVvL03PGmm+lbgIAP7VkYn7nJCqnu JhpdZwRDqKqek57IRTnvgSMdWUkVKHlfOje8ddxUq862zL2Bvw/S7fTpCh4ll02NoN6l S1Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582737; x=1742187537; 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=ErKU0wbfVZdnsjs5NMSuiTB4KixyX1gD9AraKkIZNBI=; b=KHmeiov0MIfxetlV5E0wVvvPARJNo/dIkoTjgF8sN3Z7/4Bk2fp2nw3DMGH/Q2iLAO A+hgLibU5NC6MpRzXf1KYc+5Ua2TM87WnmHoR9XQKIQuXOxcBW9afkN2fkwEovRVmtLw zVnHxZlL1dCSafzIyaMZQ3Qh5X3b4mcGD03icVlpWBkAHYChyuUeR1z9It5P8yo2nphN zbd54XLU5JTzehwtDACxHjl9jvOqDN468kVcX2F6ENPBCq+6BSvH9xGgJJL6ocbgqfE8 6zcpFW6X6UNcU+HpiLSxIbaonqCeGqa2AfA8nNNmiK/JVosbtr87AtJlg8IUm8O86gTR lmmw== X-Forwarded-Encrypted: i=1; AJvYcCV3Vu+JyHpQSqi9sjJpPJM5MwKWNRPn+mzZVFQPAC+kogQ84OJM6STgT2A/TrWzTSTbG6s=@vger.kernel.org X-Gm-Message-State: AOJu0YyepRt8/NWO48URUnmYoaZzZGhkJYXyL6HOR8Ht9x9T/1HQkKcn TRu4h3FbvuyQVH3RvXu9hyWw5/xgp1IT/hXyNWHuwe9t0Ia/JKp/+GsFH4vR4g0= X-Gm-Gg: ASbGncuh1b93A7d2P+6LvzPN1K9m8bF9vQlNNkyVpCrVF+sVcNq70v613hhIOWi7OYU NkLXD++T6zNm95F/+Z4O7ks8Kxh86uft5XD6sr/cnUFxcokDBKVhDaxiRQ44YcNsXzfESMwD2EU LpC9QgBtrhVRMCFldH8xy4jqY3kBLkT6Rq8YCfLBp/F6dujMmUHu/lig4F016MYLQYcUqIobQOi DJwTce734PEICbshiTDzrS6DazUZkzmyDwQIS1EDD7K30G27Fij/Tcty5QhOgtZTktMkW8b6Y0f 4T77zgznYvFfgmnjzDSMx9rTKyLUur8kJKAKQf41uMYb X-Google-Smtp-Source: AGHT+IHO0adHTKDFbdiZLdbwVjzffyYfi7nVPL6wN+0ieHxoGwNOezFQMlR0NxHpJZQhWhI8f44U4w== X-Received: by 2002:a05:6a21:9786:b0:1f5:8506:5039 with SMTP id adf61e73a8af0-1f585065599mr1040552637.28.1741582737079; Sun, 09 Mar 2025 21:58:57 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:56 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 06/16] exec/cpu-all.h: we can now remove ld/st macros Date: Sun, 9 Mar 2025 21:58:32 -0700 Message-Id: <20250310045842.2650784-7-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Functions declared in bswap.h will be used instead. At this point, we finished to extract memory API from cpu-all.h, and it can be called from any common or target dependent code. Signed-off-by: Pierrick Bouvier --- include/exec/cpu-all.h | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 1c2e18f492b..625b4c51f3c 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) From patchwork Mon Mar 10 04:58:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009212 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 1096A1CAA74 for ; Mon, 10 Mar 2025 04:58:58 +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=1741582740; cv=none; b=saFQlAIH5JW3zVHrQ7DfOtfwP0UOHen/8mAJ1bua/v5Oos0Rql7ZVEbMltdIH/JGEkiaoCnbQj6X+miEq0TMR2wil3bqpCUghOUXVebdL4JBVmleUZn2slr2KOcnIPRv1TCV5HvOiP5M/J13UuoZRS+DnjUEIWIzq5as0eXLZjo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582740; c=relaxed/simple; bh=HxYnI6Z/1qJqoDRK8ECVMQtb+GUZekW3l/MfIiL8650=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=P//DIY+klEAswC+Inoxxj5FI3mdX6z1+As1ZXkl8x4dwoBFk/SmFsjsheRUnp01Todgu/cbGoXsfumVKB2EHwB9ZhS7XPI9RagSTCWAqy8k1so5tzWJ0wLQ1ICVRyU1FQLPcmhIIsRIchYD9ZkZZIUvOSdEW8utCSy65R30lVMk= 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=IvmHt3Rc; 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="IvmHt3Rc" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-225477548e1so20295405ad.0 for ; Sun, 09 Mar 2025 21:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582738; x=1742187538; 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=8s25jeAGTcBk8xCVR99anv09nY4TtNOY1pAkSQYXuE0=; b=IvmHt3Rc5qOXONpAlJ87WS5JWFKe8EDhsvFrL8E1o1fvW9gnD53xBgjDt9L+ib6Epl xF9Y9rtnvjU/Q6HBWDlCaWoCntGyVufd9yjHY1UBEo4lI/2HKmZVSIQrU5AaG4A1aJ68 Uw9UaD+begrIxV890W63um9hJd9hu1eWeB+HVBe22XVMGNDKPdBqe84FgXSv59pOxUQX fBdMPjUZrI5tH53SnRlmr18+4Sdp1s0kLIH7dibgJPacc6xFD3xnj5gAV1rUWuuTuJBs OALzYq3xoR3kBlE9ji5n8qIYOJTGKpKPQJNp5k39lyg8I58u+nBLy7ewGKZSLvzvSrx9 N7hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582738; x=1742187538; 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=8s25jeAGTcBk8xCVR99anv09nY4TtNOY1pAkSQYXuE0=; b=nTznjx5GrDATIxdON14OMolrF1GnAm/jBT9Ul0QCKfzWzqB+EHCZX8h25GHPUPFkJw EgRYLSb7AHSwffrclWYuiDi/JLi57DuoMnqEiAeISR9ygNsaUv+KqLUV2a/6r4RFOgaf bpHCEsWcA6aJBCE2CrGlnZ+8fYugogqbw58sesRmuNKyXnRNKRCTkf1/blwLWdOMuBwi JHsvlggRVsIv2w0kuvPfX3wZx4EiB/234EKPb/OwMxny2fWMOQVbnfQDwB0pN1Hm7lan hj4SMOlXt/nbDwEZCm8eiykvwDuZlfHY3pqLgE6w8Es3fKXk4jTb6/XPMajpfNjD29Gv sljA== X-Forwarded-Encrypted: i=1; AJvYcCWQAGfjIcjtI87Ocfrkp5f2jQNDUHpGcDKUhzTZq3fMTwWIEoE5o+Q2yidKi4NaKH38cMg=@vger.kernel.org X-Gm-Message-State: AOJu0YzUgUJIraTISvYTyTfwQvsYejyo6C/EwvMFa9hkQXJebr4iLSSn onDj8BDb8J2CYypwpCmfkbQsEmihPYz80NKUneEwZRlgYku56091Eyu1Dadixik= X-Gm-Gg: ASbGncvBlkMA/dRCjTIPxJ9sGjkXtD7BKmYVcZ/rQhi9JiV4LoAp5/zFy7N+ssVtdJW WDcIea2FLCMq8kGecuZGLGatbASobNRPzP/WMccLabvB5gVSgfv6D0Q6HIAK+aMwtN5+MxYbmaC yBmc5xxngklwt7HCuLpQeuMMZFnI/mGSEpaoX2qdiuj+xnCE180i6pSIO7V576kIkkB7/ZpLama +uErjdXQ3zjYhmrsKoC9ZejLEUp7wtJnk744ZUpkXBvuMW5ldXzGoiX1xeT0X0pSnbH9YrQcoUh iAAEUeUT9Sb6UpvircWgde4q9Fnl7GgaiydNA9xDCC579KP3XI/9PNQ= X-Google-Smtp-Source: AGHT+IGRoGZ7coEeYo9o9fE7YTKv7YM5Vcb8VYcCl0LtzUFuhPuPAIbAabhl/TEnMhgrans4FlUiUA== X-Received: by 2002:a17:902:f648:b0:220:d601:a704 with SMTP id d9443c01a7336-22428a967a4mr181654565ad.18.1741582738292; Sun, 09 Mar 2025 21:58:58 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:57 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 07/16] codebase: prepare to remove cpu.h from exec/exec-all.h Date: Sun, 9 Mar 2025 21:58:33 -0700 Message-Id: <20250310045842.2650784-8-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- 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 | 3 ++- target/riscv/bitmanip_helper.c | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) 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..12fda410bb0 100644 --- a/page-vary-target.c +++ b/page-vary-target.c @@ -20,8 +20,9 @@ #define IN_PAGE_VARY 1 #include "qemu/osdep.h" -#include "exec/page-vary.h" #include "exec/exec-all.h" +#include "exec/page-vary.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..d93312a811c 100644 --- a/target/riscv/bitmanip_helper.c +++ b/target/riscv/bitmanip_helper.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" +#include "exec/target_long.h" #include "exec/helper-proto.h" #include "tcg/tcg.h" From patchwork Mon Mar 10 04:58:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009213 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 5AE951CB337 for ; Mon, 10 Mar 2025 04:59:00 +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=1741582741; cv=none; b=GP02rm9WJV+/U3X3Nc7RmxTv97+rN//+88h/11eQko8M5xSOms1J1WTRAJSo3x9cjAsqXZJaQdyJuBLDePDvmDjOSOOaAMF7teXKmMU3zcgLE50TqfhI7eqaqEeaBKa+/En3vAwmaz+HP6GVLJgva/573eJdAUcQKwjAL3GYacY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582741; c=relaxed/simple; bh=zb9oJzuMhuECChWGG74rp5f7LMy/8l0GIXuIkrWua8Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rvoGPjkQtzUWXQSFsgXbDpqrBy1qx9II47EXTvrM7oYDW8a8x+aWuBKLmRwTpw+0I/eBJjBfvULfVvoGBzxMNeVXyVaRY9xzt+/DPyKs4t3Aeqf5o+HOsCzA8fAMU5SYpS55LoBM1GEpdwdOpPpI85WTMINqq0eMXx8azDNnBS4= 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=wCSr9kqw; 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="wCSr9kqw" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22438c356c8so34966725ad.1 for ; Sun, 09 Mar 2025 21:59:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582739; x=1742187539; 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=nnRQREfY8a8hSo7O5I1BTgAG3l8eG/Rc3wUh1Oiddgs=; b=wCSr9kqwPknrzRxmpVqCuv0oC12J740XdkpzF9ttXdFKxxtPWhEq0s966AofzXy54k uVBHhWRcGzBLvNnsk3FpJyqO5By/U9Pbmjt9F9yu8hj9MwcORMGVVAVReO9Xm9b+LzDO m9fSZzexpdacHnKqE0eC8UFT1PzFzQpLOPqhwmZg9XauwyDoveBRkcJwu4XFTRHl3EaZ NGfgYxtQUa9vAx0uWaGP7aQoYKPduX+nAIqc1fUM1J2yO+GBHAYNwpdjUoIo3/DrBdd9 FaovXFsNAWKofkBD/VvTVRocxCUbux7EG7wWluZNG2amXVP90hQ26QoOIFyFJ2ZE32H1 QlJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582739; x=1742187539; 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=nnRQREfY8a8hSo7O5I1BTgAG3l8eG/Rc3wUh1Oiddgs=; b=EIsNQI38kqLWrgBmzUBfYhuKBM60wGp/MjJheM0N2s1V+wxu569d4QTkDfE3XkvzGu sZYl/TjGMYdPYxRIZ5q+t1ikF1q0WbZOkkbBWVoVSMbVSTKiIgmHQuC0pU+5VkklI5K6 GGHmGpDVkcNAcE0CmRvUj+rKVZDNtRuh7Da7sljoHWbNoiyorLj129VyE63N+cvWmFSO Q8Yuj3dTvVH4cS7KcvpYQZIBlTeSvIINMwEc4eveI0/SNEh4dTQF44GRZzFCZSWicdMF DQmNqotgyR0e7CAZSAW/huVY3U8vd1lZ074ByIWz5fgvLFPWBPc2D21t2rSm3ihgfl3/ d5kw== X-Forwarded-Encrypted: i=1; AJvYcCV70qGE3jF6P4ywoNomW6Yto4eFA3MreXWx9OCiEOGIXmu208EpcXsRRwR0KUWJ2Npv1WA=@vger.kernel.org X-Gm-Message-State: AOJu0YwiGgJXshkiycZRVbIbxcOyTlcRtDIBQY6tF4/rFOp1goRcflDi nuRrhP0lAyMrnVzPEM/iTJPQZcILVPUrgtAD5UhibuVcJbu0iKGRSf7kP6rrV2Z7qYEO5Ff2tZS gFHc= X-Gm-Gg: ASbGncuT8KWJ1unGFtdvjheKPutT+2fSp/MqjpY00OBYllqzpObI0U8tFAgB1xwF27/ OKf4rYFgdhrxMXz5cTW/kUN0KsKc7FlmswOM3l81L0ASU5QM3yMVfopWmtB3FxoC17RdYAYfmR8 fgWKj95vG3B8/rcpmcWwKEeAVZpwPIQgO1dehaWRUnzpDveLiopGQzJ2TwsIazv8l4aKFsnaaxe wsbLlMwMAsvmbkSsbJeUkeSq59Mi4JOi0VgBmceJESwJ7r/WYWhjTXEocJqe59clXHiPC8oFi57 kjBA2KNCJvEJK4M0h4167vi0ebScDxsePcscdZoKCGP/ X-Google-Smtp-Source: AGHT+IHAsq4Y63EYcwwuW/i7zg2X2liiOFC3cUgAGGWfi3nL4Ogmzyt5TH8VxxgwmAwHkd5TSMj4Zg== X-Received: by 2002:a05:6a00:3e29:b0:736:5ee3:64d5 with SMTP id d2e1a72fcca58-736aaaed79amr16963023b3a.23.1741582739550; Sun, 09 Mar 2025 21:58:59 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:58:59 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 08/16] exec/exec-all: remove dependency on cpu.h Date: Sun, 9 Mar 2025 21:58:34 -0700 Message-Id: <20250310045842.2650784-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- include/exec/exec-all.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index dd5c40f2233..19b0eda44a7 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,7 +20,6 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H -#include "cpu.h" #if defined(CONFIG_USER_ONLY) #include "exec/cpu_ldst.h" #endif From patchwork Mon Mar 10 04:58:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009214 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 661EA1CD1FD for ; Mon, 10 Mar 2025 04:59:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582742; cv=none; b=L766WDBVZTJoa6eqq99Y2D4wYTOkX0+xXgK1Z/Gw22C1PMzue1rDTJwallNGfuWPH7nhgp9qN9cjwGuq7zspd+5LVbW2p/oiHcfF1XKJE06Q+JINikDtF4oqzeWQrmw1nCukuK2rCk5dC/EnQUsedFpXlC9i/y9WLGqPQ4E57kU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582742; c=relaxed/simple; bh=IznGBUwVS5HxvRJlmh2ZSMDATYkDh51AdD480vemYnY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RnliHgIiUxyvuWMH9P/KxsszjcRcf1cVwiv/9tHOV2oPUrcyjA8q5dr4WoB2AUHSVp9elhgfpicen8iIxcWg6GJTQ0gYnOvprrAdTyBCW2mU1EjpAF+IdC3d8pFqGBFWLdwZJVyvD46WXYIlPegSuuT0mbkGNJ3wPSvoP67Hrx0= 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=qUq3XVEe; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="qUq3XVEe" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-22548a28d0cso35993185ad.3 for ; Sun, 09 Mar 2025 21:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582741; x=1742187541; 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=IPEDYJNluDpPES/gm3SGsU7HvgYj8dBtSrlHoVBQ0cc=; b=qUq3XVEeo37EIPqBcuGyKuN4jAeFcFKiSFhV4THmrvNLeSmu6vLs7w2j3p46rq9qvo tulufJVeGoxGXi5NiDzhi2mqfLW+CrqTQkKqMN4Faad3UmbVmMWE5Zl9owwzaWKdx4rs vQ4R9b50FEq0w+gyGtISvRl8UqFSJN76qws2C9fFZ4qn7EA9FcDtD+j7pfro1tz+9Wk/ V+PhjFADd+z3DMWWfW/diQ2TuTSk2MD/ZwTZeYPrOCFoZa37wgBPNaoi9bzSu4/ID+rS rEGdUxBfduHDhn4nlYiRQAx4qwSkP82vh3Ve650lS8wzsz+XhiFcohV5qTU+6dMvgbfZ QIKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582741; x=1742187541; 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=IPEDYJNluDpPES/gm3SGsU7HvgYj8dBtSrlHoVBQ0cc=; b=uIELd+PpbUc3EDgRGsCihRCdIgqg5aS2r1yn0wevBS1qKkYpHVirkSjv27ipibhjDc 5BymcE+2WuJUTt4umpv3ggopLyVe0JB6x2PnSp7HYG3iKzNxA/ymhbQJ6XrS3Re2796K FKSTsp4dB+pN3A3HR8lksdVPLaz2rst+LpRsJy8+KOOV7hUBAykV7R4usr0Sydz6VGdF KJGWrJLqg0LXerc4oII4dkSJ7Xf53wlk39of09sBCs+2WWE9BFJaJFinsr13e8FERc8I 6op/2rHQccLda2n9A9A1tZoo0nNSzp6Sy89JIOvpgw/YRcAr39Xa5zeCanvgoBh81YzW kSsg== X-Forwarded-Encrypted: i=1; AJvYcCVPzZTx34tSCyuRfmctAV+vKc9Bo6qZHx9mW0YDBzOLWl6dGLPBYvC4RuuqUP8IqtoG5ko=@vger.kernel.org X-Gm-Message-State: AOJu0YzUQbhdSJOlBGeyaPuq0GQ5wVEgTpinUKNLWKrJ4nRBURnsIh2d oxX0yyl4hEuFARPka7WtlkecQqWDx59MuLh0ofyjFRMjDIfjI+jWT+zO6scVJ4Q= X-Gm-Gg: ASbGncuWnidABhWci4v+2XXPsiguQdR19Ys+VFzXBbAIRtNBqRJMfvG1ttdLMgoT2dt xDfVE5MLD7ReSJUfb7TJSHUjct8M4Rh5fVLDz/NedFpVfF4TZnLXU54SonCS7VF/Z8Y7GGqUxsY z6Eg+pSgL4PRnp7Kk7KDz4gUCJzE8QwxfqtLj9rYtGYVfHhF7xuXcwTzAv6oYLb6dbNyWeP1Zbk YpK97jMFEnU8bz9vuN+AgQbip6JEJHGokTc+llwug3DgpLdpaPqLRT2Xwv4sKiigfSuFcbOJBWW kAwv6yjUgnQKIQHwNsO2HNk2jL52QHQSZzsyiuedD/um X-Google-Smtp-Source: AGHT+IGnRL2uatBuqKhV40BV7IK05QSeZki08kFFlneJ+DA+/in0OuYiAmS5NbuJabl8/7CaVrRM1Q== X-Received: by 2002:a05:6a00:cc2:b0:736:4704:d5da with SMTP id d2e1a72fcca58-736aab14d5amr19552625b3a.22.1741582740826; Sun, 09 Mar 2025 21:59:00 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.58.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:00 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 09/16] exec/memory-internal: remove dependency on cpu.h Date: Sun, 9 Mar 2025 21:58:35 -0700 Message-Id: <20250310045842.2650784-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- include/exec/memory-internal.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 100c1237ac2..b729f3b25ad 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -20,8 +20,6 @@ #ifndef MEMORY_INTERNAL_H #define MEMORY_INTERNAL_H -#include "cpu.h" - #ifndef CONFIG_USER_ONLY static inline AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv) { From patchwork Mon Mar 10 04:58:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009215 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 8ECDD1CF284 for ; Mon, 10 Mar 2025 04:59:02 +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=1741582744; cv=none; b=WBmJ+fkQjRO9XCLk5VFx/HnM2QYEN0NHOV9ebz+jO0lh7fNzQmunpYYRLnfWDw90aE0AVgMwVc9MpDRHa2cKgr8vTOo5GkJOzesw7StxeA3Dce/cFllcGGQcrPgIF8SoEr2ArM9xfvIBdJYuYUWbP5Il2ZBmVQysRf5OhqicJ0o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582744; c=relaxed/simple; bh=b3rEPrQgLRgTib5sQ2WJI8zvKOaN9PriF2H0JHg3XvM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VqC9vdIM8+1B3kuOjGszj9fVvzitrcv1QUeBaMWKWNAkizc+7xwtQwKo5bN+VfZG0UTRslwUKbibNVt1RUI8wNlTg+t+9oD5vJ9zOAu3o4lQjO9LvBKq05MEMc9G6yevFd3HOPwe1bbQ6QeOCIof6BtMa4fcgJdj5iyvnwkXLWs= 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=vZIjh1Be; 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="vZIjh1Be" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2243803b776so52191085ad.0 for ; Sun, 09 Mar 2025 21:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582742; x=1742187542; 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=pcOq/B0qkF7oBYEuLqTVXYwaTmG9K1DoxB38gebkidU=; b=vZIjh1BeCac/CpGkX3hkmkeLVMe/u1QoIbrmwZ2XhvePj/IVHeEtjpP+urKsRT3hrA oYO7JTY/ZZY8xGvjtMv0XcW44CCOifutLCNYpDngIaR7RihFwfct0X+bmcchulpsWzqk CYEfNmTIr3eY8/ygIVgbMIUf2kmDjMg/0EGfodtanzAU+KRYWjZ2z705imptPVLynBEC f1OBgjHXJYspgsPaWjf0rE/s4szCGyn62FpnIheC8BsdVt3zPi5nT5SkG2a9Uo4oDYjM oRIV+9kqjcRVyupMpjh0FzeJ1PWGCkAErEsvZKjH30QGGmAfHe/UrpihmG609SGOPFU9 gefA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582742; x=1742187542; 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=pcOq/B0qkF7oBYEuLqTVXYwaTmG9K1DoxB38gebkidU=; b=O5BN59viWfIzolHD73aZ7ubW7eTtwrHWZ5A00sj2MLdiXUawbn150aWSzHfpO8xqmk MzpSx4EQAiwliT6tnHS9qbGRVtiaMT/tCkAo7ZJG0cCSbLWEvVxUzhlj0sr27vglL60f FGkxcih0bnOC+Z15f5TNou7HTdT0AAABnNPmfidCcBy4qxypRBsTUw1wkKyABhJdgmZU dIKV3BSUf0rXEErjqchYZPpF+jiZjgnclAPk914jFFazpx89/xmryNlEYz2wNAoh9Hs4 uZ5KKG798un1Ff5PrFtsO2L/CnoJ2p0jPJymsWdtb1gk5JpzALG4bgJojcXME/yCtj6X XP+A== X-Forwarded-Encrypted: i=1; AJvYcCUZ0W6PWSyitEuGUb/KT+eB9aD3bea/fAS4iT6amnKRvfSB036jOWIM7biE+1dqfBDT7Mw=@vger.kernel.org X-Gm-Message-State: AOJu0Yxy4FZwK3OzGfZKlB0bizyRv1jP95yc1tvTh5nAO6w882AxJTNf IcVPX6DPyZ7IC4MJVDV7SaUhklA+MXhbOVvjHaRu8nm5/KSCcx3M9Y+kGKXlapk= X-Gm-Gg: ASbGncvZJkAHLqW9kg/3b8zyqdu0HuFm3wyZrwXgsLqNYvol2J4H3PKaviNr/8dCmwQ vH0KReE1QxvWDPdx9T8EUY/i9RUkF6O7XM1be2UPAmVGzdQ6I33SKkrDDn1QK6IYFCk2teDa00K JaeUTGYOGuI5t9iy8twRTIC5SYUbDFTDj6vZi5LwMwopAU1/+rFbtIJ+Bi1QSZpB5jDfgkqB8k/ HvhEVxSHcHX8o+PH3rvHE/ee32/g59NR549rD15OpzGvQE2q76Qq6iua81Uc/BthhEaec4qbfG4 O68320tfp5vUa8zJq+grnNHm85K0ZPlpdRAfCdjB5epl X-Google-Smtp-Source: AGHT+IEEpEpujiC2fwj7VGkMO+uHTookE/oxRvy3WzoSDUTK3dbiUUraMl3feFU8Mr38LhiryglRJw== X-Received: by 2002:a05:6a21:8dc2:b0:1ee:c1b2:76d4 with SMTP id adf61e73a8af0-1f544f67b54mr22292031637.40.1741582742058; Sun, 09 Mar 2025 21:59:02 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:01 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 10/16] exec/ram_addr: remove dependency on cpu.h Date: Sun, 9 Mar 2025 21:58:36 -0700 Message-Id: <20250310045842.2650784-11-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- 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 Mon Mar 10 04:58:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009216 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 C64911D5154 for ; Mon, 10 Mar 2025 04:59:03 +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=1741582745; cv=none; b=HlV05ouv/lGn4l8A+iPaudBKuwBbl+T5xJ4R97qbbwGsJc8xykZD3j2PYD2H3VThWHVsFpq5+P/ntP4ccpGg70yQzGvFwZ6/0MXV1xtOgCEgZ7JNcsgiFexbsBQMBhXTGYBkcXqkGKtD3hZwqUwYkGtwqzabCase9R4MwvOQwd8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582745; c=relaxed/simple; bh=ZXlx3paqgZcxGYU/yzgZ3nAXgcpELXrJJtwFKW+zuL0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JGrQYNhwvS3jhszI/pxACiXh2U/s4EgK/hes7X+ezUmQrW62O+NhNZ2D+zp7fhHmfPqQO/HMBWWNPiZPlMwVw8L+Z5s1qzOIWWga7q3UjSz3EmYHrNdd950uz01C1f7OIeR764yxbmdgaqBOPtN+4qCk+KMQrMXI22EHvExWHJY= 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=PBK5fYfS; 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="PBK5fYfS" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-225477548e1so20296085ad.0 for ; Sun, 09 Mar 2025 21:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582743; x=1742187543; 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=bTI1e75Far6tkvgIJWf413Q47HXvE/J/3XXxjgsh6yQ=; b=PBK5fYfSxbYoZM4HJNMsGenctlIHur4xlisXom/J82QDIFmUn2ZVO9sZLwyxDE1vy7 I7wIcruhzAHwQ7CiprdHa4dW6EmlDUjkvklHWqDZVL7V8OUr34OmzhG7sAOksPcCqst6 36N9JjxKPtaQiYb7eFaw9QzhRS4AeJoBdId9M3N1is4Fa61Gllw43fWyJZczmpO6RFhn o9dYcmnyipH1edPWR9AuBRCAEK48oIZtEEhkQTOsetTQGtcH4rzprYNj7jm/KB1HZs0w oH23gdzfrMjy959XVNj6ZLxLNgv51/55sAEIdlynb9oyyeqZKyw2LU0mG7R+v+CaVE5O Kdvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582743; x=1742187543; 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=bTI1e75Far6tkvgIJWf413Q47HXvE/J/3XXxjgsh6yQ=; b=TjRObEt5qSstjG/L37iU0hMTDKH6A6cyt7NNoRbCV91F/ZwzNe6hvMSsI49355UtcQ nk0dq6Fvtf8+1F3aLLr07wAqGPtyR2kBG6VArIhCyRPkQS+g6nnvHJOGpXx2+B9TXcCa JwsE63MN+PHXbmcmh/pp8Wuvq0OB3d30IoEh5DX+2TiLmMboFgH5HxDb+jHDAWFWhgwN X80cZ1Q/+Nu1sudlDrDRnyfy1ChYPavQzQGnuJq+Nd+DO9yZ3EBWvDxLd7uhFqoAFeXy /MKrYa/LxGuoZk+cD/dapJFTD2nRAtkAKzsxLS44OcNgf998MSvvxhu3i9rEhM5ZQyos vuVg== X-Forwarded-Encrypted: i=1; AJvYcCVwY8wuZ7eEy6RvBFkvpwG1MY6drZoOovuWCMhMe/F3k8JbnQbP1r89q7Yj92Y2JYaVUSc=@vger.kernel.org X-Gm-Message-State: AOJu0Yyh/hZuqgKDOL3Se1+gL7/efLGSKDqFyNLC4imSt6Wurax/rkEh GbFmicTT8bH5y0t01e1IxWuwU/IzDTP0TrPUy7DDe6aQ/aWeCdDcJVNqZ3T4HhQ= X-Gm-Gg: ASbGncu0LYPD3J/cKy/wgo/U2KJ2z0ZvGrPnFLPXOWvfB+LwvWj7a1bs+l4x1dbAi+2 hmKrJVOKn3Be7LseMKg5aVpgw370afZDCgsRgbolQVUVAkfjqpE0RkF228MxKxaiq+AxK+zFNHV MbkxBAxzEcrlrDk86omIxgMyZoXzJZSNXrR5tHTQEe7lrqXUvyUVdG18tKgklfpshmOKOzP4J11 osI5e0uVdJv2qkfUzaRWQXVXZsDBsLBlzO0hhgce4i49d3AHuNMPqaGmKqIMsMQNMKxHFsicfYX oD5K/OFHDT+ethSa4NTJ20eaz7fLWub9KLuLaQJLH1+0 X-Google-Smtp-Source: AGHT+IEJmFw/36nK1SG72X+BhxhrmIBbQ3tB+znRJTwS+V3kz822OtyZYcKaYIi+o8+TLN45WlwkAA== X-Received: by 2002:a17:903:32c5:b0:224:3c9:19ae with SMTP id d9443c01a7336-22428c07361mr200227865ad.34.1741582743213; Sun, 09 Mar 2025 21:59:03 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:02 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 11/16] system/kvm: make kvm_flush_coalesced_mmio_buffer() accessible for common code Date: Sun, 9 Mar 2025 21:58:37 -0700 Message-Id: <20250310045842.2650784-12-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-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. Signed-off-by: Pierrick Bouvier --- include/system/kvm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index ab17c09a551..21da3b8b052 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -210,11 +210,11 @@ bool kvm_arm_supports_user_irq(void); int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); int kvm_on_sigbus(int code, void *addr); -#ifdef COMPILING_PER_TARGET -#include "cpu.h" - void kvm_flush_coalesced_mmio_buffer(void); +#ifdef COMPILING_PER_TARGET +#include "cpu.h" + /** * kvm_update_guest_debug(): ensure KVM debug structures updated * @cs: the CPUState for this cpu From patchwork Mon Mar 10 04:58:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009217 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 0192A1D5AA9 for ; Mon, 10 Mar 2025 04:59:04 +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=1741582746; cv=none; b=E2ZSI8bNd09uVnobVGTtWxfGvYDCj54MBA0CWZsmEiG/dtjglkuHFET3UfmT/03rQ4i2jxtGSXBI7tWAj2NsiEfuItN4uU0LXLNbDuBm+jUgqY9vQknkpnEorm8jFPM5y/9HaU4xZ0yfMs7yzp/rSyWMbJ5C1T8A5TjwMQRPV80= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582746; c=relaxed/simple; bh=DRwQTps5snJJdEBDNnVUJF1Cb/5/flcUiwsKRSOTXEE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GFr05bgKBVBvUCv8M8CMEEe9HCI0GzQ40MYgPAhULgpQEmq5oeUDWHd5Wmu+yOeDF7gkY9/KycjVMMRyzZtcoyoZ2GxrZuCNWkx8XXwXbGle8XOepO53jjROqJHRWVwS3jYcala/cFwfuDiGAR/HBceuqvFoydTUYhpBZOXBSOk= 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=u6uq8vn3; 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="u6uq8vn3" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2240b4de12bso56093095ad.2 for ; Sun, 09 Mar 2025 21:59:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582744; x=1742187544; 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=0+faf/Iypy1sVhFNFInOCPAbXVKj8STEbMMwCdFMyRw=; b=u6uq8vn3A8MmqUVHH0BwfZtD64hmexKZ+9/jc7Trg3bB4qBj+yvH7mwaLhqdL6siUr KsAeFCJFCdK4HyEM7M9soW2AnJXNvFSnJMZ1Ly2kUTmKhTsH32DCAvWDlYz+Ot5PC0eO ML1WzxJXZjtMe+9UfYJmLpFi2QGYxZpNI84pSgGlZGKbuvPgnDXg9nSx9yEGFfFiUzCd PWDRT/WYj/8doMMAzuGvZd4fKI+wqlf75dYfJNNM993wO/0YeluKVYZtpz5w8Y4ce9jX XrXxaJtaj07Atect4qWOrapkzJ8csn9kOm9In3Y7vzrelv65TszzTCv/qYeCtOUSHzH7 acMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582744; x=1742187544; 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=0+faf/Iypy1sVhFNFInOCPAbXVKj8STEbMMwCdFMyRw=; b=NEyXeEjZKUbnb8Ewo8gkAlRDaozFYx5NSs7epi7AQq72dLDNX0GkmnAiwSEUExcBQG 4lQEeh0f+XZZBfIO1NMy5URamlmRfO/HX+xKOXNBlne5k3IuBrBAstV6miFHzkE6Kr6l LhUh0IR1K2jzdYqETL5DzZob5bQWbO1Q0TVsczOcazmfz5iOxBGSv/YSfsi2gvvAYj3P X9Gq8jyQKK9054NrSF8o+7nmbSLKgXV/1F5KnindPjhkxd72seu94/pltdJ6rFntBHYN 34I5XrUpw8Usn1+CGQlmcnGBEKlsyfKcLhwBB5O+t5kh6fldd8T7U5oPkGtHOOXuHJ0b 9+/Q== X-Forwarded-Encrypted: i=1; AJvYcCV34n44pyxaoHMdaU8KhCPxpOMAq2Xa/PmFZe+z+8IDbpA0T8ZVINF1IJT9NsferHG+2Rw=@vger.kernel.org X-Gm-Message-State: AOJu0YwcQfZjyhgtF6TIxN+w9Z/7Ba8zGR8amzVPmQJtVcELgBRLy1z6 nS2JhqVfUc12sy4qXa/ZgTJgJh35FYW6LpMWzq0T5EFJcOnMM49kuBx/5jAwILM= X-Gm-Gg: ASbGncsYvkZrr+86WvDjx7Bvda4aPOxTIVMVWeZFxPNat+g44KA8YZ/txqUT7jRUAxZ talcNvzXXtac1EuRqkF3PjpAZB+kBnKK/y47JOsu4skq0jIX6KSmntPIe35t9qnQ/JznERIMAur GC/n6Fg5P7lcN1dTkjyStxNyYS+Lm0nnwxsOIQxyWAKbM5K/M9Y4wfm4ZBFnn7oD/43WmKp5wT2 Xgsm4v8VaM92iVDfsMPhDiC20p5AKMNaq1Nhb8pbtx2CjhJ0gFmhaUEWKeruRbg4upV/h/fzHAU g57ulzqbYCr2aEfvifowvrORvY14axQ4L+SBDu8DACPh/ycvIoNx8S4= X-Google-Smtp-Source: AGHT+IHvC7npbpjr3DTdxoZwzYb1dM7G7lfM3pxuLeNMzVZpdYuqkJ12UM6z/Bptz/oCAInuSIhPSQ== X-Received: by 2002:a05:6a20:a11f:b0:1f3:2d62:3151 with SMTP id adf61e73a8af0-1f544acc6camr22843444637.7.1741582744338; Sun, 09 Mar 2025 21:59:04 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:03 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 12/16] exec/ram_addr: call xen_hvm_modified_memory only if xen is enabled Date: Sun, 9 Mar 2025 21:58:38 -0700 Message-Id: <20250310045842.2650784-13-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- 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 Mon Mar 10 04:58:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009218 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 4D4811D5ADE for ; Mon, 10 Mar 2025 04:59:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582747; cv=none; b=W2PpQ2wTZ529Fmj55Ei6lNT4WpMJ8+4GmE4gtm5+gFXbQAqwpTL2J3y6kfyVObH/vQ4zdFj3JVaxTEvqFMkQUORChpfM96DWxbMSUeXY+W5MbvdXPn9QRmgkG2hnL9JFum2GGZA46wYUgAzu54b/Rdjn20nwKuMRvOww54d7brs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582747; c=relaxed/simple; bh=ow9vxYsUi3UBMwX4i0Mm+/JHWLFZXDADppKG6z1vgec=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PsRj4E7rifI/TZcOWoVIs++sQg+LTnGE50MGKAaQU7pZFkaQ70bv3ZacJMbQyFUj0WIWx+HJGgjCMNMSgpb2V9w0Pth3X09dG0HhqZiWm2ZlUMj9o86s3RDP56gcduODNiJp4a4XsK1oS+VPxFOFf7qmi+5Afi7CZLFT2YHSYnI= 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=mKK48wqc; 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="mKK48wqc" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-224100e9a5cso67679065ad.2 for ; Sun, 09 Mar 2025 21:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582745; x=1742187545; 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=Mz3bAPQKR6fBbshrwXBmzVU3oJFomZ1j01ZC38m+4VY=; b=mKK48wqcpIISDtUTTdUdwiaaSWGwr4YIoBulzL2BEEN/EWH9/AsCNHQyTcBiPiRQO+ FAcsKrKD82jM+SQkMTyUWKoiLKfntMZXrCEgJJ+sQ5goHWG1mleP2q4X8oAoNLaXtr0n ZNZO4M7GkAC/iqPgzOzgWnjdIkwVvPdkNW/hwHcfsDK8Ya6/B/DMlGUtonjOgds9+9Wz 8AaoTLx26Zeh93WKuif4oBrmDuA9jVWg2Y5kLOLK8J+lKSd/PGDfUrs8Fm3zVpWIybEC nqYic4oppyUEXZ7VIjUGlEyqtHt44borY/BNSKuaGXonRyS6yupkOC1GFZu5f0x0cK43 2FHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582745; x=1742187545; 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=Mz3bAPQKR6fBbshrwXBmzVU3oJFomZ1j01ZC38m+4VY=; b=Hryt2vIgeWSGbcBqqQ9AJoJ0cMrk/VrNaM5HSq7qfSMoBExfrJ7dvtVaShDnRPPt/L LjlgMODVIdBcY6tmrpowbdkOI18LkdXp0YKPxVeqqtYbTwUeUYdjKatfNZ5k9oQnxIAm WfxO/DC/da1OLk2wo8ycPth/aQ1G9JBtdXb00KRokPMZSqbs4cPbAoZ70t2rnIGispOY DNUPRJfXM3ij2cKQkT43IhR1VAxva3ZvikPwzWyzNzqG4pgWc4pGTYRExEauXwioY/4w P1GWC+Ck6Ps87lbEeuAOOrWQ1qzBbzSfrOhMdpeUKYDGKL34jO+eFqPESi69WdU06fEK KZgA== X-Forwarded-Encrypted: i=1; AJvYcCX+GJ6+vRXVaFMvAiGByCQoYeaJw33I0skAyprRhlVvcq+8vy5k+1hjW055DAgc+ZokAnk=@vger.kernel.org X-Gm-Message-State: AOJu0YxEZvrJSekCw2gbrdGY/fm7YjVUt1z+v6XglHwcwCyFGusYX4Yn Bq6rPSACLhtQhjOSqco5KwN2B8to0Fwc9nRiWq4rbOWjNjdK8zGo1C2NUcBUQWA= X-Gm-Gg: ASbGncvF/WDpxOKDuhM3RDj71Ms5PezPGecStiDXgIuUa0CgL8m/C9s1gFm7vTaRKje bG9lqRNB2ZvDb+Qt1wjcUkDMgOVzeWTGZrVqQLKZO0QcohJprQ5bUnL3M5sc7sVaBDMUWmdRqaT u+Sa7XEoElmwD5FuV9HwnB1+ipQFjoZudEoWaVSlZJeERp2BVtp9bU0GoR7Un9zC282WXsZ2vIr LThgL4i7YeKvlUvRHI/GEX5v7uHgjl1h+BRD1eCfDYAyEONri61AtoYW9pTn6gvLyUyAEadip2s jMRL+w3ouj8iPWf0IGiqnwVH4xMoQ+Omih9pU8zxjhQI2p1ckqVEnZ0= X-Google-Smtp-Source: AGHT+IF05iTMc8yin7+8YVYQSgdEUPUj/50hW5+Z0DK0JGoSuS9iEibUeyOyOMAIIkH5mDIAK7kv9A== X-Received: by 2002:a05:6a00:2e17:b0:736:3954:d78c with SMTP id d2e1a72fcca58-736aaa1ce42mr17690072b3a.6.1741582745578; Sun, 09 Mar 2025 21:59:05 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:05 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 13/16] hw/xen: add stubs for various functions Date: Sun, 9 Mar 2025 21:58:39 -0700 Message-Id: <20250310045842.2650784-14-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-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. 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 Mon Mar 10 04:58:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009219 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 5C8781D5CF4 for ; Mon, 10 Mar 2025 04:59:07 +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=1741582748; cv=none; b=VlZQ+V8SWnoEqs9T4J/bHi9I0UgcRvZlN4cEi7au1L28bkQZmpkbbD+XfOYaj7pMxxqJoZKHs7l6RzYepIbalNwEgnQEFrvxOJ45LOyWpGumtFlV58tsccH4aAe7OWQ7a8gGygmoNbhxbdNtQ8pcYAewcXa0okBUCA9qukjbiYQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582748; c=relaxed/simple; bh=Pb63bG7wsSXbr9Dz4s9YlyOEu1r8ErrQY0nhgwBHCi0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VAcIa30B0UU/pcKavRaROVRdCzkJxuwCOwbcFDVjejbKxVO5CCAXkeeTgKKT6NjiRWSdDh9EV9cYcPCFjttQndaGCtT7pECgAgWLPJOcJITFtW0llfd7ygh0jlKr9NlF9fK9jMoWmbUxb+gLfwQdM8VkTfflGpSlTo67TfwQphc= 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=qSoSJuxa; 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="qSoSJuxa" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22355618fd9so66594495ad.3 for ; Sun, 09 Mar 2025 21:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582747; x=1742187547; 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=GMZho2jTEznhsPIS6UESQksv+KrJv0rJOAa8ZMe9/mc=; b=qSoSJuxafaG0pnwCQlkqS/Oct8GHAvOMv+wIVAZTVBXjCGKNo3dI5B0PyscQzxXhEi sDV3Nx6M8kz3Rqu7tSecJPDKsn763chQ6l+Y6sx1fLQJ74JKqaMtz+vXph8zuAcwfaIv LhnGLSLA5gMetrvTETd8FmwCkNM9RIUE6FltuP5zSllSYskebotRzAUjlA1hnWH9w3iO 1uo7eoJn6/WYYKbcxXGdcBFwsN8jcf4Ho2bBzjbbSb5eYZSwnHWTZX9nciSBVQU5j2v+ DCWIPpBUlbdVZoE6FEc+0/ADprv5Vmt4nG6pRsudmtoEFdMAUP5uITrl+XRqYSORRUBM iCLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582747; x=1742187547; 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=GMZho2jTEznhsPIS6UESQksv+KrJv0rJOAa8ZMe9/mc=; b=EKJrrPwecWGswJwR/7abVTPdyYhS91hKBU6eKGOT10CLx9i/6jbvnFS6fpXk1Gs4x8 9Qmf4L2YRSc12Iw2XMiIldFz/qptpex/m4eMFgZVvFNxOANzXph4TLXawel0iJfp7qmu hw6dYTFAbb7a1k0wMQNB9sBvPHD+FdWVqOXnI6v4q8Ci1UOJsSVGc3VecVBGowT13A21 lqbOGnmWT4kHXh0G9eVnkb7XoqacNyfL/lauNG8r53aY8oo2U9e3NPh4taoUb1RXK62S UhuUByfItPv6jtt5PAr2xIWrCDHjS77zirp3D94OUZp8CoFxOAI9rJPnslBjVpTusVvs EeNQ== X-Forwarded-Encrypted: i=1; AJvYcCV/6FlWtOfwzJW2pFmZ2y1aq7O3Zac1I46lNUAiSAs1Dlnq4PA6JqoHNtzGcztLoe0rgYc=@vger.kernel.org X-Gm-Message-State: AOJu0YxWtfXk8a7qANxYABfrFCb2OD4FXoX/zpWenZP1gAgW5CgXgUF/ 6v5bJ69JyoNem+fkRcY5fL/XZB9IvoiHoT//PiNPN87NhjAHGIcNhL4y1x3k33s= X-Gm-Gg: ASbGnct6O5q/wxKU3/8FGT73ybZtdMmbnUAzKwHOwWWMX++XhuTVuCKdjqFvhacvSE5 /6aHTjnbjU/EtIHkJtViSrTCqA2ygmPqXMiqsswrnzhsOmazRtC/0WCfVRR9knDprEjxOSUk6n+ sN/PcJOSyma1O5IUf7jonxaozOs5vt5DbKBFf9R2OXFFK5NJPAkErsaQYnpGBEwgBvZ++p8eoSK Tc5cn/l7gAheMWpBP98UD6PeCrwdYsLmHZg6IqOG1QzhhA5iBSVfaaR4T7kCbhpHlxIq2hPkN24 vsYoLMRjw+/ynjt2XdzFZINWSlvKWGMwzpYgBPIXQvq1 X-Google-Smtp-Source: AGHT+IHbQ1zJTyihYPTNnOdjfB7Sf4JwjgD8pBM833NXOATM0his3HUH4Ux5tSFbwWsuCfmQbH8fWg== X-Received: by 2002:a17:902:d488:b0:215:4a4e:9262 with SMTP id d9443c01a7336-2242887fd5cmr174335945ad.8.1741582746784; Sun, 09 Mar 2025 21:59:06 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:06 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 14/16] system/physmem: compilation unit is now common to all targets Date: Sun, 9 Mar 2025 21:58:40 -0700 Message-Id: <20250310045842.2650784-15-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- system/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 Mon Mar 10 04:58:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009220 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7193D1D63D0 for ; Mon, 10 Mar 2025 04:59:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582749; cv=none; b=YaQMLdB011HJtKxaw1aW4GjQReP7fIpAJtkHVvqf/6LKx2QHOPOKGj/SVbdtdCblliRvtcAcN1yW29Rm/WuL9HcDoVfP08iXRqTQXhYOMCj6cwcDheEYCtg0aNl7b/D+qFH5LnOEuB3ZncNV6v54w3WcFv2o0HK+F+K4/pYGo+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582749; c=relaxed/simple; bh=r/LXUtaTRicvesGetwdLYB7XQ6dbrs5IufDJXlrT/RE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cEDfJor2TyGpgFrzpEZp6/xn5U0G62mTW0nyf9vxWdPiJ0ts5usnF4s1zgRMFY69q4hmBcSbtbX145jXIRYxiPxw6LTlDsmWr1wG9prDJvUbr+V/mXdTGLC3SWkXFsmUhrd+mJpTgKJNvXnIlzN1SHJvklHEqcW28uFycgdtR7Q= 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=sGGQ/KVn; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="sGGQ/KVn" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-224341bbc1dso35375235ad.3 for ; Sun, 09 Mar 2025 21:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582748; x=1742187548; 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=ca5XHIZHBD7tCKLnU5sMNG3rMchaOW2xdNGbrtAeUuA=; b=sGGQ/KVn8V4tJD47CgdIgKm2uNc4qG05QvrxCSjP0OwyL52KQKxtOn2DacjC4nIRbN UNhkprGO46tJ99c7PzgrhYDaSLATA1O+IrUWihDBkqiFbr8BQLFwEo2k05hjxnyxXCX7 T2xXwVb+Q79r82Mg82nAUxCf1GYIn7JYZMmSRZPHjp/SROSujGZ9K6dB8lL2KBVrB4V/ CnbPJmP2mZFU+/v9TWr1Pum6iOsHH/dMGsSo2eKgw7yvRrb6Ps+zRUPionLdgebJxQxp KgjOYkWGgewUZuPizmvqQQ3CO97Uw6hp8V9YDc31ok5cG2RmOlzJIgMn0rfXqy66FyIR qFiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582748; x=1742187548; 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=ca5XHIZHBD7tCKLnU5sMNG3rMchaOW2xdNGbrtAeUuA=; b=n/1IKaAZfhyFAwJMc4nLJDQ3dSE2mqTU6FhB8JLBkNRuoTXtqmphC1Jlg19/yTe/tZ ABJXT9uLRfJWNrSaYY+QfuoStoyIVVTniMkQOJB4wDgHBznwajlAK0aq1cDpjD79UjwA 7rRXGvgruWLPXZml4Xz6bJv79/yX5rIhMbsHe8iBia/6by3Rxy0KTAZQoCxqdzUV+BPH DMYnWJ45wvuIqD4sFMAMey5jlOL+IDjzp6iPmfHR4UXdzQ1qisybbX5FuCR0980npy5g ebO+AChl5Yj/GJNU+hxuE3Sksvu+m587RH/q9wLFe/STcQYCGXFZ3Q1JIWvxRRe2cOa1 U3EQ== X-Forwarded-Encrypted: i=1; AJvYcCXQT1PlltQzeHz86cvfodtyV9aB6OEfLGHiYmIB9GTXokEzP/UdTHplYaD9GF1AsG/6+RQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwmegMw+lHuHm9V5HN2x6h7func6CPbnCADynTkah20asIizNcX O1kIdQs7Ou6zrHyZSBdlSLUzNS0XIHQ8Qg6l7uD8QLz1sQB+Vlnf0fZ8xbDtAfk= X-Gm-Gg: ASbGncuoso2BpMPJ0QJMcIrKSseditrQSlbPm03SBUHWvFmfJShEHZyB95szSBq6SAN lPLa6BHyVTtSxkUM9LYd+gbdvHZspWHyn1otcfn5Agat3O4JHhONFfa0xgRCzfcuP6PjLMkaqjZ agMIbkOKDdMDsOZnJkOkf1Udk7C5nWnuDUmPCFHEH33JCWdtFRz8ItzRDixkFwt2Ymcbl4jF3GH PM3TMYiijvBcMqh6NChaMw5diFlmf20IZ6OphvU7Mhl8zLkUCwGil0goU12+hl8P50h3pTJVuy4 610eX4avJ91if6L6Df4oHYzft2WrguBDCT8kiSa8ymiP X-Google-Smtp-Source: AGHT+IHOxR50kjFp3DQk9gSBOkNND2h3Drx9YEHpcRm5j+6hJ+poi1niGnSE9oReFoFKVWczKyJ1NQ== X-Received: by 2002:a05:6a00:2315:b0:730:7600:aeab with SMTP id d2e1a72fcca58-736aa9fea71mr18336179b3a.13.1741582748003; Sun, 09 Mar 2025 21:59:08 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:07 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 15/16] system/memory: make compilation unit common Date: Sun, 9 Mar 2025 21:58:41 -0700 Message-Id: <20250310045842.2650784-16-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- system/memory.c | 22 +++++++++++++++------- system/meson.build | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/system/memory.c b/system/memory.c index 4c829793a0a..b401be8b5f1 100644 --- a/system/memory.c +++ b/system/memory.c @@ -355,11 +355,11 @@ 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 + if (target_words_bigendian()) { + return mr->ops->endianness != DEVICE_LITTLE_ENDIAN; + } else { + return mr->ops->endianness == DEVICE_BIG_ENDIAN; + } } static void adjust_endianness(MemoryRegion *mr, uint64_t *data, MemOp op) @@ -2584,7 +2584,11 @@ void memory_region_add_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + if (target_words_bigendian()) { + adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_BE); + } else { + adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_LE); + } } memory_region_transaction_begin(); for (i = 0; i < mr->ioeventfd_nb; ++i) { @@ -2619,7 +2623,11 @@ void memory_region_del_eventfd(MemoryRegion *mr, unsigned i; if (size) { - adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_TE); + if (target_words_bigendian()) { + adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_BE); + } else { + adjust_endianness(mr, &mrfd.data, size_memop(size) | MO_LE); + } } 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 Mon Mar 10 04:58:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 14009221 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 F09B61D6DBF for ; Mon, 10 Mar 2025 04:59:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582751; cv=none; b=CKAHvLpIbrHpLzQD5vTnX+r54VOj6DN8DeRCebwUzQJIuwDZDEzUqgTD9MI3v9LuEfEEmKEVSmQGWoGXrwgWLvnFEmx4X39vD6QMVGHaByfbc/R9xhfc3Dz4JEiRgrlfNqJze4Dehombjn4idKSPMR1/I9O2BEe/kyHk6bI0e64= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741582751; c=relaxed/simple; bh=0rtqNP6/gSnLmVrosh+fl1kNewzUJ5c0wYi2Lx27vqU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bzrDe7xJ8yZZ7A8OuYJslcTfZWqZkXuqIf7SkcvrvbplxTOla13k8ww1vKNiYMUF7EY+TyRchAInjeqJyAXQdH08xYnryDogYPZ7eZTrj+IqS0fMM7fRXEr/Gs8PnkARaBG3HE42Y+uONLjufUZeVWcUWHRcm2oli2se43QflmA= 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=HyHMkFqD; arc=none smtp.client-ip=209.85.216.47 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="HyHMkFqD" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2ff797f8f1bso4650734a91.3 for ; Sun, 09 Mar 2025 21:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741582749; x=1742187549; 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=yo5TAW5cQeh1DHP1d5HtuffIuVKJac+rUoQhULbtd80=; b=HyHMkFqDThs4hofHwm31AWtM/+H8/K6Wdi461uqx7SCuk/HUcVfZQn68qGOqYChLwH CA0yXZPzsUkkZKgKtUT9oVVG8D7AgqgTtAn/jfYWCDR9jr4PM1L8dweIGttZTt/XOqR7 azou/fqNUDTrvA7JNyMyvb5vnZ31/LS9qoBIOor9/8aYxrM/Nt9d2HjGYKYwW8qIsg1m oEE2B2UxQpTmMNeLkU4tcieyFRZAagCzTyoUK2polkLwsPaGPbBzJLK0y/ESTe73pRYM OIz9fl29wkz1/NjoFKFj5mXyZPxRxhRB4k2pv965amMWsl/8JcBvZ49EEAqeCR5ko7D1 0Wpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741582749; x=1742187549; 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=yo5TAW5cQeh1DHP1d5HtuffIuVKJac+rUoQhULbtd80=; b=wdoXtuaxEYdFy5MIzAXY2Gl1KaN5zaLopB9yFQEMxCVltSe0nRmlvT2hRQ8dCaanqr RyVv5RRIyG4K2rAuV58V0gMme0idc3vkM8UM21cVu5YL1zkX1skhEfywXUX/PLzCyDmb rDsVq/fNm7DwOSRTh1o1h665co5TInJYw90n1PRqIvgCTDK7RD1mHL56EBiHB4qvz8XJ YQHlzOdPI3K1X5hOKtUJSQMK2WLkNNAcOUxsOoGWOeebykfw9BSi32LyFfViaZl4C7IX M8K6nJSoBpULJWdcsyOmrrmuNYeugROEcM49i2oMr2VykgftFrRvUg4JiV3IxeS5MHCn nd5A== X-Forwarded-Encrypted: i=1; AJvYcCXhoXxnmWOC+H2szv+nUGY7p8I2ddAssH4AomAPUBj28IFphpwQkj6+rDzXV1FHFzOoJJg=@vger.kernel.org X-Gm-Message-State: AOJu0YwwX7/hj13a11I8R9OqQq9rZiBaq4F6H72Pdm8KlCF4oHoFoe4W nRzG3LuZgWhYrXNG5yJCTaTZmBxWuQ91peKM1vJaNqaoEkmM025TSHu4kYE4hXI= X-Gm-Gg: ASbGncvo/idC+Lkoq9pF9iFghjka17SoTr7V9Tft2XiOlFB+y7E37EKy/iC/icXfBTB PLO5RzBBEPG+O+K1Gg/PlpPlEDHzfzaCyPeXJ7iphkwyXEsFkCZ1A8eqPmioKC/Bztuw2VqZyYj k9kNDBHBMjeCPjrgG1buK4Ly2973ZXlqobGnxZLWHF38u/URf40tFdHnr2pbwY7eyJxKi2OxdqJ 4kVw4OqykPeO99iwYh+v8Ua1Nuf78lK0kVopJ16bMkUL85dcdrjcPjNuWznk37CA9uCM7q4FUKl 9Osr2mEFqDMWcu5+urueZf4vNur7PHucUJZETVSQRmPL X-Google-Smtp-Source: AGHT+IE5gWrqVh7MPBsCW9xpH4WbBfOw86WZFsUWQXQSa3FRghy/XQpC1OkuRKA1xd7a02NCd2RqPg== X-Received: by 2002:a05:6a21:6e93:b0:1f5:6e00:14da with SMTP id adf61e73a8af0-1f56e0016d7mr7868375637.40.1741582749217; Sun, 09 Mar 2025 21:59:09 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d2ae318csm1708308b3a.53.2025.03.09.21.59.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 21:59:08 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alistair Francis , Richard Henderson , Harsh Prateek Bora , alex.bennee@linaro.org, Palmer Dabbelt , Daniel Henrique Barboza , kvm@vger.kernel.org, Peter Xu , Nicholas Piggin , Liu Zhiwei , David Hildenbrand , Weiwei Li , Paul Durrant , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Anthony PERARD , Yoshinori Sato , manos.pitsidianakis@linaro.org, qemu-riscv@nongnu.org, Paolo Bonzini , xen-devel@lists.xenproject.org, Stefano Stabellini , Pierrick Bouvier Subject: [PATCH 16/16] system/ioport: make compilation unit common Date: Sun, 9 Mar 2025 21:58:42 -0700 Message-Id: <20250310045842.2650784-17-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> References: <20250310045842.2650784-1-pierrick.bouvier@linaro.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Pierrick Bouvier --- system/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',