From nobody Mon Feb 9 20:34:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1770229704; cv=none; d=zohomail.com; s=zohoarc; b=KbsXVNmo3DN1r6N+s9jVVEzKWM47ZcDDTYR71JhF9z5JXgykIrI3OCE9ROnG1Pkh7vKmLPB5i10yzZy0j+v1I1/IMZ3amLTQ2ffzyzdGSMaB+HbRdS7sZsnD+mo5urK8e86q2osI96QYDdSftAbIia3lII3xHp2PFvkbLzpFlkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770229704; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ET3u5zl+QLduG0heKga5tlLiWgMZ9qM+VF2tNmZyIdA=; b=PAB90kOriKumSliw8kITw9YXuXK+VrXL10Ngggz6DDdssDwAeIAmH8YlOroCFxPN03QwrMlruSNcBONvtUq5ki+eZukaGfeGrQP35zTDaMHgql8AFFdG2vMQleg0KvGaCPHhqB5CEPgNT34vNr5YraupGukufJzdM1qT/vSAAM0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770229704438629.2871163779805; Wed, 4 Feb 2026 10:28:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnhbT-0002g9-TX; Wed, 04 Feb 2026 13:27:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vnhbS-0002dr-5S for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:27:50 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnhbQ-000158-HN for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:27:49 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-48039fdc8aeso604145e9.3 for ; Wed, 04 Feb 2026 10:27:48 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43617e3a3a9sm8200618f8f.18.2026.02.04.10.27.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Feb 2026 10:27:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770229667; x=1770834467; darn=nongnu.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=ET3u5zl+QLduG0heKga5tlLiWgMZ9qM+VF2tNmZyIdA=; b=pLOf0y04K0NaHWyR+Epz0zXVPpFySlsU6svsSf2ZRqMNOpy6StUwHxkGitD1arWa5f gEEZ0DBGQ+b/hY41KEvKUgfwWxe/lhAHDLzDi3I6YebVj2fJHnL6wK6MzrsOBupwUynu Kiww4lCHd59lNQjRebGHJVbWMsyIdPCo4xpOam0jzd06MyQ32Nxw46UpI/PWZk8spn7r cMA1JMBPR5U/OGRcJ2xOh+ImiVdIaB8qF+2g6ss5l/q178WDQRo1T95ZdvJXNz+awpgq +lILgrevW5uXNj/OFk01zNHtvRbpj7px1ZOZUskrb65lpRRC/1/uqSz97fbsQBKf4iXy yPuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770229667; x=1770834467; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ET3u5zl+QLduG0heKga5tlLiWgMZ9qM+VF2tNmZyIdA=; b=hVcSa05MqcjTgBKt2Ng3vH5ptx/N/J+4PVkTpAplulefJJDZw6eISvZBBUVPI8Ha1/ mSXiLQhsXNYfjKFqrW3hc42hhH0jqMa6rpwqunf6aYzctNdDwsuzy5CZPVK9rPt4ubAF wyTQQ0/oXvPJBUgdaKOuOJYaqy8nP5/SVMmGwcxttKjADwTn3sUTn4qOSb07lwUDfaD4 MqRu1jWCw0sTwxXaGHcsoIuG6tyHzf1Q3qYIVimare2/hxFNZ88W11w9v7b2fzLVZC5X 8qTpClMSZKLKboS2a9OM0GRXypqiwPZTkDE6qOj8Tsq0QNchsIG9rRZaQ8HGj6NDy9Ve TS3Q== X-Gm-Message-State: AOJu0YxXs98YFd5I0HWxS8TEa7gCwrK60JSPn9idaiKUasxUseriRkNI 01CHXfRnQI3ofrAEEnu3TD1d0au88qXCmIWlm/nDd424T0TnxlFl0hM4lj2Bfqc5g7OM6WA1V5e OoRcWoUQ= X-Gm-Gg: AZuq6aK6sBXUSwXcPcgCgV6y7QOl1DNkuAUX0+3H0QDEfs7N1uWtwZOFyZ7Yz0U0u2u T85ixoVkYFeQboB2eeS2sirhoq+SEg/cIC7aNtnDMEOUKVMU3ASfMB3GK5UiCD7SUxPvr4eVVJ4 ShBillELSTEUlCIF2A4PA+bDnMAHLMMH8DW3T9LQKiCRyTrGC/1i8g21ESLbLxtxSl+oc1RK4se 06VeHe/Y+/to/uBIBBoy1K9XDGWME3AYS35rQO3B1pmdgRM8qgYbXiOcrbNH86Xm2pHdjsmXfF3 +KC91j7J8taJiRU2HW5MhzD6Py/cEs80ygwB6iqkzBodqgNorP+bEXilpT+NorGvw+vgXIfKcn2 ixb0m8VFBwH6cxP3zU+zuQH91rikQPWi6L5yrqG06f2BXA2Hhr5Km8PULtQupoKn+C/UgrVzoHH j+/yZ7A2oYsuqceUOtpMDojRiC48a89J9bq5KeIG/x5bJc/Meq2stIeP/s3WQo X-Received: by 2002:a05:600c:c4a5:b0:477:73e9:dc17 with SMTP id 5b1f17b1804b1-4830e99b7d2mr47462605e9.35.1770229666796; Wed, 04 Feb 2026 10:27:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Matthew Rosato , Halil Pasic , David Hildenbrand , Thomas Huth , qemu-s390x@nongnu.org, Eric Farman , Anton Johansson , Richard Henderson , Christian Borntraeger , Ilya Leoshkevich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/9] target/s390x: Replace %target_ulong -> %vaddr where appropriate Date: Wed, 4 Feb 2026 19:27:16 +0100 Message-ID: <20260204182722.44062-4-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260204182722.44062-1-philmd@linaro.org> References: <20260204182722.44062-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1770229706801158500 Use the %vaddr type for virtual addresses. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- target/s390x/s390x-internal.h | 5 +++-- target/s390x/helper.c | 2 +- target/s390x/mmu_helper.c | 6 +++--- target/s390x/tcg/excp_helper.c | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/target/s390x/s390x-internal.h b/target/s390x/s390x-internal.h index a4b54dc441c..f0f7bb5cb11 100644 --- a/target/s390x/s390x-internal.h +++ b/target/s390x/s390x-internal.h @@ -10,6 +10,7 @@ #ifndef S390X_INTERNAL_H #define S390X_INTERNAL_H =20 +#include "exec/vaddr.h" #include "cpu.h" #include "fpu/softfloat.h" =20 @@ -376,9 +377,9 @@ void probe_write_access(CPUS390XState *env, uint64_t ad= dr, uint64_t len, bool mmu_absolute_addr_valid(target_ulong addr, bool is_write); /* Special access mode only valid for mmu_translate() */ #define MMU_S390_LRA -1 -int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t= asc, +int mmu_translate(CPUS390XState *env, vaddr vaddr, int rw, uint64_t asc, target_ulong *raddr, int *flags, uint64_t *tec); -int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw, +int mmu_translate_real(CPUS390XState *env, vaddr raddr, int rw, target_ulong *addr, int *flags, uint64_t *tec); =20 =20 diff --git a/target/s390x/helper.c b/target/s390x/helper.c index d0c36d4a537..5002eebd4c8 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -71,7 +71,7 @@ hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr v= addr) hwaddr s390_cpu_get_phys_addr_debug(CPUState *cs, vaddr v_addr) { hwaddr phys_addr; - target_ulong page; + vaddr page; =20 page =3D v_addr & TARGET_PAGE_MASK; phys_addr =3D cpu_get_phys_page_debug(cs, page); diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 30f09ec3de4..3313487b41d 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -122,7 +122,7 @@ static inline bool read_table_entry(CPUS390XState *env,= hwaddr gaddr, return ret =3D=3D MEMTX_OK; } =20 -static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, +static int mmu_translate_asce(CPUS390XState *env, vaddr vaddr, uint64_t asc, uint64_t asce, target_ulong *r= addr, int *flags) { @@ -381,7 +381,7 @@ static void mmu_handle_skey(target_ulong addr, int rw, = int *flags) * there is an exception to raise * @return 0 =3D success, !=3D 0, the exception to raise */ -int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t= asc, +int mmu_translate(CPUS390XState *env, vaddr vaddr, int rw, uint64_t asc, target_ulong *raddr, int *flags, uint64_t *tec) { uint64_t asce; @@ -584,7 +584,7 @@ void s390_cpu_virt_mem_handle_exc(S390CPU *cpu, uintptr= _t ra) * @param flags the PAGE_READ/WRITE/EXEC flags are stored to this pointer * @return 0 =3D success, !=3D 0, the exception to raise */ -int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw, +int mmu_translate_real(CPUS390XState *env, vaddr raddr, int rw, target_ulong *addr, int *flags, uint64_t *tec) { const bool lowprot_enabled =3D env->cregs[0] & CR0_LOWPROT; diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c index 019eb4fba1f..292d130d03e 100644 --- a/target/s390x/tcg/excp_helper.c +++ b/target/s390x/tcg/excp_helper.c @@ -147,7 +147,8 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int= size, bool probe, uintptr_t retaddr) { CPUS390XState *env =3D cpu_env(cs); - target_ulong vaddr, raddr; + vaddr vaddr; + target_ulong raddr; uint64_t asc, tec; int prot, excp; =20 --=20 2.52.0