From nobody Mon Feb 9 07:38:32 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=1770229693; cv=none; d=zohomail.com; s=zohoarc; b=a//Jx/60eHSmbjAqOToPFK9kca5aQG+OwpOIHXjEKC3hMKoGGCii8bJI7mHY9vEXq1+xt3QqxebPONzbwiMmtrr7OzgMdi15uUb0lN2QTIPB6lMkUscemqj04REW1/HmvnIpWNwNUHSOnBbYqSZDonM/r2ZEmyeU8OOjj1TeDuU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770229693; 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=jvE2Y73I6IaYLt6UhjFR+CGAiJFnskYHQajNdWFwAsU=; b=ZxTZP2LnFEoEmD/x3BlC2PQ4nA608n2C0MfchJqMG8g2ZVsKPkqsci4J5cGYa0TVvGpoi7io0FdiFNOAT28grWT6yO4ywgasPt7IZOcRumc1vzj1V+BOU7Ser2HrgaGbbeoEARmwaMShvGsgqmVHWBIY9stZuneERP64cjd6omw= 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 1770229693262922.7139201036085; Wed, 4 Feb 2026 10:28:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnhbH-0002ao-H2; Wed, 04 Feb 2026 13:27:39 -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 1vnhbF-0002aX-Ph for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:27:37 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnhbC-000140-Iv for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:27:36 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4806ce0f97bso1039295e9.0 for ; Wed, 04 Feb 2026 10:27:33 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48317d58214sm1589225e9.15.2026.02.04.10.27.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Feb 2026 10:27:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770229652; x=1770834452; 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=jvE2Y73I6IaYLt6UhjFR+CGAiJFnskYHQajNdWFwAsU=; b=HTlQ2P4FwnYjHs1vNVfp4qKsY8lp1ozZ3TseNyWPUjAZ8PiEizKlP0fRQH0S6ZIBWJ P3UFZnCxKLxGNi5J0leLLqGNTwxHKUtA3s0MOOk6fO5uMxHZtT6QYbgTwuU24rxmBiuU gsFlmW0ycWtdXqWACNK2bn0nGvW3xHKqBtOsxGtXB2ltVs0VfrOffQIr5VEZavLF/4Dw zotI5lePbDDAnxbNUe5TOeICbruEEkeHoQr/dAw2sGx3H9M2btBQS3ExHYvupNdlLxNc 8yOQexsoL7Ex/9C4yfxIfZECHAY7d5fPuxdVyYeuIv2U2wQ8PX+CLk5O110aelgC/nwc 1pmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770229652; x=1770834452; 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=jvE2Y73I6IaYLt6UhjFR+CGAiJFnskYHQajNdWFwAsU=; b=Bl4tjNx5Vptu1dWhjQuhmv6J3CGCAnlR3QcKUAV7SXyOtweeYHWF+kqbkTFVIGOzBT b2UusilRESnRkFlwxoVIv3v0KEtI8P0yN3ATg1qE5zsUxc18Ffj/1MWwuGWyvGBNiVBp o5zZcUD8dspTPn4smCiZ9mypBp0KCygmTWRMoVX+iq3VJPg1Z5fI76Hh20zPrLuUPNNb iasY0iAz1/ERJlVdjFnBwQli+502EbkWleCCyjl6kqb9ywIn88a7qpXmOAb/ekLECFcr xTNvvCX0iD7oQup9nuZYimYGS11EDKF0eV3RWQ/Y+HvscZAZiD30TKG5QpD/zKA7RIUa Eb4w== X-Gm-Message-State: AOJu0YyzwQ6kih2bX3/TVak4+jmsMBU6DW/tNIBsNm4iDuooXHVQ7Cp1 YytDxArFDKnQQWliH+4h1fghnpybRjh1bf7Rz3vhlrWHLSBqIUURoMiRPitXMIDltbhDR/wRjYS CvvQUYG0= X-Gm-Gg: AZuq6aJwyj3CLlxPT0Sd66Q7OVHPLKBVIp0AXqjgK//txCNEgwxG591PoF6+Gj1BtYN D7vWws9/z4uOQKZvZyZij6CU+a2R6L8smfG0eZMnx+0t2DNG2tfY29h60Os3lIoC9LGfEgZkWSD 57Ya01EHO5c7ZzzOajG6UJTqshsvQqNlGsMT4lFILlisT6t1XEEGiOX8dGQSk3plA4M987Km5SM GmPaC3wEh3JqwhfIbcuQLkL1o1FI2SWyEzGO1gH5mqcnnIQtiDWGpMU2XH81dsT+yQiB8O4SVb/ 6I0ZO8CLbJmxGSFyogf85+q+7uvK0Kf33WiWxXgOdwSqm2hDRnSvhNcfgMFxqDrHkeCuvn6BWJk g8hgkMqZqG8aM6BVu85Z3wg2aIjL/MeUic8XshjrCYp/6FcH3it45R3hhLI6kxjbE5oAVpwTDOJ eK8e2QFVrtAt2uhTqvQ75OHItlG7087QDZJWylcN8EGwuLvPbl2ZFL6KjU7/IJ X-Received: by 2002:a05:600c:871a:b0:47e:e61d:b8d2 with SMTP id 5b1f17b1804b1-4830e976f0fmr56020965e9.27.1770229652574; Wed, 04 Feb 2026 10:27:32 -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 1/9] target/s390x: Use address_space_ldl_be() in read_table_entry() Date: Wed, 4 Feb 2026 19:27:14 +0100 Message-ID: <20260204182722.44062-2-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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: 1770229695269154100 address_space_read/write() is meant for accessing random amount of memory blobs. When the access size is known, use the address_space_ld/st() API which can directly swap endianness. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Farman --- target/s390x/mmu_helper.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 026502a3e40..30f09ec3de4 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -108,6 +108,7 @@ static inline bool read_table_entry(CPUS390XState *env,= hwaddr gaddr, uint64_t *entry) { CPUState *cs =3D env_cpu(env); + MemTxResult ret; =20 /* * According to the PoP, these table addresses are "unpredictably real @@ -116,13 +117,9 @@ static inline bool read_table_entry(CPUS390XState *env= , hwaddr gaddr, * * We treat them as absolute addresses and don't wrap them. */ - if (unlikely(address_space_read(cs->as, gaddr, MEMTXATTRS_UNSPECIFIED, - entry, sizeof(*entry)) !=3D - MEMTX_OK)) { - return false; - } - *entry =3D be64_to_cpu(*entry); - return true; + *entry =3D address_space_ldq_be(cs->as, gaddr, MEMTXATTRS_UNSPECIFIED,= &ret); + + return ret =3D=3D MEMTX_OK; } =20 static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, --=20 2.52.0 From nobody Mon Feb 9 07:38:32 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=1770229738; cv=none; d=zohomail.com; s=zohoarc; b=nTSjMYxiNQtJfHET/Hb1Eq+QIPEljrpY+agj9UbTfG1FpNA/dlVuY5TpKeH0MdeIA4mEkzOw/oQv4Bopw5b40AK8B4Ds3YrZrL01ZOB6wdgd+FLDfa38fIX6O0Qcd9wyWBh6vTOQB04/zpSj1YF5whB0XUA0XliAXNIwqdpqx3U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770229738; 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=7Kt3MaIKigPezWwUjh9ifQEhTMOdqMF6Sn8DTtDUVGU=; b=lSXr7FqWyVAgFibAtYddp1/yFH8u4g14DyE4s8cd3JcEPZoism6R0U1EBY/oMHMvZ27TTLo9NX1b5Nh9jBLMG6CHa+qr6G7T30gJ60sj2WnBV0Yf6KxX5sqEZFW0JKH5cVrb5QwFdBvbbfFT8HVHKPLEwcsKl0doanehGbF+Vg0= 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 1770229738729970.5334705640225; Wed, 4 Feb 2026 10:28:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnhbP-0002c1-RO; Wed, 04 Feb 2026 13:27:47 -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 1vnhbN-0002bM-Oj for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:27:45 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnhbK-00014P-4o for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:27:43 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4806dffc64cso872245e9.1 for ; Wed, 04 Feb 2026 10:27:41 -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-43618057f9esm6884478f8f.28.2026.02.04.10.27.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Feb 2026 10:27:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770229660; x=1770834460; 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=7Kt3MaIKigPezWwUjh9ifQEhTMOdqMF6Sn8DTtDUVGU=; b=r6vuV0Y8XB+euD9bExb+Wo9nwcyLPGVR6OltY7ScCnCmM7CQr7oHjaf6W99sIROOUP ihp3aHd/sWx1JU7WPiMNbWrsxLkMAMOP9jbNVJotFk96y1NtxMc++VDKp0wQqBdANbMV qBXwLI/fHM+vl5IIHfrybrjC1R1LyLVpXtlYQpng3gwFaxfMrZ91h2EyH0LEKE6hhavg yBOY8tOjR/3E5OZVIsKc/O9jaxsnfPzF8pSv6RKjw9Ytx5Z9UNzvEh9LDgZZBj2gq6Iy n2cI53zOeTYhXHv+WY16ktZZOrWiCIPOhYfowrQACLj5cL9vA6oO5BKhZ4IV0/7D9Q3w x28A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770229660; x=1770834460; 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=7Kt3MaIKigPezWwUjh9ifQEhTMOdqMF6Sn8DTtDUVGU=; b=QKFq7BI0BIY7g8XYV3xZ4NqR3o7WKDvGE7XPMbivqubomH9XigPkoS6LCaiIAZ80PK M/KyHziRCHBqb/IXahuFu2I+rt+SpypgundmuA0FThxWcV3iP5nvKTDiW8d92A6k4gFP 76AJCRgTmgvFwXwm855ee7xdpkWCd6Q1dCBWRsHChRoFST+hu+1pN41GSrxEALtMxSvl ZTTxBs+OnqcUoOEvOe8a6Vdumk+g0lFQ/76qkNlxGewld5Txt0x+7wyIr1sNJW9dqCuw utoJ/6xjT/IxfKk+9SYTuXHJhUxJ7tkDo/jan9zEQiauzO+hc1UKVH7MDrumw82KsPNV O87g== X-Gm-Message-State: AOJu0YxK10AiHYPnonFHwywX7pz0GVvUR+fGPNmWjpK22m081u2MQIMN CckF2f3mJ16/yiabVf3mXF9zIeRJf9plim/WyRwhmHgiSFbOW6wwJZuVFOudOLo6/4PrkziBL9y vk4uNzV4= X-Gm-Gg: AZuq6aIkyzMWiZDV6jPeZ6IevA4mJa9beCzB1gjQHKLsD4Xc7zy0xiG+ce8nk3hF9kO 1CXIRd3DIFfHoUlrDFPIs5Ts9NfXyG3YHVkX8rilxpUmJJTRVazcKa6ROKE3NIjzyks/rFMAo9k h5CEM74D+qxFvsWd1tEGACyTR/v7shSbUFTM59/foPVDufG2SZ8d2zSH+MvSLkqlRRojBwehAVI /wEOpwkhdLEhxENksLzoHMWE5pAQg7JLKG7w5bXRNVLxB7X28oXPPEQJ56s1XVf0OnIFdj6Nwv+ vAhhQ9u074dpPS2UvN1atAN9YXJ8Mg3h6TFLD5KTWQTsPzdTiPg0zK+XXqUQF3E4Ie4ENKfcCdH SACm71Dag48CM1uch/6KV/12Zad6LBdn8IcrLG9Jiqb9O19s1KQeB2OTC8OYvwDapsZeq3HhnbE gWJ+1UoO1xyonLjUF2xph5hnO+lYHoVT82F5ruTJ+YgV96391nHJZSurWSmn+U X-Received: by 2002:a05:600c:608e:b0:480:3ad0:93bf with SMTP id 5b1f17b1804b1-4830e96d1e3mr59900965e9.24.1770229659715; Wed, 04 Feb 2026 10:27:39 -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 2/9] target/s390x: Rename get_phys_page_debug() @vaddr argument as @v_addr Date: Wed, 4 Feb 2026 19:27:15 +0100 Message-ID: <20260204182722.44062-3-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: 1770229739826154100 In order to use the %vaddr type in s390_cpu_get_phys_page_debug() in the next commit, rename the argument @vaddr -> @v_addr. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- target/s390x/helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/s390x/helper.c b/target/s390x/helper.c index a6c89ed0af3..d0c36d4a537 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -68,14 +68,14 @@ hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr= vaddr) return raddr; } =20 -hwaddr s390_cpu_get_phys_addr_debug(CPUState *cs, vaddr vaddr) +hwaddr s390_cpu_get_phys_addr_debug(CPUState *cs, vaddr v_addr) { hwaddr phys_addr; target_ulong page; =20 - page =3D vaddr & TARGET_PAGE_MASK; + page =3D v_addr & TARGET_PAGE_MASK; phys_addr =3D cpu_get_phys_page_debug(cs, page); - phys_addr +=3D (vaddr & ~TARGET_PAGE_MASK); + phys_addr +=3D (v_addr & ~TARGET_PAGE_MASK); =20 return phys_addr; } --=20 2.52.0 From nobody Mon Feb 9 07:38:32 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 From nobody Mon Feb 9 07:38:32 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=1770229695; cv=none; d=zohomail.com; s=zohoarc; b=YahPQN0t1d7Z7S0H55E2ZAO7bgsKpxHN/YHQut0H/CtiIYLjmU+0Jh+D5HTVtQfZle40AS3uu4Feq/blT8IKAarDsRHsmAZvEq7DYYdM/LwGe2OwSRiholNVYrRa+DYhhgGGkLyCRWl2spXe+HRLFKD4YSPJOC8BelibhpbuLZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770229695; 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=XvYDn7wiE6YYknVXCDrq+1QLwmQ6PA+WeFUDdqmLXUU=; b=iRv2o2+fVdyGx0u4kWmnY6XZpCT/m32tuzgB2nj01o7gnQe+Z9stIcsu6XcWai0FFwu3DpQKo9YbYMqOCS5KcVyRAZPJvi7vmFshWOxgvUh97y8zu4iYLZAey+BBiZkZt334FC19qzCaqR25vntXeR8zlCfCCe10MluKmqlek3w= 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 1770229694933938.1799487848377; Wed, 4 Feb 2026 10:28:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnhbc-0002sR-IG; Wed, 04 Feb 2026 13:28:00 -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 1vnhba-0002nS-Ig for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:27:58 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnhbX-00015p-M1 for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:27:58 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-4359a316d89so144662f8f.0 for ; Wed, 04 Feb 2026 10:27:55 -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-43617e38fbbsm8665770f8f.13.2026.02.04.10.27.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Feb 2026 10:27:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770229674; x=1770834474; 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=XvYDn7wiE6YYknVXCDrq+1QLwmQ6PA+WeFUDdqmLXUU=; b=kQYSRqm9PTuXJqZCoVFilcCel2N4qJ6v9XUbLavSCsCGlr5bxvjd0DxufKqNcvza2H G2RAYAgDS4Hjx+ZuVezlN/gSW/biOn0OK8ODVRi9cgQjyEZyYUVsVSeSL9lBgzCKlA7Y swTEePDcomYre2q0GNqL0Z725iV12zLRehAHweI0fLjnM9DZ6iu2XmmgnHudwckLyFa3 67qGOPsqAszAs2jb9KRIv2T8HyTua8Z2LLiIap0XVHBfT3covczzi92wmDUhmQb83V2B av/HdWwULfDy3QzJ9wdl6h4qQG3NrpSMFEctggXBxjBbOPJOJwAaA0WKJpSUutZoHWwF lATg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770229674; x=1770834474; 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=XvYDn7wiE6YYknVXCDrq+1QLwmQ6PA+WeFUDdqmLXUU=; b=NUDzn/5bsb+84Fm2OrvQCJ0TMwa8akgh5dJobMVjaFTkIrfgGAngbyRViPl3ghRbSW FCH1HcKPi4ENywaWqnaj/rUVfpxpsioft7L1OWaPxZGQJ6Ffijiz9DB6ig+nJhaogUWj K2RO7wx2MxUYuXVZuUVgSL+Z8eUcdzJtbQT51LvV/BUy0o+WB3NK2dAcOvUXBDmIiXjU 9pTsyuG8nKrg8qsg7UttM6EHn2MJSQ5YxewWlBCZbK+z+efX0VsgM94O1VR8tppDf7YL xI8rkuB1GWlKjy81/3WhnqwBjPaw86dqMIudyMILv+Tr092lthhUuBvrm/Vi0XsiDKET zoZQ== X-Gm-Message-State: AOJu0YzW+13q3eBbd2JV4VNcSoTPD/3vPR+CVuNIo/nx/AOsKUOcNocN Dyz8WKaMKc+fcpAYqDz2vlGcWqv6PFsf7QfEzD6+JoPkbER1klJIuvdy+FMI9+ahY7oLxfi/5nM oP1gt4Es= X-Gm-Gg: AZuq6aLVVedq1CFyKT4H8E128Qsi3JQr7+SMRU7GKMk9H6qp5TJF7CnvXqXQzcLCs5D ODGkiC0/Xmj+FKcvpkQM0Ax3V3+f8Ls94KjhRR/BBnQsUfVwGffRpa29f7sNPIfwYxPP8R9kzPI /m6VaX5ezPZRrn28T2Crl6KUMQ350tPndVJ/+HgA1BOK0qwejCyBk01RhY+c0UMlsnfs7Jt9ENA N4/5mwTqzFHQBndbLz1K5MJ7WNmL4+XPbQEZWcTXotuNfe04q0IZB5KNzzYpOUKhUNuuTGNZfR9 3sd9BJwkmGSbJzXH22VtzCksm/y6QDqFeeqifi46a4TCxcNLMYKb2DxJvEYeQL8ys8nNkntP06t KzIxatxOD/1l5qW2EWTi3ypRFT0LL2T1/qU9cLGFmV6kybjVplq3tebL0vbVO2nkIzkyMUjQMBf NRBPJadgbwHsnI8FEOsQgivU1JYUwZZwkdG2hqELqR5vLVQrVS3mdf723GKgGUZH4aOSHhC94= X-Received: by 2002:a05:6000:2011:b0:435:9950:ee1 with SMTP id ffacd0b85a97d-43617e37d52mr5840899f8f.3.1770229673688; Wed, 04 Feb 2026 10:27:53 -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 4/9] target/s390x: Replace %target_ulong -> %hwaddr where appropriate Date: Wed, 4 Feb 2026 19:27:17 +0100 Message-ID: <20260204182722.44062-5-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::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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: 1770229697310158500 Use the %hwaddr type for physical addresses. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- target/s390x/s390x-internal.h | 9 +++++---- target/s390x/helper.c | 2 +- target/s390x/mmu_helper.c | 16 ++++++++-------- target/s390x/tcg/excp_helper.c | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/target/s390x/s390x-internal.h b/target/s390x/s390x-internal.h index f0f7bb5cb11..790cd688762 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/hwaddr.h" #include "exec/vaddr.h" #include "cpu.h" #include "fpu/softfloat.h" @@ -368,19 +369,19 @@ void ioinst_handle_sal(S390CPU *cpu, uint64_t reg1, u= intptr_t ra); =20 =20 /* mem_helper.c */ -target_ulong mmu_real2abs(CPUS390XState *env, target_ulong raddr); void probe_write_access(CPUS390XState *env, uint64_t addr, uint64_t len, uintptr_t ra); =20 =20 /* mmu_helper.c */ -bool mmu_absolute_addr_valid(target_ulong addr, bool is_write); +hwaddr mmu_real2abs(CPUS390XState *env, hwaddr raddr); +bool mmu_absolute_addr_valid(hwaddr addr, bool is_write); /* Special access mode only valid for mmu_translate() */ #define MMU_S390_LRA -1 int mmu_translate(CPUS390XState *env, vaddr vaddr, int rw, uint64_t asc, - target_ulong *raddr, int *flags, uint64_t *tec); + hwaddr *raddr, int *flags, uint64_t *tec); int mmu_translate_real(CPUS390XState *env, vaddr raddr, int rw, - target_ulong *addr, int *flags, uint64_t *tec); + hwaddr *addr, int *flags, uint64_t *tec); =20 =20 /* misc_helper.c */ diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 5002eebd4c8..667d4a0da75 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -43,7 +43,7 @@ hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr v= addr) { S390CPU *cpu =3D S390_CPU(cs); CPUS390XState *env =3D &cpu->env; - target_ulong raddr; + hwaddr raddr; int prot; uint64_t asc =3D env->psw.mask & PSW_MASK_ASC; uint64_t tec; diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 3313487b41d..a3cbfab79b6 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -86,7 +86,7 @@ static bool lowprot_enabled(const CPUS390XState *env, uin= t64_t asc) * Translate real address to absolute (=3D physical) * address by taking care of the prefix mapping. */ -target_ulong mmu_real2abs(CPUS390XState *env, target_ulong raddr) +hwaddr mmu_real2abs(CPUS390XState *env, hwaddr raddr) { if (raddr < 0x2000) { return raddr + env->psa; /* Map the lowcore. */ @@ -96,7 +96,7 @@ target_ulong mmu_real2abs(CPUS390XState *env, target_ulon= g raddr) return raddr; } =20 -bool mmu_absolute_addr_valid(target_ulong addr, bool is_write) +bool mmu_absolute_addr_valid(hwaddr addr, bool is_write) { return address_space_access_valid(&address_space_memory, addr & TARGET_PAGE_MASK, @@ -123,7 +123,7 @@ static inline bool read_table_entry(CPUS390XState *env,= hwaddr gaddr, } =20 static int mmu_translate_asce(CPUS390XState *env, vaddr vaddr, - uint64_t asc, uint64_t asce, target_ulong *r= addr, + uint64_t asc, uint64_t asce, hwaddr *raddr, int *flags) { const bool edat1 =3D (env->cregs[0] & CR0_EDAT) && @@ -296,7 +296,7 @@ static int mmu_translate_asce(CPUS390XState *env, vaddr= vaddr, return 0; } =20 -static void mmu_handle_skey(target_ulong addr, int rw, int *flags) +static void mmu_handle_skey(hwaddr addr, int rw, int *flags) { static S390SKeysClass *skeyclass; static S390SKeysState *ss; @@ -382,7 +382,7 @@ static void mmu_handle_skey(target_ulong addr, int rw, = int *flags) * @return 0 =3D success, !=3D 0, the exception to raise */ int mmu_translate(CPUS390XState *env, vaddr vaddr, int rw, uint64_t asc, - target_ulong *raddr, int *flags, uint64_t *tec) + hwaddr *raddr, int *flags, uint64_t *tec) { uint64_t asce; int r; @@ -472,7 +472,7 @@ nodat: * the MEMOP interface. */ static int translate_pages(S390CPU *cpu, vaddr addr, int nr_pages, - target_ulong *pages, bool is_write, uint64_t *t= ec) + hwaddr *pages, bool is_write, uint64_t *tec) { uint64_t asc =3D cpu->env.psw.mask & PSW_MASK_ASC; CPUS390XState *env =3D &cpu->env; @@ -523,7 +523,7 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uin= t8_t ar, void *hostbuf, { const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; int currlen, nr_pages, i; - target_ulong *pages; + hwaddr *pages; uint64_t tec; int ret; =20 @@ -585,7 +585,7 @@ void s390_cpu_virt_mem_handle_exc(S390CPU *cpu, uintptr= _t ra) * @return 0 =3D success, !=3D 0, the exception to raise */ int mmu_translate_real(CPUS390XState *env, vaddr raddr, int rw, - target_ulong *addr, int *flags, uint64_t *tec) + hwaddr *addr, int *flags, uint64_t *tec) { const bool lowprot_enabled =3D env->cregs[0] & CR0_LOWPROT; =20 diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c index 292d130d03e..41b0017d767 100644 --- a/target/s390x/tcg/excp_helper.c +++ b/target/s390x/tcg/excp_helper.c @@ -148,7 +148,7 @@ bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int= size, { CPUS390XState *env =3D cpu_env(cs); vaddr vaddr; - target_ulong raddr; + hwaddr raddr; uint64_t asc, tec; int prot, excp; =20 --=20 2.52.0 From nobody Mon Feb 9 07:38:32 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=UH0A2GSHP8RpZSktJc2gND+olSurqvY1/CHzlDg5UHff5uw6Hk5dES7YDzrWjufnBGQU3kQ5bA5AoXp5o4vAOvxI148Uo2sYoD4o7NtI2ZhgP7GCnrVuQdj/titQRrGUFlk6VJ6IpeH4AzaJw+DTNvHSIyqJRtwc3SDDEcadSV0= 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=0VASuul27qhIBrpK7E+LNnKj3UN3CBXvmYhJX8kxlH0=; b=bPZpJhHTWfw28phnwPHjNAvrLwYbKaWUkYTjgFoSOF254G2RG54vAe3dKCcLklWupMgRQdq6FmNlIO3/yBUSp7yeebMson2NAi8BqkWL3ywaa7YAkm49Mz4Yz2uytxiMR6HUuGs6hQ+0rDpX1YcQZIXNNR3B7Zc7O0S9LzKCqsM= 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 1770229704566104.99962315648725; 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 1vnhbh-00033u-QX; Wed, 04 Feb 2026 13:28:05 -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 1vnhbg-000335-EL for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:28:04 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnhbe-00016o-II for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:28:04 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-47ee2715254so578215e9.3 for ; Wed, 04 Feb 2026 10:28:02 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48317d2c856sm2320585e9.4.2026.02.04.10.27.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Feb 2026 10:28:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770229681; x=1770834481; 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=0VASuul27qhIBrpK7E+LNnKj3UN3CBXvmYhJX8kxlH0=; b=Scfgtnbokrx6oc8rwP/ox35utJk7/1nftTGoRc5KR+2V84i6QAnC77DlQHV6/9zGJw otSQd8JVe4KhNAf6kc0OSXSbXRIpPoKE1xvsb3rH1ZQ0hk0E6JsUKphjs5nSEvB4RlFC IltxbrBvKT4E4qxNB999pORPSAVqoWWEUI5hkktAvVp8SXSzr22iTsxct3UxG7SVM+/v ZIAaPObxnLbbRGnIwojnqfGCMwiEEdgM3uc3c1O7p41wHuGIXQb3sxllbfOINlR5YvYm zQSoPJRFU58Mb0En1h691E/QAUyOO0tWL2VrzH7wSQm2VgSEjf8joTQ5PYIHI4TH/AzO 5Z0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770229681; x=1770834481; 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=0VASuul27qhIBrpK7E+LNnKj3UN3CBXvmYhJX8kxlH0=; b=iWbUCj3lnpxqFAL3rnzDvqQZqhN+wC6n1uouEakSVL7qD0LyiVy+ZSlUJX8yHfYpE8 MO/kDsZqHPueV5lXbchBgPpw7pkcU5YaJf+Ew+j2xWeDieH3InzJB3URvDR6KO0hpAm4 Z8SCsZudcw55DAj0roiOr39DNI96A8y7tOrR6OKVGYC0KdgPwYlSaJl6Ta6WoRSo9aQK Pc2W1z87O4wsUAKkNhmULBIQPCDrqyOlQCHQc9BF4VO7KMGD3dTF8tWCPYXZJtrHdmfD dzUSy+RUIKfBmm+LBJQ4eFf+PBcsajgmphM43FPGsYhNEpjbmsFMBdmdDTi7J2kg8YoB 0ZGA== X-Gm-Message-State: AOJu0Yzp7JM9YNWQ/2v8zOiXCf5nP8l+fQ5MHOkmNPlioJJADMbjZdNJ BiOG+Zf68x3jBPw/mWmQg94e774H9n6N4Ighc6KFZRx5ZyU1L3nYiEBysk57HtTINHea0z2Ouf5 chPGpN4I= X-Gm-Gg: AZuq6aLyCQ+VMkV/2rh6QbzloIgkx7zDTLqTTU2R0KRFgZ9esFPhvfY2Pi/HUzTMJdD l569zm+cATvlqfxM1+BtUdtUOb0VrtoYc3kixUNq0HqofLMXh3dOriSmvx1T1Tb4UvcvQb1Aop0 oI28EqoBM2rZIPbwUnswCVMfcigrWTxZPlblzll4KZEdg6kM9YHX5b1Crv8zfG9jbMBMEPFKvIk YFoFYZmL5SWm8+ZSoVwDUP7o0WYTNEau6g3MWIeu9JlGnzHqRNXSX85AVnuo/zLIZSGZAVp8LU6 gDfhYB+S7VhpDJw2o8ecJS6CrZX2HKjPSqE2JcMA/IBhldPPJ8+Oz3LhgobxV0IdQDB0+xsVcaD jzVAJKQ5aVoAU92KkZoqi4i4hh2gN9SBUgB8X0psYxZBiYSHWgfdPbQayxhpKsIF6GphKtXe0Ze 1suhLDMJWC/YnWfpXJSG/vn0aB9SmRddF9GWjLdF6WiMjRB+k0JU3UwgcVDEgb X-Received: by 2002:a05:600c:19cf:b0:477:8985:4036 with SMTP id 5b1f17b1804b1-4830e93e9f6mr57053675e9.1.1770229680605; Wed, 04 Feb 2026 10:28:00 -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 5/9] target/s390x: Un-inline KVM Protected Virtualization stubs Date: Wed, 4 Feb 2026 19:27:18 +0100 Message-ID: <20260204182722.44062-6-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::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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: 1770229705539154100 By removing the target-specific 'CONFIG_KVM' definition this header can be used by files in meson common_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Farman Reviewed-by: Thomas Huth --- target/s390x/kvm/pv.h | 27 ------------ target/s390x/kvm/stubs.c | 94 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 27 deletions(-) diff --git a/target/s390x/kvm/pv.h b/target/s390x/kvm/pv.h index e266fc3d545..ea4b4ec3403 100644 --- a/target/s390x/kvm/pv.h +++ b/target/s390x/kvm/pv.h @@ -20,7 +20,6 @@ struct S390PVResponse { uint16_t rc; }; =20 -#ifdef CONFIG_KVM bool s390_is_pv(void); int s390_pv_query_info(void); int s390_pv_vm_enable(void); @@ -43,31 +42,5 @@ int kvm_s390_dump_init(void); int kvm_s390_dump_cpu(S390CPU *cpu, void *buff); int kvm_s390_dump_mem_state(uint64_t addr, size_t len, void *dest); int kvm_s390_dump_completion_data(void *buff); -#else /* CONFIG_KVM */ -static inline bool s390_is_pv(void) { return false; } -static inline int s390_pv_query_info(void) { return 0; } -static inline int s390_pv_vm_enable(void) { return 0; } -static inline void s390_pv_vm_disable(void) {} -static inline bool s390_pv_vm_try_disable_async(S390CcwMachineState *ms) {= return false; } -static inline int s390_pv_set_sec_parms(uint64_t origin, uint64_t length, - struct S390PVResponse *pv_resp, - Error **errp) { return 0; } -static inline int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tw= eak, - struct S390PVResponse *pv_resp) { return = 0; } -static inline void s390_pv_prep_reset(void) {} -static inline int s390_pv_verify(struct S390PVResponse *pv_resp) { return = 0; } -static inline void s390_pv_unshare(void) {} -static inline void s390_pv_inject_reset_error(CPUState *cs, - struct S390PVResponse pv_res= p) {}; -static inline uint64_t kvm_s390_pv_dmp_get_size_cpu(void) { return 0; } -static inline uint64_t kvm_s390_pv_dmp_get_size_mem_state(void) { return 0= ; } -static inline uint64_t kvm_s390_pv_dmp_get_size_completion_data(void) { re= turn 0; } -static inline bool kvm_s390_pv_info_basic_valid(void) { return false; } -static inline int kvm_s390_dump_init(void) { return 0; } -static inline int kvm_s390_dump_cpu(S390CPU *cpu, void *buff) { return 0; } -static inline int kvm_s390_dump_mem_state(uint64_t addr, size_t len, - void *dest) { return 0; } -static inline int kvm_s390_dump_completion_data(void *buff) { return 0; } -#endif /* CONFIG_KVM */ =20 #endif /* HW_S390_PV_H */ diff --git a/target/s390x/kvm/stubs.c b/target/s390x/kvm/stubs.c index 5fd63b9a7e3..046e1f922b7 100644 --- a/target/s390x/kvm/stubs.c +++ b/target/s390x/kvm/stubs.c @@ -5,8 +5,102 @@ #include "qemu/osdep.h" =20 #include "kvm_s390x.h" +#include "target/s390x/kvm/pv.h" =20 int kvm_s390_get_protected_dump(void) { return false; } + +bool s390_is_pv(void) +{ + return false; +} + +int s390_pv_query_info(void) +{ + return 0; +} + +int s390_pv_vm_enable(void) +{ + return 0; +} + +void s390_pv_vm_disable(void) +{ +} + +bool s390_pv_vm_try_disable_async(S390CcwMachineState *ms) +{ + return false; +} + +int s390_pv_set_sec_parms(uint64_t origin, uint64_t length, + struct S390PVResponse *pv_resp, Error **errp) +{ + return 0; +} + +int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak, + struct S390PVResponse *pv_resp) +{ + return 0; +} + +void s390_pv_prep_reset(void) +{ +} + +int s390_pv_verify(struct S390PVResponse *pv_resp) +{ + return 0; +} + +void s390_pv_unshare(void) +{ +} + +void s390_pv_inject_reset_error(CPUState *cs, struct S390PVResponse pv_res= p) +{ +} + +uint64_t kvm_s390_pv_dmp_get_size_cpu(void) +{ + return 0; +} + +uint64_t kvm_s390_pv_dmp_get_size_mem_state(void) +{ + return 0; +} + +uint64_t kvm_s390_pv_dmp_get_size_completion_data(void) +{ + return 0; +} + +bool kvm_s390_pv_info_basic_valid(void) +{ + return false; +} + +int kvm_s390_dump_init(void) +{ + return 0; +} + +int kvm_s390_dump_cpu(S390CPU *cpu, void *buff) +{ + return 0; +} + +int kvm_s390_dump_mem_state(uint64_t addr, size_t len, void *dest) +{ + return 0; +} + +int kvm_s390_dump_completion_data(void *buff) +{ + return 0; +} --=20 2.52.0 From nobody Mon Feb 9 07:38:32 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=1770229741; cv=none; d=zohomail.com; s=zohoarc; b=cGcxN+CVVEv61HqygLuAKyDNW9/nFuiincjphOeRknSHLde3UZxlGaTqQROD6Kj8Pgcb3hWxvg3mws67I00tK7AENFPyHVWcri9EX1qKCURv5TMjbhUXQTX0K2KslfROp/ksCEfg5bRbigs35Cx/gCA7wMoDK6qh6Zs9S+4zJ+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770229741; 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=xOcVEoIy22xT6BELs0cJqqzemyJ5KqwhxzuTFdiT2QI=; b=ZbPRWjQHFm7SdGTS3HodPo7sgjCRiN1f8/x03pRZLWXnTeVkTryP6fkSRWK7U5ldv5FpyS3fq726iClbP0EeOC/weNwAI5KMuPJ5vPl7ZKxedmYIT8PddmB0mCPY0bX4do5edhQFSk8nV10AOCozW7aP6iiq80MV57PFdDVlHjc= 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 1770229741173354.19403014284364; Wed, 4 Feb 2026 10:29:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnhbq-0003Q4-Ar; Wed, 04 Feb 2026 13:28:14 -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 1vnhbp-0003LH-5r for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:28:13 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnhbn-00017w-KL for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:28:12 -0500 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-432d2c7a8b9so137316f8f.2 for ; Wed, 04 Feb 2026 10:28:11 -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-43617e38fbbsm8667302f8f.13.2026.02.04.10.28.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Feb 2026 10:28:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770229690; x=1770834490; 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=xOcVEoIy22xT6BELs0cJqqzemyJ5KqwhxzuTFdiT2QI=; b=R2rU2gYP8TGxLTCgY880ki8sE4gN5UgKT6oHIwU6E8AjY+ln/vC5vhdU0vTYKGesB0 9u2sJZLOPQNnTPPeGVto6HAP2AW2ULlEDsrYlGs0tWWcm8jFLNGryx8i4+DZ+zwPlO/u lwr11bA7ntH/upJn6c8u09zIQMe2jpCQbb75mFLyn4sWgfej6vu9dcedo/NizvkXCVFL yLW2CPE7n0WLv64Ru/u5fn1xtZGcMijg2RCIGxlac0hAV5mLDWcuvUjZG7aW2vGOASDX jus6h4KQiZ5+Dm2pMq8SJc/m0LIArM16q/rOB1MxghBZ849kBXrCbAKFxtyXKWqvvBrY soDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770229690; x=1770834490; 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=xOcVEoIy22xT6BELs0cJqqzemyJ5KqwhxzuTFdiT2QI=; b=PUiCeTwP/4F+Sa4qalo0PtnMn2ytgkPHOPcfjdGO0kcXJ5bZKSMbGXt41J1ztFS6Zl XtRsnPAuSjP9Hwdved69QAbrFPyMDy1IZB8CM+fH873/Jc3+9hF84p8ezA99oCPCgkZ3 isZiQ6uH6RThm0RL8OH7if37fVDogsb+PGTi0+yShUYhEbIxPDN4Kdm/n6Vx8rBic3A6 XjIDz87kLyyXZSvtH2xsQ19VqkfievZKLF1Ze2tavlvkf05ZnAuFPLdL4qaOjAsbfGUU EXIyXq7Iw2CVww2OImyggBVqos16284s8AizdUbAmfgM2HrrmL3otF6jgis4hzG4eKSA hr+w== X-Gm-Message-State: AOJu0Yz9I32xPqhmExL12hdpJZQvjJrG1a4KoHtMCH5eDXghFLq0ACgO 7VppttvgMUuODuuTWUl1H5sPCTtjGAHRTmCpzZEkD4wKRJc1SYC4tbiOXAa6fT2h8yNmz14gABU 5aREQzqU= X-Gm-Gg: AZuq6aKQPBuDpG8Q9eNMxutZ7GQjeb91FtyUMXhLQ/0JcVADqiC6fabpPIUB/GYg/hS X+PggXWTfAKGnP8kofaDA2zlbnSDo5g817N1X77mRoJX+HbXvriLn3CpUCXZXIzrSt18WXGLAMY 3piqOIPcYE+dX3SqXaRZz77u8JXdXSm7IMzipHy4yWdSB4q5TyjIpfPqXyL5rOLLIjDRDs0OnrC D0Rw7ca0+XjW4ssuPYbJMVkhwGPbI4ThOXJhjvfVvEji/S4LsTj7bPxM7+k+PzFPujq6y+NutOw FxD/qNtweTEwkDMRsv1NmhQ4Cps7RZPmHAyuKuhDYF1PM3sGksfbd/ujKcMZz9j6FmDewixWegm qPmp+2R9K31qp3bXsRQXjfANWqoTrDtPKlY/tOiMWCqSH5zf33/+g+jlu+waoewWpvPFv3UERET J5FeJp7Fie0mtsCHwuEwlb0UrbIs2px0pnRY6TEdAznW/jg1rEUIKOJ/OAdFEP X-Received: by 2002:a05:6000:184d:b0:435:a3c5:a528 with SMTP id ffacd0b85a97d-43618056b5amr6034532f8f.39.1770229687513; Wed, 04 Feb 2026 10:28:07 -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 6/9] target/s390x: Add more unreachable KVM stubs Date: Wed, 4 Feb 2026 19:27:19 +0100 Message-ID: <20260204182722.44062-7-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::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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: 1770229743008158500 Next patch will move s390x system objects from the target specific source set to the common one. Unfortunately the kvm_enabled() macro won't be evaluable at built-time anymore. Add stubs for KVM symbols unreachable at runtime. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Thomas Huth Reviewed-by: Eric Farman --- target/s390x/kvm/stubs.c | 76 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/target/s390x/kvm/stubs.c b/target/s390x/kvm/stubs.c index 046e1f922b7..196127baa51 100644 --- a/target/s390x/kvm/stubs.c +++ b/target/s390x/kvm/stubs.c @@ -4,8 +4,9 @@ =20 #include "qemu/osdep.h" =20 -#include "kvm_s390x.h" +#include "target/s390x/kvm/kvm_s390x.h" #include "target/s390x/kvm/pv.h" +#include "target/s390x/cpu_models.h" =20 int kvm_s390_get_protected_dump(void) { @@ -104,3 +105,76 @@ int kvm_s390_dump_completion_data(void *buff) { return 0; } + +bool kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp) +{ + g_assert_not_reached(); +} + +void kvm_s390_access_exception(S390CPU *cpu, uint16_t code, uint64_t te_co= de) +{ + g_assert_not_reached(); +} + +int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t ar, void *hostbuf, + int len, bool is_write) +{ + g_assert_not_reached(); +} + +int kvm_s390_mem_op_pv(S390CPU *cpu, vaddr addr, void *hostbuf, int len, + bool is_write) +{ + g_assert_not_reached(); +} + +int kvm_s390_set_cpu_state(S390CPU *cpu, uint8_t cpu_state) +{ + g_assert_not_reached(); +} + +void kvm_s390_vcpu_interrupt_pre_save(S390CPU *cpu) +{ + g_assert_not_reached(); +} + +int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu) +{ + g_assert_not_reached(); +} + +int kvm_s390_get_hpage_1m(void) +{ + g_assert_not_reached(); +} + +void kvm_s390_enable_css_support(S390CPU *cpu) +{ + g_assert_not_reached(); +} + +int kvm_s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch, + int vq, bool assign) +{ + g_assert_not_reached(); +} + +void kvm_s390_cmma_reset(void) +{ + g_assert_not_reached(); +} + +void kvm_s390_crypto_reset(void) +{ + g_assert_not_reached(); +} + +void kvm_s390_set_diag318(CPUState *cs, uint64_t diag318_info) +{ + g_assert_not_reached(); +} + +int kvm_s390_topology_set_mtcr(uint64_t attr) +{ + g_assert_not_reached(); +} --=20 2.52.0 From nobody Mon Feb 9 07:38:32 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=1770229732; cv=none; d=zohomail.com; s=zohoarc; b=KlIRC5U53E6tEYMTl0KewiaP7KFtMxJ9qBiutU2mvsnGr/Vc0nk+TRerCw+HuItfIaSr6ndWGZD44Y6bzuxIqPFsaHa7wz3E5csCvlQwyTN50AcUcU7Qs5Xnk5o4Mcnilbqby0qaBgQuDPWDWuyBgwMzwWcufUljaklIq8mew24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770229732; 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=gQAJVYtXe6Sn/UI/A5OH3OSD/hxJES4kcCI9tUH5Imc=; b=PT0Nr2+bP1bXSnXXPcZamYPcRWKAIZ2loHfCSFMgBNWr2wDoadyj5MYU3xnJlOUYbRlTSgUNZiQ/6p5ZfKNDL0qa4j5z2sTIXEzmtZhpnIw7HtkoEXVADU/QwhUFV1YM39L5gcs6tZMvLkiN4AGe5dUHxggroH2Tng4fs1JR544= 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 1770229732285492.1427074485355; Wed, 4 Feb 2026 10:28:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnhbw-0003o7-8Z; Wed, 04 Feb 2026 13:28:20 -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 1vnhbu-0003hY-JQ for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:28:18 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnhbs-00018l-HI for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:28:18 -0500 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-432d2c7dd52so157366f8f.2 for ; Wed, 04 Feb 2026 10:28:16 -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-4361805edcfsm7818170f8f.35.2026.02.04.10.28.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Feb 2026 10:28:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770229695; x=1770834495; 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=gQAJVYtXe6Sn/UI/A5OH3OSD/hxJES4kcCI9tUH5Imc=; b=OQUU4GYt04KiHLwURBxabmqZ9v0sFSpzKk5MjKLix6gCjEV8yOTs8qCKcvA6qIztq+ AEHj8RJ9RFYQvnahDIaRt55ramJsZwxxIz/WkhVrwyyx8oefW96yF6MVWIMOfwIHfPSx AsXv1/4wsIbNfA+eQ4CtQdG2APJyNpLUTLQJp2cCvezog40Zc/Hcn4sCzRG0AW/COlWr +ENba9Se6aDE0bfYwAEt6BdoY+vTbVCRGvgY3zOsPvcAJs9+iWY+jfnU+Z3mxD1O+tTk MhvAz/Xk9cjk1o568e28ASvQMPN9ybtfeuSEvnjzIt6mNsvuUT0ktRbhw0ybesrWSQ5R vlFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770229695; x=1770834495; 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=gQAJVYtXe6Sn/UI/A5OH3OSD/hxJES4kcCI9tUH5Imc=; b=dXQD2gfMgThF0ZuHzqPxgMkuDp7daj0Sm+qLdV1FDzHxY7hqiVZ6vBpEEOGjCBndEb pDkeKscvI2rGDDcjVr1OXDs8t7cGcJTibR+u/FGB9Kr8wODR6ijLB4wocBP4vTrgNCzn ZI15xAo8Nco8KgWYFNWq8rLxqNVSFwsdcLCuxCjx6GlclxbVNZyZVQj9xVTP8gMqB2XH g1qm4bvK95aLo2V3HVUVt94z+zFp8n4lasosIbbIEG3Ad/Fyk88s/Bw1CK38On57ajUh +Bpg8sDJRiJgnPO1w5gbNsfHmHQhe8KknYasCIg6SATiYLyH6Ir2q0huOYTzIDE8g3PO sjmg== X-Gm-Message-State: AOJu0YyZDdoqfkHVsNT/0VJecKva04H4GJdv6+KR2542WIRJHRAgRCU+ u9BPgQyjQ7Q950ht6B1nvlipovG6qEVGRk/iQvTH2EmNlxqudMWoIIWjEa7TJjLRWp9Wne3Bck0 jd8wr9Eg= X-Gm-Gg: AZuq6aJedHwBevICwmtBvNVQ3qV+pJnhpDDSI7ccYsda7iNB6sqoTNvyH6ckJSlT5Cq kOBjMaObTUfgW74npUJUQeChYQc2LLlVxdwxu2NGvSzDEqcJAwX3qtpDxgW8ZDYUEcS9UvDl1RI +bDCjUqmhdaHB7tqXRIJQGHcYajyxZEYi4qFh559kKogfPx1wDXInamJ/81Cpmikejn5H8KJ93G YIUI9IYmWK5HPkrQesFbj/HW2l551VXOEe9kjCvZMVSQV6VeTRdXSFUifzEbe/46ry/o/zFYKHN DP3ytH2BDuj9h5haTXUX4xWeargFdwpKCBslAwVlKUOggucl5tnPs8R6PuCcPXlVMmq+JWSyP3X BMGJ/0gJy/BgiwLzjFRDHy5Y7tVfoWRT2EtPewhwUlMA2OEMXBxIajkiDQuR5xihRiChscL6iTp G4L1NuHSuQrMVCi2G5dZGT/NbBkCP22/lVkF1AHQWoGhNUKnudOgTkwDxVAAtU X-Received: by 2002:a05:6000:2c04:b0:432:dfea:1fa8 with SMTP id ffacd0b85a97d-436180581cfmr5643755f8f.45.1770229694481; Wed, 04 Feb 2026 10:28:14 -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 7/9] target/s390x: Build system units in common source set Date: Wed, 4 Feb 2026 19:27:20 +0100 Message-ID: <20260204182722.44062-8-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::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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: 1770229733681154100 Except the ioinst.c file which uses the TARGET_PAGE_SIZE definition in the ioinst_handle_chsc() method, all other files in meson's s390x_system_ss[] source set don't use any target-specific code. Moving them in the other s390x_common_system_ss[] set to build as common objects ensures these files won't use any target-specific API such target_ulong / TARGET_PAGE_SIZE, thus forcing to use the appropriate types instead (such vaddr, hwaddr, uint64_t, ...). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- target/s390x/meson.build | 7 ++++++- target/s390x/tcg/meson.build | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/target/s390x/meson.build b/target/s390x/meson.build index 3b34ae034cb..0fb45103afe 100644 --- a/target/s390x/meson.build +++ b/target/s390x/meson.build @@ -20,10 +20,14 @@ s390x_ss.add(gen_features_h) =20 s390x_system_ss =3D ss.source_set() s390x_system_ss.add(files( + 'ioinst.c', +)) + +s390x_common_system_ss =3D ss.source_set() +s390x_common_system_ss.add(files( 'helper.c', 'arch_dump.c', 'diag.c', - 'ioinst.c', 'machine.c', 'mmu_helper.c', 'sigp.c', @@ -41,4 +45,5 @@ subdir('kvm') =20 target_arch +=3D {'s390x': s390x_ss} target_system_arch +=3D {'s390x': s390x_system_ss} +target_common_system_arch +=3D {'s390x': s390x_common_system_ss} target_user_arch +=3D {'s390x': s390x_user_ss} diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build index 515cb8b473d..17c9374d09e 100644 --- a/target/s390x/tcg/meson.build +++ b/target/s390x/tcg/meson.build @@ -12,6 +12,6 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( 'vec_int_helper.c', 'vec_string_helper.c', )) -s390x_system_ss.add(when: 'CONFIG_TCG', if_true: files( +s390x_common_system_ss.add(when: 'CONFIG_TCG', if_true: files( 'debug.c', )) --=20 2.52.0 From nobody Mon Feb 9 07:38:32 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=1770229745; cv=none; d=zohomail.com; s=zohoarc; b=Swp4VUWld9//wel5FJzSS76gVw8bwosOyCmJ3rkDb1XLhvXRkDejtsT6b9uzVVM3HsGRsBWfv7AjaFADhxqkqUnkXsrLx9E5DtEdQDMf2a6+nmaFN4JmOYbM8szrPZJj5Z9w6Bs01ry9k48OVSJklg/iWgY8asmePKHExvL+rB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770229745; 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=1qdXoLhrWNktizoOz+xJF/JbA7BLhwaH5pSsoPSydNY=; b=SDPtfgJFWZsleMyFBLYskZ48xH1CYTTL+ibC+LaYgiPZl1u3Xqp8y1bU8kLrgGDRQAPTu3qcbHoUCHuL70TY192Xk006eKEuwf1qRLsaDN9Kfm16HmiewYAJKHF+16eJAmfndimmiNnXgtQHGwRymmhIA83KYnWpYupN85B4rH8= 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 1770229745587205.67400960105874; Wed, 4 Feb 2026 10:29:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnhc7-0004Nw-El; Wed, 04 Feb 2026 13:28:31 -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 1vnhc1-000476-4y for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:28:25 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnhbz-00019y-FR for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:28:24 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-482f454be5bso10601995e9.0 for ; Wed, 04 Feb 2026 10:28:23 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48317d4d030sm3049545e9.13.2026.02.04.10.28.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Feb 2026 10:28:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770229701; x=1770834501; 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=1qdXoLhrWNktizoOz+xJF/JbA7BLhwaH5pSsoPSydNY=; b=WFpX8Xzqyp8kw6q1zLnmNwBVVmEZowyp/9Tt9fUYeIhwAqoPsGk+Bn58S4qhWBPLXZ 2pid27w5kFpZl90dlWEKgM3FuuqVQTSXGR41KpNqfvEr0XB7CwVVlmsRdID/kErOLTPo NXrKLUR5Fb4PZfRj8S4JciOXfxqEAq8CE3S2pbVdol/NMrC1Br87YJ0q0gHI5lWUZ7QY Qq0P8wMH+3MlLtJF/cJgJYxgTUNAc2thJUgCDUDzUYV+ePDOivzZKTolBAaanVDs6peM 0BDwFDwukSWrRfulvDhWpizhxHwiKY9j1l0ELZ9vWXy7f1gsUZZ9frQsM9bZrJ+31Ao+ 9XdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770229701; x=1770834501; 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=1qdXoLhrWNktizoOz+xJF/JbA7BLhwaH5pSsoPSydNY=; b=E6aS658lu2evXsqwzTD0SL8FZnGvLcQms1f04ib0kGs0LR3go3LatsMWZGSUr5sICo sDU6QrB/uKxXCUe7AGxer9Txztnnn33JcxDXianWi0/E1IpYg371tANLQg89LYu7sfs6 ULhk3QBl9IiN/dDFIMEoddeH/aH7B1zT24+TYcIrR6F3oQmvZAEv4LahIVaO6fDS74qj ObUoM6hAlD/EYE0U7C7+xDO8lJtYfqK3LIGovBSSvUiovqjladHYuEZ05e8oXDs1/Sr9 0Cn8ui2MLYdns9ZOCJdj16OjFC5kmzplJGe0w/v82U6tdrvj7NBY/j+s7twc53LjR/0J uL9A== X-Gm-Message-State: AOJu0YzlalrnSutSWbiHvJ6KpmVXt8OfD6h0417OToCw7MK9Oj2IvPA1 yKt8lNBeE5Bax0uq8yP/RseIC6PVkRNIwddi3mxuQB7MAdCve/1lcequHOqPzsl9uP0sm6tzXEv j8JcE1L8= X-Gm-Gg: AZuq6aLDPYJAcz9Rj/3/vOqyI0pkoI3MFRqeXJsYddR6q6f8KYUJAxOGZWblbrZPnCq pts+7KPTCoMwDvWQVnYCQBkStCfUBhv/IsbWtfmx2jF9oN9C/CNGFe6ailIY3qNV0wdqMFkbN5y qksL0V9HFvjbhDjPpL+0cHkonYwv8bxXW/5ORMBcWPXfL4VUC2MxpwwtIFf/P5FKCO9ex6Z++Va ZCp886etCa2KqnCzEf8N/DBUfJS52zHsWPB6E43nYGIWuEaFyg1UJie8lZXWzk5mJVowa4nvJFI BZU0EuLnLHaJoss9ryf5xt+BGaYIqBNHaPIxATPdAArVd/m4/BLca4RMoYFKyjYTroyWdGkwqRR to9xEkmWjY+rXfyZAOBqFktj2BdSIGY/Kx56zoN7ftBHuOfo34tK+h95mIoa8FBEEzb2ZaN6+AH 7Oa0NOzer1db2Gf3GQ+XymrJMrqVyuoau8VlvLhmJB+Ya2r1jIExbpfVoAJ8ic X-Received: by 2002:a05:600c:5619:b0:477:a71c:d200 with SMTP id 5b1f17b1804b1-4831791784bmr2497235e9.11.1770229701593; Wed, 04 Feb 2026 10:28:21 -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 8/9] target/s390x: Expand TCGv type as 64-bit target Date: Wed, 4 Feb 2026 19:27:21 +0100 Message-ID: <20260204182722.44062-9-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::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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: 1770229747974154100 The s390x target is a 64-bit one, so TCGv expands to TCGv_i64. Use the latter which is already used about a hundred times in this file, and is also more explicit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- target/s390x/tcg/translate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 540c5a569c0..437f5a4aeb7 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -3142,7 +3142,7 @@ static DisasJumpType op_mov2(DisasContext *s, DisasOp= s *o) static DisasJumpType op_mov2e(DisasContext *s, DisasOps *o) { int b2 =3D get_field(s, b2); - TCGv ar1 =3D tcg_temp_new_i64(); + TCGv_i64 ar1 =3D tcg_temp_new_i64(); int r1 =3D get_field(s, r1); =20 o->out =3D o->in2; @@ -5743,9 +5743,9 @@ static void in2_a2(DisasContext *s, DisasOps *o) } #define SPEC_in2_a2 0 =20 -static TCGv gen_ri2(DisasContext *s) +static TCGv_i64 gen_ri2(DisasContext *s) { - TCGv ri2 =3D NULL; + TCGv_i64 ri2 =3D NULL; bool is_imm; int imm; =20 --=20 2.52.0 From nobody Mon Feb 9 07:38:32 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=1770229727; cv=none; d=zohomail.com; s=zohoarc; b=ULbCMVQDIvAxpZGCYS7MvQiG5XEebjiSZ5LZZTDn9WgIBPdDOK4rrIeHzeRMUybXrwyGKX1WWUmoTnrBHbDCdBrPtk2ligrlWR1SGJYogbf3W6bt3wxwsh/94hJhDEE0MXfpK3oDKfxfDXyOaYwrPQeR041/GMgumx4aCWChFKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770229727; 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=aqLml2nu/7VBJP0h6Mc9LYlhdezvxWpHGFDA8dt6ujc=; b=gt8GR1kv7A0/KdnwRoFf4w9cPVrJNXxADQPmt2DL26ob+RHS409yQUBv+pwnz2+3AFeXTfI2U/FutbqCMayMoPUJlahH/ehxA6XXoXUKW3kwQFwphdhZEqycttS6avPfWxzhEY7eOhK7sPjFJjqLgbCUG+4NhiD0D2lPWTnhS2I= 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 1770229727125391.78149243227404; Wed, 4 Feb 2026 10:28:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnhcB-0004hG-Di; Wed, 04 Feb 2026 13:28:35 -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 1vnhc9-0004XB-9V for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:28:33 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnhc6-0001B0-HD for qemu-devel@nongnu.org; Wed, 04 Feb 2026 13:28:32 -0500 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-47ff94b46afso1564265e9.1 for ; Wed, 04 Feb 2026 10:28:29 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48317d355a9sm2018755e9.6.2026.02.04.10.28.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 04 Feb 2026 10:28:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770229709; x=1770834509; 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=aqLml2nu/7VBJP0h6Mc9LYlhdezvxWpHGFDA8dt6ujc=; b=UW113SPEziHGfOLnF1GTHiSKRjqnDwEaR8BWudOKi9J8uxHPfePsyPIYFoPlNWWYan FecwjG4ONbin9/6JX5YNBm95snGz4W+BvZ8bDaw0q1cGGJEzNpY1wkuAuV1nF3S9MMnF A+PSz8cDhGSWCW5rax+w/F0bexFIhfp+dBOYRrbFxTiFM+EsyeAPNYfd2+wD/mntjJLc SLjMVmUmqwYy8OPsQ7BdoJLHBS0bJB3jtO0mppNlcgA4pVswdJYkAfAQmLIf4JHUFgFT LDepyP6me/n3W65fz96Oi/JOPIb/G/30wpENlGRV/sPwStnX8YkQVVxV5RpePMsv2NDd 0fdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770229709; x=1770834509; 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=aqLml2nu/7VBJP0h6Mc9LYlhdezvxWpHGFDA8dt6ujc=; b=w2OCgCzz407ZQrJAiLg2ycMZRUDer6ViwUqTKCjGPElIYWrNHSzsorOOizJ0LVuxno D6Z1O3SXUDKxYz7ijqhE6G3t9L+ZZEZgZ5KA8sHEIR6r6dc0TZVkrPt68EPCB/1tQZiG e7HEp6WruDk7e/oHg8r48YtVFreuzxYhp7OeXSaiY0iUk5mtskEtSGskTVg1VQmXsyAj InOObj0iSEV+eBYVk349duduLSlmNxGUUszTvv+kHdyJVbZio4O+zdrQNn4nOChcW5/Y ONdYWmNpHk8nkiz8ZEkfd11YDslfN2jwW5mmDVenIXUAiqrxhJk5L0a6nXlHwFPUayc9 XjiA== X-Gm-Message-State: AOJu0Yyhp+0NrT1b1xLqtJDePNkfpIYauTFeVj6BiFTjgxpTyyh35eT5 WFt/gu6jtDxxh5fFmgQrl3oncTjgjHxqehPLcRF5QqL6T94CrwJLD57gU72pXZmYXp29bizm2V7 D29PM98Q= X-Gm-Gg: AZuq6aJcam9pchAMqF5KuoaDut/X6kA73x7jV+4Gpa+OEhePeIJ7dSuVM/w96BcKv12 icKtPiRMZlk5Ds90yE7yd49lrma/B/XtI3QIKpS0/6g3vHUBSI7T1BQeYYrMiKmRXMszDi0+Q6b HVGgOG3DWKHbf5Hyc8LsWs/M1IHFZ287gBXZnxszE88fsirGMuH2XvSByVWtnLskzUYBCX3Ajfq Wm3c5jwx7v9er+MHCzNMXp68u8g8K19sC/HH/pysI10QMY4MZv90kibtPj/m850UHvhr6Q+M0kQ I1k9AL67F3v+tUmWJQSX/c+FR8rk/U3Zz1sVCKHHpuOqqoY2VgZcxgupzPcTQZGCZDpMId9ENZl yZkHYmpkje+UGRy2mP8F5Pfomt1Bez8gtOxGVZDGYhsdt+nlAEVhxEWcCbHCPXe24eeSdi9NFwI dzpwXW/HT0755SyZ1v6DthaMbztNQSyWU8fbTyxNciaFD8hS0VYOuBvqsUOE/uWIdmZyXtwTI= X-Received: by 2002:a05:600c:5884:b0:47e:e97e:11aa with SMTP id 5b1f17b1804b1-483178e11bcmr2891685e9.4.1770229708476; Wed, 04 Feb 2026 10:28:28 -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 9/9] target/s390x: Expand TCGv type as 64-bit target Date: Wed, 4 Feb 2026 19:27:22 +0100 Message-ID: <20260204182722.44062-10-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::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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=ham 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: 1770229729164158500 The s390x target is a 64-bit one, so we have these expansions in the "tcg/tcg-op.h" header: . tcg_gen_qemu_ld_tl() -> tcg_gen_qemu_ld_i64() . tcg_gen_qemu_st_tl() -> tcg_gen_qemu_st_i64() Use the expanded form which is more explicit when a target isn't built for different words size. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- target/s390x/tcg/translate.c | 54 ++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 437f5a4aeb7..4dabd49840f 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -1259,7 +1259,7 @@ static DisasJumpType op_asi(DisasContext *s, DisasOps= *o) =20 o->in1 =3D tcg_temp_new_i64(); if (non_atomic) { - tcg_gen_qemu_ld_tl(o->in1, o->addr1, get_mem_index(s), s->insn->da= ta); + tcg_gen_qemu_ld_i64(o->in1, o->addr1, get_mem_index(s), s->insn->d= ata); } else { /* Perform the atomic addition in memory. */ tcg_gen_atomic_fetch_add_i64(o->in1, o->addr1, o->in2, get_mem_ind= ex(s), @@ -1270,7 +1270,7 @@ static DisasJumpType op_asi(DisasContext *s, DisasOps= *o) tcg_gen_add_i64(o->out, o->in1, o->in2); =20 if (non_atomic) { - tcg_gen_qemu_st_tl(o->out, o->addr1, get_mem_index(s), s->insn->da= ta); + tcg_gen_qemu_st_i64(o->out, o->addr1, get_mem_index(s), s->insn->d= ata); } return DISAS_NEXT; } @@ -1281,7 +1281,7 @@ static DisasJumpType op_asiu64(DisasContext *s, Disas= Ops *o) =20 o->in1 =3D tcg_temp_new_i64(); if (non_atomic) { - tcg_gen_qemu_ld_tl(o->in1, o->addr1, get_mem_index(s), s->insn->da= ta); + tcg_gen_qemu_ld_i64(o->in1, o->addr1, get_mem_index(s), s->insn->d= ata); } else { /* Perform the atomic addition in memory. */ tcg_gen_atomic_fetch_add_i64(o->in1, o->addr1, o->in2, get_mem_ind= ex(s), @@ -1293,7 +1293,7 @@ static DisasJumpType op_asiu64(DisasContext *s, Disas= Ops *o) tcg_gen_add2_i64(o->out, cc_src, o->in1, cc_src, o->in2, cc_src); =20 if (non_atomic) { - tcg_gen_qemu_st_tl(o->out, o->addr1, get_mem_index(s), s->insn->da= ta); + tcg_gen_qemu_st_i64(o->out, o->addr1, get_mem_index(s), s->insn->d= ata); } return DISAS_NEXT; } @@ -1374,7 +1374,7 @@ static DisasJumpType op_ni(DisasContext *s, DisasOps = *o) o->in1 =3D tcg_temp_new_i64(); =20 if (!s390_has_feat(S390_FEAT_INTERLOCKED_ACCESS_2)) { - tcg_gen_qemu_ld_tl(o->in1, o->addr1, get_mem_index(s), s->insn->da= ta); + tcg_gen_qemu_ld_i64(o->in1, o->addr1, get_mem_index(s), s->insn->d= ata); } else { /* Perform the atomic operation in memory. */ tcg_gen_atomic_fetch_and_i64(o->in1, o->addr1, o->in2, get_mem_ind= ex(s), @@ -1385,7 +1385,7 @@ static DisasJumpType op_ni(DisasContext *s, DisasOps = *o) tcg_gen_and_i64(o->out, o->in1, o->in2); =20 if (!s390_has_feat(S390_FEAT_INTERLOCKED_ACCESS_2)) { - tcg_gen_qemu_st_tl(o->out, o->addr1, get_mem_index(s), s->insn->da= ta); + tcg_gen_qemu_st_i64(o->out, o->addr1, get_mem_index(s), s->insn->d= ata); } return DISAS_NEXT; } @@ -1917,8 +1917,8 @@ static DisasJumpType op_clc(DisasContext *s, DisasOps= *o) mop =3D ctz32(l + 1) | MO_BE; /* Do not update cc_src yet: loading cc_dst may cause an exception= . */ src =3D tcg_temp_new_i64(); - tcg_gen_qemu_ld_tl(src, o->addr1, get_mem_index(s), mop); - tcg_gen_qemu_ld_tl(cc_dst, o->in2, get_mem_index(s), mop); + tcg_gen_qemu_ld_i64(src, o->addr1, get_mem_index(s), mop); + tcg_gen_qemu_ld_i64(cc_dst, o->in2, get_mem_index(s), mop); gen_op_update2_cc_i64(s, CC_OP_LTUGTU_64, src, cc_dst); return DISAS_NEXT; default: @@ -2747,15 +2747,15 @@ static DisasJumpType op_ld16u(DisasContext *s, Disa= sOps *o) =20 static DisasJumpType op_ld32s(DisasContext *s, DisasOps *o) { - tcg_gen_qemu_ld_tl(o->out, o->in2, get_mem_index(s), - MO_BESL | s->insn->data); + tcg_gen_qemu_ld_i64(o->out, o->in2, get_mem_index(s), + MO_BESL | s->insn->data); return DISAS_NEXT; } =20 static DisasJumpType op_ld32u(DisasContext *s, DisasOps *o) { - tcg_gen_qemu_ld_tl(o->out, o->in2, get_mem_index(s), - MO_BEUL | s->insn->data); + tcg_gen_qemu_ld_i64(o->out, o->in2, get_mem_index(s), + MO_BEUL | s->insn->data); return DISAS_NEXT; } =20 @@ -3087,7 +3087,7 @@ static DisasJumpType op_lpq(DisasContext *s, DisasOps= *o) #ifndef CONFIG_USER_ONLY static DisasJumpType op_lura(DisasContext *s, DisasOps *o) { - tcg_gen_qemu_ld_tl(o->out, o->in2, MMU_REAL_IDX, s->insn->data); + tcg_gen_qemu_ld_i64(o->out, o->in2, MMU_REAL_IDX, s->insn->data); return DISAS_NEXT; } #endif @@ -3506,7 +3506,7 @@ static DisasJumpType op_oi(DisasContext *s, DisasOps = *o) o->in1 =3D tcg_temp_new_i64(); =20 if (!s390_has_feat(S390_FEAT_INTERLOCKED_ACCESS_2)) { - tcg_gen_qemu_ld_tl(o->in1, o->addr1, get_mem_index(s), s->insn->da= ta); + tcg_gen_qemu_ld_i64(o->in1, o->addr1, get_mem_index(s), s->insn->d= ata); } else { /* Perform the atomic operation in memory. */ tcg_gen_atomic_fetch_or_i64(o->in1, o->addr1, o->in2, get_mem_inde= x(s), @@ -3517,7 +3517,7 @@ static DisasJumpType op_oi(DisasContext *s, DisasOps = *o) tcg_gen_or_i64(o->out, o->in1, o->in2); =20 if (!s390_has_feat(S390_FEAT_INTERLOCKED_ACCESS_2)) { - tcg_gen_qemu_st_tl(o->out, o->addr1, get_mem_index(s), s->insn->da= ta); + tcg_gen_qemu_st_i64(o->out, o->addr1, get_mem_index(s), s->insn->d= ata); } return DISAS_NEXT; } @@ -4334,7 +4334,7 @@ static DisasJumpType op_stnosm(DisasContext *s, Disas= Ops *o) =20 static DisasJumpType op_stura(DisasContext *s, DisasOps *o) { - tcg_gen_qemu_st_tl(o->in1, o->in2, MMU_REAL_IDX, s->insn->data); + tcg_gen_qemu_st_i64(o->in1, o->in2, MMU_REAL_IDX, s->insn->data); =20 if (s->base.tb->flags & FLAG_MASK_PER_STORE_REAL) { update_cc_op(s); @@ -4367,8 +4367,8 @@ static DisasJumpType op_st16(DisasContext *s, DisasOp= s *o) =20 static DisasJumpType op_st32(DisasContext *s, DisasOps *o) { - tcg_gen_qemu_st_tl(o->in1, o->in2, get_mem_index(s), - MO_BEUL | s->insn->data); + tcg_gen_qemu_st_i64(o->in1, o->in2, get_mem_index(s), + MO_BEUL | s->insn->data); return DISAS_NEXT; } =20 @@ -4836,7 +4836,7 @@ static DisasJumpType op_xi(DisasContext *s, DisasOps = *o) o->in1 =3D tcg_temp_new_i64(); =20 if (!s390_has_feat(S390_FEAT_INTERLOCKED_ACCESS_2)) { - tcg_gen_qemu_ld_tl(o->in1, o->addr1, get_mem_index(s), s->insn->da= ta); + tcg_gen_qemu_ld_i64(o->in1, o->addr1, get_mem_index(s), s->insn->d= ata); } else { /* Perform the atomic operation in memory. */ tcg_gen_atomic_fetch_xor_i64(o->in1, o->addr1, o->in2, get_mem_ind= ex(s), @@ -4847,7 +4847,7 @@ static DisasJumpType op_xi(DisasContext *s, DisasOps = *o) tcg_gen_xor_i64(o->out, o->in1, o->in2); =20 if (!s390_has_feat(S390_FEAT_INTERLOCKED_ACCESS_2)) { - tcg_gen_qemu_st_tl(o->out, o->addr1, get_mem_index(s), s->insn->da= ta); + tcg_gen_qemu_st_i64(o->out, o->addr1, get_mem_index(s), s->insn->d= ata); } return DISAS_NEXT; } @@ -5291,7 +5291,7 @@ static void wout_m1_16(DisasContext *s, DisasOps *o) #ifndef CONFIG_USER_ONLY static void wout_m1_16a(DisasContext *s, DisasOps *o) { - tcg_gen_qemu_st_tl(o->out, o->addr1, get_mem_index(s), MO_BEUW | MO_AL= IGN); + tcg_gen_qemu_st_i64(o->out, o->addr1, get_mem_index(s), MO_BEUW | MO_A= LIGN); } #define SPEC_wout_m1_16a 0 #endif @@ -5305,7 +5305,7 @@ static void wout_m1_32(DisasContext *s, DisasOps *o) #ifndef CONFIG_USER_ONLY static void wout_m1_32a(DisasContext *s, DisasOps *o) { - tcg_gen_qemu_st_tl(o->out, o->addr1, get_mem_index(s), MO_BEUL | MO_AL= IGN); + tcg_gen_qemu_st_i64(o->out, o->addr1, get_mem_index(s), MO_BEUL | MO_A= LIGN); } #define SPEC_wout_m1_32a 0 #endif @@ -5816,7 +5816,7 @@ static void in2_m2_32u(DisasContext *s, DisasOps *o) static void in2_m2_32ua(DisasContext *s, DisasOps *o) { in2_a2(s, o); - tcg_gen_qemu_ld_tl(o->in2, o->in2, get_mem_index(s), MO_BEUL | MO_ALIG= N); + tcg_gen_qemu_ld_i64(o->in2, o->in2, get_mem_index(s), MO_BEUL | MO_ALI= GN); } #define SPEC_in2_m2_32ua 0 #endif @@ -5862,16 +5862,16 @@ static void in2_mri2_16u(DisasContext *s, DisasOps = *o) static void in2_mri2_32s(DisasContext *s, DisasOps *o) { o->in2 =3D tcg_temp_new_i64(); - tcg_gen_qemu_ld_tl(o->in2, gen_ri2(s), get_mem_index(s), - MO_BESL | MO_ALIGN); + tcg_gen_qemu_ld_i64(o->in2, gen_ri2(s), get_mem_index(s), + MO_BESL | MO_ALIGN); } #define SPEC_in2_mri2_32s 0 =20 static void in2_mri2_32u(DisasContext *s, DisasOps *o) { o->in2 =3D tcg_temp_new_i64(); - tcg_gen_qemu_ld_tl(o->in2, gen_ri2(s), get_mem_index(s), - MO_BEUL | MO_ALIGN); + tcg_gen_qemu_ld_i64(o->in2, gen_ri2(s), get_mem_index(s), + MO_BEUL | MO_ALIGN); } #define SPEC_in2_mri2_32u 0 =20 --=20 2.52.0