From nobody Sat May 30 07:57:52 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=1778075756; cv=none; d=zohomail.com; s=zohoarc; b=IalhRPCDIu5yinn4jCce0t8qtVhwrybo1RSLj7gdIQt3YqyPGGgimonF0qiRkYVpCvF+r/GhImoOja3wyam6xa+iA2yGV31xl1bf9wB8BilCXFJ109SpPRts43/WC9JSJ1c9VB1oK5lBasGJiKCOGxZItmTD90Pej3qijKx0sa0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075756; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=VV1DtQ9tokUI/5dtEziTcj6XmKzBUi8fnJJrgQWncs8=; b=cPP5kiS/LilfV+B/aLHuQHpr07fHyU8tCwzKvPaO31b06Vi/pRE3eY98NpJepiq4eUqUReGPzmcbHOrebUoevGWXoehH9YAAb1m5FA2An+x3cu9CtbTbEsCLq4ZMTbR1FSl+FXtShjHUFDfNt4cEu3XrQk7C/Urtv2o+vd5bRNE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075756681429.9060899468383; Wed, 6 May 2026 06:55:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcjA-0000ii-0B; Wed, 06 May 2026 09:55:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcix-0000ht-Ug for qemu-devel@nongnu.org; Wed, 06 May 2026 09:55:40 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKciv-0007mT-UY for qemu-devel@nongnu.org; Wed, 06 May 2026 09:55:39 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-48e56c1bf5dso3192295e9.3 for ; Wed, 06 May 2026 06:55:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4511d8cd160sm8080760f8f.8.2026.05.06.06.55.33 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:55:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075735; x=1778680535; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VV1DtQ9tokUI/5dtEziTcj6XmKzBUi8fnJJrgQWncs8=; b=zPt+aqO4wX7ctga/SLKsxUWo3Md0ID09o0YyuAoPHTWzt+Fnp1wRz5Mqq0UhZwPIri OTpV4tEOPtgx4JRNK8e6HqDAJ5Ttqh/u+a7uL70AgCOqEgJ7kzQO6qso9mUxbdgNqwiF wC7zNfj4D9kLhTuUc7obJRnyihSFaqUQ+QHhF038kfBxWJXjtCf9bRkZ16Enc4LXvFke sa3oObBlErBOKR4MRBA/bAb/n2qWiuvbOJ9mxR1np/SdmMHaJEsuvqbmh2TIisiU7BLc MGH1NvqRRF2RJ/U4ysM+Hq2LF7kKR85A+neVOeiikR+TkLqzxNfM8eYZyoUaWkyHZ2bG k0+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075735; x=1778680535; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=VV1DtQ9tokUI/5dtEziTcj6XmKzBUi8fnJJrgQWncs8=; b=pz6nqNOdg6WWPL0wiLK1VrG4emKG1uR+624an9suvokWNPRML8UEOCr9gFlpD/lOe8 y4m9CedQYXVdPFlnhQxctuO/evBfX9sVCzOYBN/74/jIhx3DZttDNRAT3IJr+Hq1nlly G071cEgJ27pDxOXXb9ltfGh1I6d9tSVyPspAl7aY65JBkneK9pGERJ2eRkmsrLTkPn3L mPBsLhGpd//UeqsZbqoWSYoo2p5uxgfvVjne7FTnawD0+UEMbBnPNPE4xQzCb4wOP9Cl UMfR7sxlu1J8wBFh++O12wNpENf5Lizm3FHdZPSx0c4c0oPnrgqadHhOP/7v+lVv9L7+ xT/g== X-Gm-Message-State: AOJu0YxiFrz4U1ZjN46eO/qNkpJaZe1JBOMl1qGaYdPezYvNn/R3mSsY /ve8vtbDGl0dt2JVXfQT5bJdiIimxAQvlg6jzGkwCyDhQSZIwO/y9vU47ydQr8KWe/FnVokUoxs Dmgepyj4= X-Gm-Gg: AeBDieuQcJCp5Bd0p3OK5UjFwMVCJ6CFvnoBIVB+YjrlzT1/ens5mpSwsFgxAyeypRD QMPxxchBmkZouSsqyC+dpZoddkIiguMO8xklt29WOsNNUPZRpW/7h5jYq7rxtNR7hlP78g6nN8m yDNd7ji82hn5wEIo4JrI0JR/29ueHeXoOy3BVQwXrQs6YoMGtmpz42+6i/Rabr2e2NBrzRGchCb Hl49NjioG+kwCbIhwlhbrjGdRzy4GduinQtMz/878hXDUbkuK87JFnn0BPtB4hQd2aTCMMTHRQC mu6tR/1Uv0kO/TknmPNlZVIGfjwaOju58z1i+FOVmBp9bUG6TZLacWRtsVMDWtp2Dh+a3sRmQMs o2jQYO28ZqJm50FOjxJUGo1jMvkeYDx53roor/sJ25H/I7xpPYP9RX/y+piaP7+ed484r8+YuNd DjrrGyUFPai4vmasl0C04i5qcKqAbF4mYr1eciGfja+9I2byVgkSAx9Vy7jRvoog7N8Emb+U/Wq m0LrMmNzFo= X-Received: by 2002:a05:600d:6:b0:48a:8905:a500 with SMTP id 5b1f17b1804b1-48e51f1d04bmr45423735e9.12.1778075735298; Wed, 06 May 2026 06:55:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 001/110] monitor/hmp: : Include missing 'exec/target_long.h' header Date: Wed, 6 May 2026 15:53:33 +0200 Message-ID: <20260506135524.20617-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1778075758323154100 The "exec/target_long.h" header is indirectly included, pulled via "cpu.h" -> "exec/cpu-defs.h". Include it explicitly otherwise we'd get when removing the latter: monitor/hmp-target.h:35:5: error: type name requires a specifier or quali= fier 35 | target_long (*get_value)(Monitor *mon, const struct MonitorDe= f *md, | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Message-Id: <20260427080738.77138-2-philmd@linaro.org> --- include/monitor/hmp-target.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index 5167d17d41d..898473b3ed0 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -28,7 +28,7 @@ typedef struct MonitorDef MonitorDef; =20 #ifdef COMPILING_PER_TARGET -#include "cpu.h" +#include "exec/target_long.h" struct MonitorDef { const char *name; int offset; --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075795; cv=none; d=zohomail.com; s=zohoarc; b=GlX3OVgInmS7RHSAka4udPhmanXT0zdg0Lvvagt7UXP4b8j3mlkXPj0HHoN4oADK+1aopOIlG3GHIgWqX0Qa89kDOchCUfLmlA0uB2pZlEFkMhvIv/YYbzhjmXQa5Gycx8kj6Pl3D+zj7jgG/AyrijJGna1izBFFoBNJ8/ydn+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075795; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=rfBnR67cSug6VeJxFxqj2aDxrXwWihWO4VxUu8vOlKU=; b=O5NAob+Ffenw8ltaza6o+1cp3MDA9IZM7Asb6pslb35ezycLNCiujmiwtDlp8iv77kes6L/CTTGVk1/yWg9H6SKzO1R1RZ3bDCxgv/3frrqNpHt0VZxCJF7QHULDaAs+KkM3jTRAskJ0AtuN31RgR4dRn5L2GtNdUvNEPKBUC98= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075795329163.85306762269488; Wed, 6 May 2026 06:56:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcjF-0000l9-Dz; Wed, 06 May 2026 09:55:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcj6-0000ic-67 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:55:51 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcj4-0007n3-Of for qemu-devel@nongnu.org; Wed, 06 May 2026 09:55:47 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-441209fb77eso668978f8f.1 for ; Wed, 06 May 2026 06:55:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45052a48911sm12891349f8f.11.2026.05.06.06.55.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:55:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075743; x=1778680543; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rfBnR67cSug6VeJxFxqj2aDxrXwWihWO4VxUu8vOlKU=; b=f2vDM0th+KPD5UmO7eypYTUlPqF72f7koPGu9qc96SD2rJVHrPU1mZFWfS8BDjE2oQ vwvUUOOelJ5TatxwwGqPbcsoKmtWorYKcGAJDtzjJ2xW9kp1GXqh3k7P+L7NE8KXmTae y3lji35PKjobtMNpeXIRDKG4cSPDtuU+Dh5nGBF5d+OQFpKiyY4fIm0S3AZ78wGVFmQ6 IPVV0ZwmLLqTC8mVnUX6oe5oLjZk/tAMWdbw/M1VY9NXpcgZkxGNUp6pSTGAUp8FBOT/ NmuCjZz3VPDecyXfETkQo0mITh/w6FbCj9pNufCGIliUK8YlIhhPi8kY1KEm2JdImk8j F9OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075743; x=1778680543; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=rfBnR67cSug6VeJxFxqj2aDxrXwWihWO4VxUu8vOlKU=; b=hS2nAD2A3ZH98jw5c2cfhOUl9JjXs0gMqICWsTDpWFjbN7/EqAFOSRwkaD0Z2aMCCP nAAYuGAQnK1IiEk5WEm+GBsgHwuy8/1IJMMBBLV0mNoMfLNcf3d2XDMRya6TxFc6Xtj1 MOyvcm0e6seu5kbl16Pd6vBGNKmQE3HMxZZJzjjBghgFFLWsO9FI08RsaeQj7l0knMF0 RCxjPCJ9kSzDJVOVgVI5LPnmILGoOI8BC7ROC+O7sVbIRFrPAUiOw46dlwyNMo8lYi3O owR/9ceAVG3MwW5PJJt4izFpwksx7SRg0ZZUxSqi3g8T8vWATKLkc3VmxxGYgbyD6pgB S74A== X-Gm-Message-State: AOJu0YyNlLij0elL+d8KY32pr7c8vXfxoT3j94cstPnGI+0zRcIZK8WM cOJBtFzy03/kZ5hnN9mJhOHesVb7pxTtu9Dgk1+T7to3tih03SZhqNhR2n9/pvdmy8H1ItiHO/u No5lra2s= X-Gm-Gg: AeBDietB59sV6z9oQ+N0rQa2haY5HtQnWRzonGRfryCtptXyDkRIKrtL3hIubGuCfWm PFISETP2pGmJYcdpb3JaMFxkgxmYgr0lCKI9H+JanbeeDSWDlhuP1J2I8wa5REgGsMUtPIAHRX/ WqPn2EKtX6Mj+vGo1TW6Q1SZYFZ5JoRd2g5ZfSyhmQ25EfbYY5hirhcYo4hWobHS7jDlqiUXTU9 v9HrP/szFMqCCdTG8ub0UaN0mDDLa25ABQsrU3ORbnDYEVRUSBS14WnKhjrn+5JDb9+9BSB1jlZ oNOawukSMtywALaEMrPPJ+KqexVp8IMiSg+IxuHDFwrc0Q5KOIOV3pvETzFdE2cgNWv0mHQ/akk bES+KM3cjo0KN5yrOh7QyPAebictzftS16sp9DmGvWYxV1Rg/SevCjfyR7kM0R8J392Lbu80Ppz MHopp8cevSKPzao8zfRUAzlPoHAzLM2BFYyJED+q/Z8xaHybf+1svMd8/QXK+Mt0GdRw9XnRTwo dASKYev+BE= X-Received: by 2002:a05:6000:2809:b0:450:ad00:86aa with SMTP id ffacd0b85a97d-450ad0086d6mr6660493f8f.15.1778075742617; Wed, 06 May 2026 06:55:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 002/110] target-info: Include 'exec/cpu-defs.h' explicitly Date: Wed, 6 May 2026 15:53:34 +0200 Message-ID: <20260506135524.20617-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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: 1778075796945154100 The "exec/target_long.h" header is indirectly included, pulled via "cpu.h" -> "exec/cpu-defs.h". Include it explicitly otherwise we'd get when removing the latter: ../target-info-stub.c:39:23: error: use of undeclared identifier 'TARGET_= PAGE_BITS' 39 | .page_bits_init =3D TARGET_PAGE_BITS, | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-6-philmd@linaro.org> --- target-info-stub.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target-info-stub.c b/target-info-stub.c index f5896a72621..07d8647ed8e 100644 --- a/target-info-stub.c +++ b/target-info-stub.c @@ -11,6 +11,7 @@ #include "qemu/target-info-impl.h" #include "hw/core/boards.h" #include "cpu.h" +#include "exec/cpu-defs.h" #include "exec/page-vary.h" =20 /* Validate correct placement of CPUArchState. */ --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075777; cv=none; d=zohomail.com; s=zohoarc; b=hj/OisCq9KRSXdNM4uXf75yrGN53RGbV4RJPJndab6DjYHICeTkaFa/Edl75tOOemhENcwnARd0s1wKg48xNOfAxchsjTYzGDXGIE7lF/yxTAC7sysUJkp5Xjvp+2zHUjSdqRl4qjFiLqdU7FkYVSOyP2yWg0685oNIIBjaYbaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075777; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=KNWJ8dWRU6iG55iUFloHSqRc4Fii/SCqlZWk2VESoKY=; b=dEvE3/a5JuaLPmYE4JPRZFwSNf+nUgj/BJACqPCzUEJb/Wmontx7mHy+Ld4Ved2chlPCIREHKgiGaQDsL+EFUvSrr32Or0d2TowaMnsXnpqrMHiZuQWC7w3n5SDq/AFYuC8pjGshacCjARr+uiYtXOyqoGU7AzUlTzWtyObjq5M= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075777223755.4131313650156; Wed, 6 May 2026 06:56:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcjI-0000n0-Ae; Wed, 06 May 2026 09:56:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcjC-0000jJ-1E for qemu-devel@nongnu.org; Wed, 06 May 2026 09:55:54 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcjA-0007o1-He for qemu-devel@nongnu.org; Wed, 06 May 2026 09:55:53 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-44c350a5b87so2249169f8f.3 for ; Wed, 06 May 2026 06:55:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960973sm12626626f8f.30.2026.05.06.06.55.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:55:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075750; x=1778680550; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=KNWJ8dWRU6iG55iUFloHSqRc4Fii/SCqlZWk2VESoKY=; b=ZQIEje4ssp40lbbWr/p5KFLTmXs0kv7PraBQUi8xAcUjDV7A4KJb8Imba4oEyGmtEw uoudi5i6v1hfsvK4iNsiVRzIhQEl1w4018seR21nrUknQFI15MBY5Vi30y+Ff6OGDV8O iwPTOX3yLaFVWYzVHjd9Uwxke+/GSDUB7A/dMTjtJpMscgi+xKDmvPlqHFES2+oYpJor U1XcHfPlOwftCrMFwclEUaqtnmFVHXUIzYBC0UGca7VwnhXg4dZ3sH25yf0Kit4k7msj dRYZA9huq0CRfivMpK8GtzDSH+4YOLj0vNcthpFSaW6OGwJ56EATC7Tybb3iDhtjLl0S Gb/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075750; x=1778680550; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=KNWJ8dWRU6iG55iUFloHSqRc4Fii/SCqlZWk2VESoKY=; b=QUOhG1ciuCiXdIG8vO7jrK7V3wDdQn3/2IyM55zYKvJPVKUP2MX9KLgW/sYLFqSpB3 CXR6OB33wDmV5+rerk5tHJGfam4nZyNUwqcP4bvOzZ7084cB8vegpqsGMeNbXkf5ATwq YQ3+goK3JFi1FjbB6YNWl3sWz628rOL4L+mhp8xMNUoaUe3OO5NA2KgPvdaOlHob3SsO /AzmYP9jwsKP97Zu872xpxdvyWc06aMSCh5FHxUEMpGrObSAmOwbSdNayfD9vqVXE/9w B05LAgw60DqlvG6GjoZh8g3WyHROLFSmliB5DgVMVlNy1UFcSYcDCtxNveAulqyNYBjM /MCw== X-Gm-Message-State: AOJu0YxJYlfVG263TwL2t+8oDveR7lKMZsu3fHmDfSvN0oNJJ9j2vTXY 3ERd6EGNsSpv/RXovPcG8lW6B5ag83gqLKiaLc+Ul7icjbSuEgI61bp9etTBnFNGdgePJc9r8l4 t+J0H2CI= X-Gm-Gg: AeBDieud5EoDTycmVvMcbz38aIomlAJjnQ0MxA2akwPKsDnL+j+axyAGbisu2yNZkIj mkx4qg/L7PENFgyLaxSa8gPMUBCrr/dI3Pi20DbBHhgPqGcVYsH4rVNwwkfJJhr+vLNmAL+IKTC zAAxIbNGdS0KEkEa+T9Aq7zjjoELaB8P9Zcz/X8AUxHAxQn7bsZ6cyP7B4QZ6Rxzj47SdMS+k1T h0BA+RaqO+HPhXiio1XJx3spAkpBM9Z+kECNWp0b4pNfOcdVMgXk/H+MxSCz2jJm2tR5EJ1Odgj wLa2YlvkEDE59vZuH/P+LzPFNs8sm7yBLZjz8BkH/zC5kT3oMQ95taKjJnPwpJrHiij5DgIJEP0 ICaSfF9aS2KPWpVo54EWWgX7W6vBLp4FY/KXpXdyZYP86lWR9hSov9lie/7tYHht2JWy+i0iLkl XVCc5Hh7+faYBX/c/UvYTwn7v7VF4rXwlbEMxmr42Lu9F48CWCOq4Rr2limBeA/zhLg0k+RfF/J jXz05KLboQ= X-Received: by 2002:a05:6000:2207:b0:43d:7dc2:b655 with SMTP id ffacd0b85a97d-4515ad767c3mr6386799f8f.15.1778075749809; Wed, 06 May 2026 06:55:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 003/110] target/xtensa: Restrict inclusion of 'exec/cpu-defs.h' header Date: Wed, 6 May 2026 15:53:35 +0200 Message-ID: <20260506135524.20617-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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: 1778075778734154100 Not all files including "target/xtensa/cpu.h" require the "exec/cpu-defs.h": only 'cpu.c'. Restrict to it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-7-philmd@linaro.org> --- target/xtensa/cpu.h | 1 - target/xtensa/cpu.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 22192924841..dfd2ceab7cf 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -31,7 +31,6 @@ #include "cpu-qom.h" #include "qemu/cpu-float.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "hw/core/clock.h" #include "xtensa-isa.h" diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index eebf40559bc..31429ec2f87 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -30,6 +30,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" +#include "exec/cpu-defs.h" #include "cpu.h" #include "fpu/softfloat.h" #include "qemu/module.h" --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075770; cv=none; d=zohomail.com; s=zohoarc; b=V9TG09SGuhU6jLIv0+wv1dv8tKR9wMs6oNVPVkRnvVWF7DKrR75bVEUPyI42Z8XjCS+qxWfCVmQTO1JmktUo01gf/Ej3goZJjRwu4QcvUmE3b1IQvTJyxXSLcAnsHrsfiiS2OtDYS+eKTRiud3VoHNXUCPmuD0W5CBoD8OKjZB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075770; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=etiaBBe0FYCm1/YT1vM9NGHZt/oKDk7PL8PCJaPEj6A=; b=IiHqJpPzdMQTffRILAc1mEbUwaz3zG3PFarjzoRzDG5ilww+55ALZN3+ZjdF+U+UE6TyELLuNedlkJVb+nSdYNCjk2QnykHfAxhz2gdbvjOJUD8BCoURPuadpWvJoC443jVkKa8U8n5Rfzjux4btpT9/u24DKiD6GBmXxGtOLUE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075770643300.2795260001119; Wed, 6 May 2026 06:56:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcjO-0000qM-JL; Wed, 06 May 2026 09:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcjJ-0000p7-Pv for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:02 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcjH-0007ol-Kg for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:00 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so72817525e9.2 for ; Wed, 06 May 2026 06:55:59 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538fb19csm46703615e9.11.2026.05.06.06.55.55 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:55:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075757; x=1778680557; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=etiaBBe0FYCm1/YT1vM9NGHZt/oKDk7PL8PCJaPEj6A=; b=Sl6UWU/h+tPjOAF85gwpf/cSP1tZktj4ULvuJ2MU/pxr88SzG4pUysP7SPC4z3+m/y 24BbLOlQv/4in7oDZSsPbQYSv0OLjXJpkJoS9f/Q/xu1xPp5Uo2Yvz/oxTI9/I+DJsnt qvIEIVyRBhNJbYYjML+BfxdbaRiCfRgnYLbCP3x8UoHwS3n0YcKo39preA0RaM0U1ruK Ylpe2b3YEJmNA6UNYpIPaeNOk8ykhUPGqxSw2EdNfTg3EZgxKB2oLQoHxSfWKfsDO0T7 PMTUJv7z6Xh4hvBQZz+qkl+SjBxSG9r8KJH5p9EBhfUvnojxeen0xCmu9t+pvSwbojTO X4gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075757; x=1778680557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=etiaBBe0FYCm1/YT1vM9NGHZt/oKDk7PL8PCJaPEj6A=; b=dJ7CyeVKgQ1w2MViONuhqHrCrQsRaQJ2uS03+S1Rpx4kyzeswNbZkAvFP9fyIMX7/+ F7i/Eh8MZndVJkVXYmUvoy/+2YiY7vvlhGzSkEPfNXvInbUWwbR0oR6FTfw2yPtYFRjK 4fjq+L83J+yTGc1sjsg3mGn9wiJJ2NU7XQg0UEaiqc49ru+3k3quDKNhbAfciEJ4H2DX cd/KLS0/cPr4YfWeVBZ7VHSPtBwDxOP4qxsppJWy2PupJS7KpQKhHTYOgdnuopyAsMQb jXEqRrqJlAoyOfQqmAVALrlTdLuzRFaxhYgYzGAA1oE/GCmPW+8oB2DGs2Ev2q4/AvC7 WiFw== X-Gm-Message-State: AOJu0YwygNCShphT9+C9Nvq869nn6dYG0VcVtgpZvEBFOtopiGeoQZ7t M90BQwhY1oLyvoM63RlQN9HvvaJ/XacMIhVASBPVlQ+0lKPlt/EYrkcPOP5GV7AUpnxqXjoB13e SI8YzOEU= X-Gm-Gg: AeBDievwg1cuRQJbBRf5n/39Ed70xE0dQrz1gXt58h0m3dnqJkKTMGc/ubgmX52KjUO HbVGj/mcVwiFbaCLlCsx5ZScx92Q1jyyzlGisEpbeXceJ1lL1OcoVuaXacDy6X9Eox/1jt7I8dU qHoY8+tWpssjQ2+03BBz8tw+/TabiYsYCw/HmuP0zWhQXninf4aYmRwcytkcYpKh3kp7Svx/Nsj nKIbmLuBDGCBxbErRzgF+b3daIQ3Pyc5kXA1OfKCzY3sBvyqQ+uYYEucyY4PmOfUsU1/I+FAfQt mRW/bfrUdiom8/w9QMfnDafwjVXp76MwaLUtwMfztY72NjzSkUVBPPYVT532dEjF94ub2kyxlcI Y4JVZbsvlsQuEoVq+evygaiSujzoinii+G3wphopEUUC/uQ/HzD75VgNwuYimWOedo4PF9pLp9S 6pfSZ2vD7Lv1giPj2KewqFS37LBvFhTG2NY4xDTt7MNtAiN+pCwbltXE3ftEB3H6BHmCXjuQh4g 2SOpUjYB+U= X-Received: by 2002:a05:600c:6d0:b0:487:21c7:2885 with SMTP id 5b1f17b1804b1-48e51e09730mr37205515e9.5.1778075756851; Wed, 06 May 2026 06:55:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 004/110] target/hexagon: Include missing 'exec/target_long.h' header Date: Wed, 6 May 2026 15:53:36 +0200 Message-ID: <20260506135524.20617-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1778075772563154100 The "exec/target_long.h" header is indirectly included, pulled via "exec/cpu-defs.h". Include it explicitly otherwise we'd get when removing the latter: ../target/hexagon/cpu.h:76:5: error: unknown type name =E2=80=98target_ul= ong=E2=80=99 76 | target_ulong gpr[TOTAL_PER_THREAD_REGS]; | ^~~~~~~~~~~~ ../target/hexagon/mmvec/mmvec.h:69:5: error: unknown type name =E2=80=98t= arget_ulong=E2=80=99 69 | target_ulong va[MAX_VEC_SIZE_BYTES]; | ^~~~~~~~~~~~ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Brian Cain Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-8-philmd@linaro.org> --- target/hexagon/cpu.h | 2 ++ target/hexagon/mmvec/mmvec.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index f99647dfb61..faa07a6e05b 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -23,9 +23,11 @@ #include "cpu-qom.h" #include "exec/cpu-common.h" #include "exec/cpu-defs.h" +#include "exec/target_long.h" #include "hex_regs.h" #include "mmvec/mmvec.h" #include "hw/core/registerfields.h" +#include "qemu/bitmap.h" =20 #ifndef CONFIG_USER_ONLY #error "Hexagon does not support system emulation" diff --git a/target/hexagon/mmvec/mmvec.h b/target/hexagon/mmvec/mmvec.h index 52d470709c0..4a4f6cc9805 100644 --- a/target/hexagon/mmvec/mmvec.h +++ b/target/hexagon/mmvec/mmvec.h @@ -18,6 +18,9 @@ #ifndef HEXAGON_MMVEC_H #define HEXAGON_MMVEC_H =20 +#include "exec/target_long.h" +#include "qemu/bitmap.h" + #define MAX_VEC_SIZE_LOGBYTES 7 #define MAX_VEC_SIZE_BYTES (1 << MAX_VEC_SIZE_LOGBYTES) =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075802; cv=none; d=zohomail.com; s=zohoarc; b=Sbvp1ohfP5DoTFCe6c36djan7eX9LXPEey7lxlG2FjItcEQvYtJqACsn8ALTqn1b+6JMMhw0CakqXdzsGwU/5tDw6csykh6mjFEFNdoYjA+30aVcp4W8Ct3/To3tc6sHNaK4QN7CjNQCjlC4UkG1MVEjWeiHTe8Wm5Ov78YLlEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075802; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=PUOV72osLEXpR0dcwtXn5HQdjKKmmU7aY7ana5NjptE=; b=U45X1cEaNS0ZzFUc3FjDDnsf+AaZ7OpYWA5b31Ypm+VrXKZD/VHNXX4+ZKBYJoBduZHZZTcnDVIul3qLNoMU3ut+ysKZr4VE1CJANxTSk9/efeB5jf99MvkS82Gj5x6YRywZw9Ki1YuPM91kCHzpPQvjpsodGkd1stGwH1Iehes= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807580217944.676446127014856; Wed, 6 May 2026 06:56:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcjT-0000t7-Bl; Wed, 06 May 2026 09:56:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcjQ-0000qo-8Z for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:08 -0400 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 1wKcjO-0007pm-Nr for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:07 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-488a9033b2cso57750955e9.2 for ; Wed, 06 May 2026 06:56:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960022sm12783848f8f.26.2026.05.06.06.56.02 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:56:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075764; x=1778680564; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PUOV72osLEXpR0dcwtXn5HQdjKKmmU7aY7ana5NjptE=; b=p8lwXJXwo6H2oIyiLdU1Decap/NNWZz2ttc4uuggZRK6Kc3f6aUPMBKKFabF0gJlt4 Sn7nW442d6APXJkIu8oif/2+bTI8GYwEBG5H5BoQYYM0e29rYSvhq2Vg9XZU9loSkH4A inQfiEHnt/uGea4h+EDM78Ag7rYgr3niDkvUhW0jeiyObpQxW99So1OXCXElDGV0u8yk Q3PnA7U1rDwt/3JOileMRs1gCsR2VlZnBpPK+6qFIqDipGXXQVZa7DoI2nT/KHCraW9G ky69OsOZp6/tTBCOcchinrrTRK6yCf7T5XEF7LCvnKZ6vQOBEvO4S0aftW06REI/iyCy 6miA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075764; x=1778680564; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=PUOV72osLEXpR0dcwtXn5HQdjKKmmU7aY7ana5NjptE=; b=q1piYafTa/YsyPhgh+FIKp/FoAeJfPfzMoVv3NnNgAzj4s8ecY2dgV/xY93WuB4jGP p6MXM3m3iblm/Yr5CyMOYH6epH+OBdr1B1HZPqXo480+uF/GArtXaParCQaY3Ykkk3X8 w0fr6zo+a0cFbijbMkYvFAcW6RzHI+/ZS3b+6HNw9/3q7e7uhQQtxE6T155IRFhQcTQZ upSb1svD5XOIeg9qOxfNnhxAAi8jUPLjP+KXAT+iCbP8YINF8CXuFkTsT1KvOk1DTHOW qGjnQy1MsD8uR+AQnT3I4QmcKH7N+HCflx1VzaqHjb0hRBspZLLprzqhHY0hotxuc4nA Vpag== X-Gm-Message-State: AOJu0Ywk7p17V7icZyB2IxaZeptC/UImS1to/TKPyC642heC63Y3YCbu iT5MWVVN0Fj2jLIIGUvz7sJxnApqlVrw8kGkNTrrSSgm+wMD2kG9UwJXOLu9ObCtT4BjQJYdjfZ IpwQvtBk= X-Gm-Gg: AeBDietu4hXnt4iRCByMvoghZ/ZtapxCtiwKaAxU2j763OXVnHKdD8XyxgTGSjqRass NoBKiqdctiaH/0YvtgKaXRhS8AtP/Z08UGk98h6mYuWkTO9UDgjXjSQGlBEfZ2dGkCx+VfzpCtY qFhdY1ZV7Hz2T+dXNTO0IdMhsyAKou+YDmAlXg8EQLbWFo/V3fWMDn0IdSNjDTO4z+No2t2Xhdn sw+rIY157iDU8Bi5PmiCCiHuCZUzdoEh7zcpA5oJsvMP2ZjzUMLeiUm+FvHXAnijByW20S4/flU fjM/03DQpwWDbg0+oqMQrFmcg8uDxKplmfqwPnpn3LCAhwIQPcw9pYrI+VYnMyE8zlozC7Mh7j6 it3BaXYftzdCgPXOrt623GPFRd8rZGUn7ReVUdw1M0qjToK+9PLm63k+tEOwBe2zYzoSJMrpvW/ dBWfmjNw/ZO0qiyoOIMLbrqE/GJvtwK9mbRwuGND/dcD3UH41TOtOCAcmu7fC2d8InkQEKyRdGz kSgzHvERgo++lIZN90pDQ== X-Received: by 2002:a05:600c:4512:b0:488:c744:49b with SMTP id 5b1f17b1804b1-48e51f539b0mr59282895e9.7.1778075764124; Wed, 06 May 2026 06:56:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 005/110] target/hppa: Include missing 'exec/target_long.h' header Date: Wed, 6 May 2026 15:53:37 +0200 Message-ID: <20260506135524.20617-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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: 1778075803178158501 The "exec/target_long.h" header is indirectly included, pulled via "exec/cpu-defs.h". Include it explicitly otherwise we'd get when removing the latter: target/hppa/cpu.h:375:1: error: unknown type name 'target_ulong' 375 | target_ulong cpu_hppa_get_psw(CPUHPPAState *env); | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-9-philmd@linaro.org> --- target/hppa/cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 7d47afe8efa..6ea4c9b6826 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -24,6 +24,7 @@ #include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" +#include "exec/target_long.h" #include "system/memory.h" #include "qemu/cpu-float.h" #include "qemu/interval-tree.h" --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075808; cv=none; d=zohomail.com; s=zohoarc; b=e91g+mY22I67vwSkGrpETJDuh3ABv+jjXx/U747b0zbhB4f7/IE/Yee/wgFy90xFIrhcbJB37+KdTUtS8fwCjt7khaEW504JN7awzz8sZpXoyGMVW38dv+hhRhEykw7u5awwVVDi3O2HqYNz67yT8hMR2FDJPEVVvjJJnps4waY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075808; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=yissrnBuTWv4fjwd6ejChJgAlwRvBntR3xzr7tIy6UM=; b=V8WBS8TgDSooPUAhcI29JU/QKDzjpgvorHRLMerb4InuMSZC3VSa2FzTHcbkgDHYd3Fu6mlL7eTqkXOWpTisowsAYpPWvnxK9dymtMRMfyte2t0cwBxTWMV+BFDzmX9FNiMwTjhfkizBOQFQ/vVOYwRS9q791MCMa9kochDULJU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075808527571.8772563811866; Wed, 6 May 2026 06:56:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcji-000190-SX; Wed, 06 May 2026 09:56:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcja-00011a-5I for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:19 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcjW-0007s0-BY for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:17 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-44509921fbcso3339521f8f.3 for ; Wed, 06 May 2026 06:56:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4511d8cd160sm8085848f8f.8.2026.05.06.06.56.09 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075772; x=1778680572; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yissrnBuTWv4fjwd6ejChJgAlwRvBntR3xzr7tIy6UM=; b=T+r9boFFcn3IN44Li9CyCd1pHAOgA3zu8sZE7Q++LPBF9QYvyNJe45AOJZi8MGsTLg LITO1vlO0myQvUQXT8erbi8/gYi5jaV+Nf8tCFLDta3AHvXfNblyCB+Oel+FxiDhLagm j0OAlaqmQ3rd4oz9MNPUJYLf/onWHtTHNp2YaH2UGCCvhtL8QUY46oXSH/jZetbv2sTU a7tj8p7KlF0CE3I1dbHzloM80bkcuQQHqTEM+8+FSbCFIpjYaMVtNgu/wDr1LJFwQLpR VWVU0xZ+Xtj/SNzvmrjmLijcjlWh4hgIEWEb6G/DWacAKgXmHmOzlccP7spdP6u+Bmg0 vqmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075772; x=1778680572; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=yissrnBuTWv4fjwd6ejChJgAlwRvBntR3xzr7tIy6UM=; b=YnhdM7nrRvpTFk19HWYXcYXS2aC/JSnNRJHgDDd5nvNII2fHSsrkdaPHXxapL6bdTs tK1Mb+Q1+kGF9So6V8dP0pue1OMHGLnVNG0yOl/rKzbh8cmnsXoAhuIg0nEFyzAT2RXB OBhXABa0GL2RwixCYerGy9y3B4+QofeOTLp1uoWhAi+QopYQ5O8KajfwZqxtjx4t0dDA S4x4VjPmbdiiYHjYxRwmyHTDMlaecBWdNvA1zUH0MqNnYfq1T9Onp6ust0upmBiCqMiJ KGD7ACQnqV0lCeSmTLWWQikLoJcp4Z5w/qyZW7wmzBgr9Gn4vU1M0STi9fXNuC8Uglmo +rhQ== X-Gm-Message-State: AOJu0YyS6xjJAySly/8Fab3Wn7HWg/JMVZYMY6QXLetC8ucNf3UcXsVc OXTu2qAc1zj61nBp3m0YYU7R9kURyhDMjJZebCAok00hYv3GQcAHF8hxk/5kUvTzVYIuJCTYmte vjSvd0HY= X-Gm-Gg: AeBDieta1KKFdLylR2VhXGctd4Yf0Npil9Uob6PJqdttONNinnKtrrrCkVDxdlE0M66 hphIFhOxSmsbNVKjhCzAwYHTvhu5wloOHClsu6JfoqmoQ8f6F+3SXPT3aIQjxniQtNKHiqbhcdw +3PXfliLhmBJwGdQVbwbbBz8fiDmvd/UxAVkhT8vCilc6m4qj7X2VXY+9cRcfX4MXt3FPOYZMq9 MtEJgzGqqiOPNkS0Ybu7WrLeZ3OqKZBnnInJzGEIrL9P3+5KuqfyHIfCGhwgN4oJvWi1dU4Uyvh sAQ/7jLeKoY318u8rOEtmBWUpQJguP526H9zHY57uZieeCutemPcdUBml6vSz0+dE+b4vzIOiEf BLCNEc5ZsNtvqCyB7MziuWcutHy+EeQHxaiMGyUXOzmp81Zd8eIVLJuUpHMId9Ye6ME17Bynqov 1UDOLRnBZ7luNhErQRBP3Y1gWqhuRl6x2jPWj70hTlliYbtz5qtu64JP9yco/VEYvP/O4FeEJAH G5ES77e0SY= X-Received: by 2002:a5d:5f53:0:b0:43e:a69b:d810 with SMTP id ffacd0b85a97d-4515d9a0839mr6168437f8f.38.1778075771606; Wed, 06 May 2026 06:56:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 006/110] target/i386: Include missing 'exec/target_long.h' header Date: Wed, 6 May 2026 15:53:38 +0200 Message-ID: <20260506135524.20617-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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: 1778075809174158501 The "exec/target_long.h" header is indirectly included, pulled via "exec/cpu-defs.h". Include it explicitly otherwise we'd get when removing the latter: ../target/i386/cpu.h:2777:43: error: unknown type name 'target_ulong' 2777 | void cpu_x86_update_cr3(CPUX86State *env, target_ulong new_cr3); | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-10-philmd@linaro.org> --- target/i386/cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 16de67e5464..fd8d98a4bdd 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -26,6 +26,7 @@ #include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" +#include "exec/target_long.h" #include "exec/memop.h" #include "hw/i386/apic.h" #include "hw/i386/topology.h" --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075844; cv=none; d=zohomail.com; s=zohoarc; b=UmEWT6TydDE2gOr2gCUOF03hxAv1mDXD8DcWL1P+0gRJjXBAxFG0xRq6a1s/d+XRSzH5AN/TR57Hfy3chGEvtr1D6cbBe/e4wVF6g4SNOl2hyjQ465kPKylM2hX1eeZpM+yOCwR5YGNUTW6sVf5T13KPBBTO/mcX7M8Ly/xB8i8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075844; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=BJYP6Q40kzmLEXYiWzHY7XT6SbhPhEOvlpV5vyUR24Y=; b=ZM/ax1Uw1hRS6tUVFvlOmZuQWPgdH8/Vw98YVLOndy4sJTZQ7jdEYNUtSWMuVTgGkwwFEt1ijzog335E6E7kPsmtZV2eIBM0JPd+PdNMAqJGqqMEpona/+iXYcwFPCZgo5+sDdJj9YZzOJEeoMzsYWlkXpsBvXjJvWMo5KEP6ck= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075844026134.32616738970933; Wed, 6 May 2026 06:57:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcjt-0001K2-H9; Wed, 06 May 2026 09:56:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcjf-00018s-6g for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:26 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcjd-0007xd-RA for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:22 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-488ba840146so57298255e9.1 for ; Wed, 06 May 2026 06:56:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055f249bbsm11314292f8f.36.2026.05.06.06.56.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:56:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075779; x=1778680579; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BJYP6Q40kzmLEXYiWzHY7XT6SbhPhEOvlpV5vyUR24Y=; b=Tz4X7h4aZKssn+Qa3VpP5ERYHN8uQ03O/J61gTRBxACFRlaU1qP7R9hsOUxC8H1G0/ b3CjsUMscA1Stu7J7PR+mbo5GJ09aUSLSa5EM7dKVW3oSbnCQLaTTWTCcKFkRa6dnUAx 0zzdwBYx525j0FkWuhKg25KB9+fmuT7lwukk/gs5FNh5T84vgkRXbkZE0je0cDwdk+Cf TDuN556T5KRXm4N0rBVfei3PxZAfgMwniYaYaYKoyob1xIkvtW+fW2iRTW1SkTXrtyvq euKMVMeXpz8UDaPjvoGuVCiI6utSohuJtUUNdCpNMk0yEQEUdoW+QYIUv3ya0YP2YEM3 +qqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075779; x=1778680579; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=BJYP6Q40kzmLEXYiWzHY7XT6SbhPhEOvlpV5vyUR24Y=; b=drARoImRkZjCaTVH8bm6IwzFM56V9Rt50W2w2u4VtQSWcPgz+om+SZXBYpo9I5LpGg gJQfPuATMOguR24wMnKgV22GNxdlTKrKqjMMHzpjKrAuTYwbMk41ekXsd6HhggORJsE6 jHFo/kotiM2+wNRB1ScFxkE+w6F5cyxqQXtgwzG2pndzek36HUt1G4Lef9zo3ZfrJQam nBuxeSE54+foLIVP+Tw1JMZDR69hSKF5PU2evtf+GCSl/GjB3nO5xuxJ8mae11NKZTD1 uW/AP6VGhrjILnDA5vYavyVk3Z5NMLITabal/RsJlFiekHyjtbETLf3RrBcHWltXb5CS dFuA== X-Gm-Message-State: AOJu0YyUUNyiLC+mxOnpBKhHJP8mtkIyupEyKq4FyC+ME8lNXXyvPf5U olpabR7qlLK6GTL3Yw6seQOMZtWzu32d0KkYwHA/q6aj0VjCWqt7qAoPqlh+CHnHwUf07u1cmWR rJhUJODc= X-Gm-Gg: AeBDiesVARt0gG1kIiuUCYCqoT3V0wJotFwhcd6bFyNlK7fTkpEdG6+4TVrOgPidekv BNFinH3H3DCYAucVjTlmnvyqdO05CZfTOv4iNU97EsFAW6bVgGsK/xrFqCY3sFeRlagSjEEgdRc GhJSduCbR3VnzLvr+/XY7oeGDdtWOz4ysMhrs7m6xMYsiGAyWOF6W1LJENgaRwIdYK1Fp6Mw6nn U4hmoHYOyNvVFIwk8CBi7jbCWWdO+RQdagnljC9XjYFdxs7JAhxqNc1uvRArjOwI8kIfmstF/dy PC3vvs238CZ/eOWH4BBHQnoXmmt25ATLmFGEbOfI5T8dEKwTthCNMv4niDCC+PqONGTt+9cnI3M wZSQRPqk2kTODhF9ZdXpiyfzhJGXPkE4A27sSw/dudfivN5f+UCRGoX3Ysc+ZBfULB300f97I4K UfBay1c3oUs7TfsSCRuqTL2+EGoJE3fFaroxGHCltB84FYj44rGMWWLcVW2fkt6E0W5mJBhrFOv b6GDfafmCE= X-Received: by 2002:a05:600c:8b8b:b0:489:1aed:1658 with SMTP id 5b1f17b1804b1-48e51f3fd03mr64028945e9.23.1778075779225; Wed, 06 May 2026 06:56:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 007/110] target/m68k: Include missing 'exec/target_long.h' header Date: Wed, 6 May 2026 15:53:39 +0200 Message-ID: <20260506135524.20617-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1778075845711154100 The "exec/target_long.h" header is indirectly included, pulled via "exec/cpu-defs.h". Include it explicitly otherwise we'd get when removing the latter: ../target/m68k/m68k-semi.c:53:5: error: use of undeclared identifier 'tar= get_ulong' 53 | target_ulong args =3D env->dregs[1]; | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-11-philmd@linaro.org> --- target/m68k/m68k-semi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c index bdc798a28cb..d2a071ea677 100644 --- a/target/m68k/m68k-semi.c +++ b/target/m68k/m68k-semi.c @@ -22,7 +22,7 @@ */ =20 #include "qemu/osdep.h" - +#include "exec/target_long.h" #include "cpu.h" #include "gdbstub/syscalls.h" #include "gdbstub/helpers.h" --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075808; cv=none; d=zohomail.com; s=zohoarc; b=Ox0a6287warL9G3/AmX7AgQWe0cJ7t2NMD3PnsM9doINfoce/aAB3WqlMux4V/stkirK6IVjY4ol1QwC0Pl7LVr5ghQurBLFq5WtISkm5wR+/7mvr29DxBELzVynTb6ueoZlUIyLgP6+ZBaupteiRmc49wTbcXG5MnUuo+cyKG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075808; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=uBH0BeCe+lQ7Mvc8z0l30R+U8uJCkVCOQv4KB51mStE=; b=QJ417CoUvhtPB1HUWWaI+gtaHancxpacqlpVYVpBEnqrGwo5ocughRdLg9c4PDYwuKRF24pQxrsvxHj121Ns9uh3SJc/yczhnlFHOmTfWs1esjkX97C6ZjXiqt7y4h4CYPUG2P37cnZ4JB3+cf+0JYOVmyqp0h6yLSgrM8TJu3s= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075808875294.407584035008; Wed, 6 May 2026 06:56:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcjw-0001Yw-NO; Wed, 06 May 2026 09:56:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcjn-0001HD-Sn for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:33 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcjm-0007yf-9J for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:31 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-43d75312379so643601f8f.1 for ; Wed, 06 May 2026 06:56:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960902sm14179599f8f.28.2026.05.06.06.56.25 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075787; x=1778680587; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uBH0BeCe+lQ7Mvc8z0l30R+U8uJCkVCOQv4KB51mStE=; b=qQGGezWROSm9V3LJqPUHleWJokCNr76kA/oZbCPvvCnCujLuzwhc5xWt3vxAh1wQk8 A1ORfBPkxkvWd6umsWAiIFMP37SRh9AL7C+piz10TV1lzJU9+WDgSDJtIKsILvP91WkH go98Wsa0ukcn/nnGpsf1K0GTZa8Ln5x32w3xxfHKoOn8oXerOrsDu9xnajd9wtm5oix2 VlR5evcjTVfVaJ1OSGjKh2PDG/p23JmE586Rbe2+JQL36v17PvKDteqLM1VeE7k4/H6x KrgVQ2RuhR2xIsQCfwJb93uVqu8z9cy92EGVezsKlgEklX899hw1zsZqbWwzldunKtfS VtCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075787; x=1778680587; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=uBH0BeCe+lQ7Mvc8z0l30R+U8uJCkVCOQv4KB51mStE=; b=jiY6PeGTzaMUXUL0BdduICJ+Aqw1kzOgT6xNzuYEW/0bgVFpaTh086asiSip7r4BPJ XERS7TKd1ZdY14WVMD/ChKiBOKZQI+AqlRlF+F0RBQvOsUvcPoo7o6G2kLsrN97mQ6NG 2GczdNhzlft1Eos2ldbqbP51ND29y2Bt0dX7Iuy+fTt1U2CYnJLKiSNMvDs/YMvX0ps2 /Qs17jGaLcRBdfAALT93gaAPqbEnBAgcQxJ8owUw0BAas8MOIJYhO2U57wamth6Y8o+F u2ms2nniyqDyFzTISpuzG+4IG6l+xBEkfxZc6l4oWjwACGzCfAQMt4gSgCHLrAnJzdbV dZgQ== X-Gm-Message-State: AOJu0Yzgtbe/NEGX/+nao6EWcAI1IckvyRyY1sMrdQghNetTmaNyNsSa UqHvDLBcB8QXIJSsCvKuzqq8zo5o1i+nWp94xoylil5RthgrVR3Pkyesh/ioEFBkprZwAC7zflE g06Wa6gI= X-Gm-Gg: AeBDievyl8U4jOLl5pL7/aw5kDwiZG0uZCYdvcaCVs2Xn0FvQuk3oHrbr2mHMmy9/mf WYIi0ezOFfTvJfqcx5r4DioLgiwPu8E9Kg+t9oRc5hq8mDYmAPp4VmVT7XzOVXvKKzuevFEok5M lwtaSH8KYSpUclvcSPonaEHUPoq2gQri0PZtm+sVN7Wzz9HcoA28aREXfRqrVPz15k8lmCuKMhC FXyFJoOLApcY/VOVdgY/vRKx/2idJ2uMIy7C74tXkfz1C+c0pnaZNqCkDrrEkeS9h+wisNdV+Je jxH77oxhx8O8J4AoAByzd39aVAjdMMlF5TtsUvRiMCzuIs+rTZVnN4OLIwtibSL1gTJoM+JOCqQ f/lfANefnG+TqhzUfjPToJ3JZnuend6/mpH1pEL9lphSlAggeXm5xYaVcHUwstn+ZQJk5WNzFB5 IX2bIF2RlDrprZcUk7F8LicoKAm8DU1QmLZU3k6cA2zeL5YMKh3STNvW2kwVW0qbQ8jEGT+Zr1U WGBENMqZLE= X-Received: by 2002:a5d:6e48:0:b0:43e:a8d8:f3dc with SMTP id ffacd0b85a97d-44fdc8d3f3dmr9407990f8f.13.1778075787097; Wed, 06 May 2026 06:56:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 008/110] target/mips: Include missing 'exec/target_long.h' header Date: Wed, 6 May 2026 15:53:40 +0200 Message-ID: <20260506135524.20617-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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: 1778075809191158500 The "exec/target_long.h" header is indirectly included, pulled via "exec/cpu-defs.h". Include it explicitly otherwise we'd get when removing the latter: target/mips/cpu.h:462:5: error: unknown type name 'target_ulong' 462 | target_ulong gpr[32]; | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-12-philmd@linaro.org> --- target/mips/cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index ed662135cb0..3517d2d42cf 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -5,6 +5,7 @@ #include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" +#include "exec/target_long.h" #ifndef CONFIG_USER_ONLY #include "system/memory.h" #endif --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075828; cv=none; d=zohomail.com; s=zohoarc; b=ZJOi62yk0xOt76ywuy/4hPBDfZhNjHZbV8ayhTUzSA7l0+uDm/T+lGivZJZSrorj5j6AjpIMwYtElbkuQaFsjMhrj/69dSbR+My1EUy1otm1ScVbk4/D0V9zVcvrwrmaw3WxN9+Y/YUwqFM3lWWLPlHlDqStkSCPcKQiTZ6AHZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075828; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Ig64yb1+2KzdGiecHfvEaVLt05RY0JwdBl1I/EEybCU=; b=H8kVlsw6qUwDYlAWtMOFw5zzMW54f4HhwwgnfQxkzQ2jTIaY3gVKEy45m0a47UghrlKqioQEXX65yxY4az8cdKIA5CzPj7bhJ2rzrxIXWehrspv+Jk/6xyYbZ7UGRzBIa5Du/c6+YyQ+Po4upWGtXXBIQjpuxphVbV9yi39/1Jk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075828664452.2946117833835; Wed, 6 May 2026 06:57:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKck0-0001hD-UR; Wed, 06 May 2026 09:56:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcjv-0001S4-Ba for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:39 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcjt-00081F-8F for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:38 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-43d7645adbdso3960895f8f.1 for ; Wed, 06 May 2026 06:56:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4505285e765sm12281704f8f.10.2026.05.06.06.56.32 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:56:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075795; x=1778680595; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Ig64yb1+2KzdGiecHfvEaVLt05RY0JwdBl1I/EEybCU=; b=soadrskdmsOmF/AFxdQQdFMw6wf8+hiPa1smO/rqord0cRvg2ju/1lzQIM91rSx1/8 b5nDWqjDQPforQfSr9bUGZZF9cArvsECcQL/fu+kDMrQ/m0LTijLFY95QmPtXL4Ji1Z4 h+5EgZt2U2Rqg+Pj292iY51lTidgATa7ZDuMVprn+kzYRCtA7YBnu5J4xa6bDq7KdZS2 1muFSd82gRQWaTu+QCl3bFDnP3LPJ/Rb3Jkv+pSwjeHaEfRhDKbHRX540JB4D25ISrxS x78NSu8iJd0oa6k1sfyYXOXh74EI/cncEUd0+SK5eapzO8ysTQq2NdiTVSp+FUXR+XKj PNzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075795; x=1778680595; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Ig64yb1+2KzdGiecHfvEaVLt05RY0JwdBl1I/EEybCU=; b=D5a6/wCzqugKUIpsEnpVc8x42xDA8D81+7bvFrPlG9VYirtWyt5+8C1zxSueK+pVMo x7xV6Li5OLbAExcg8Mc3ub+D7sN9UmhwEk4r6z/2WyFjZHKOdB850LwQGxSw9HWhUnSn FVuXclS3LQg/nIqWh01eZv01ruN+mkjB+w2nKkgrnCiBqm/h6rJwSuTVSDTwwGD2/s7n vh5mcBxRtpbVJY9dBfhR7zKycyuqaMiYIaizrP7SBq7c1hoLdinQtDtp5Lqiq5W/3Aq3 rdeugslnqxuWH+Vo/Vw9CJ6DMHzdcNPV3T4gD7vqPwOzAx1Egt4elboAcJ/4HT/v94EZ KI6A== X-Gm-Message-State: AOJu0YzGvhPlW4557NxEu+31Hmq0W6uKvBjaB3EVu/TfrkvjdGTD7XQB 5fT+tswlVwsYw+UraMY26WodJkI+3zQF5CVsiCdisDepQSyX72XDZPPh7Wql3PX7Ee9kz3XhrX2 rjitY+Ko= X-Gm-Gg: AeBDiesUBbbh4kwVayn381efWQKiIJBPGHphrCwU8+mFNBkP0dxLevaRkX0ANeipRw7 JPKkUfg9BW3YA1vnxi/ANaACXSUxgi28uDV0rSLsyVwgAwr6qpiamkEeohYGf9cDQqug1Ix0cUi UyCfE0yygaICtU5icHQFidu6wK9JVqqrQ0h/cpWLQIK/4oMKGwkj879sxfQyUgXbbMfey6+A7/Z Wg8bBMMpu2VKIskTimzro2EOhhQ52coOlffFS9096gR9pJFnf6eglXh+mWbAV0fOlQdTZy249ep NFPjgCuGusZ1GHyep/p5/Cq57EjsJXLrVMSv4UX6uvhRmDBWW7Hrj+V+9SXn8Xuuws1DGdkgdvF 56bqmHi+CoOcUxNvsYeaIMtjMcPjghlg1FSCt8E0VrPyCZqq2jTRR+LdP47ed6+DnyzYz0kAEHW LdP18BiLnGn1o11UBTHlp/OODuZLhtBZTKpf7Nvwgn91gUSg747EpAZaj/ewYuZ5crEccL8c1FD aqQwM5xCfg= X-Received: by 2002:a05:6000:40c7:b0:450:e369:2dd1 with SMTP id ffacd0b85a97d-4515b05701fmr6177806f8f.2.1778075794516; Wed, 06 May 2026 06:56:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 009/110] target/ppc: Include missing 'exec/target_long.h' header Date: Wed, 6 May 2026 15:53:41 +0200 Message-ID: <20260506135524.20617-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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: 1778075829448158500 The "exec/target_long.h" header is indirectly included, pulled via "exec/cpu-defs.h". Include it explicitly otherwise we'd get when removing the latter: target/ppc/cpu.h:1281:5: error: unknown type name 'target_ulong' 1281 | target_ulong gpr[32]; /* general purpose registers */ | ^ hw/ppc/spapr_ovec.h:76:44: error: unknown type name 'target_ulong' 76 | SpaprOptionVector *spapr_ovec_parse_vector(target_ulong table= _addr, int vector); | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-13-philmd@linaro.org> --- include/hw/ppc/spapr_ovec.h | 2 +- target/ppc/cpu.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h index c3e8b98e7e2..8d67f492d02 100644 --- a/include/hw/ppc/spapr_ovec.h +++ b/include/hw/ppc/spapr_ovec.h @@ -37,7 +37,7 @@ #ifndef SPAPR_OVEC_H #define SPAPR_OVEC_H =20 -#include "cpu.h" +#include "exec/target_long.h" =20 typedef struct SpaprOptionVector SpaprOptionVector; =20 diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index d637a50798f..a0df7a467ed 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -25,6 +25,7 @@ #include "exec/cpu-common.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" +#include "exec/target_long.h" #include "cpu-qom.h" #include "qom/object.h" #include "hw/core/registerfields.h" --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075844; cv=none; d=zohomail.com; s=zohoarc; b=AoW6CyNaB0v1CoON9utNoThl+rFwzFFD3CbMd4AQfeewXVjiE+cUacOfSppVNXPhilecjQzmcfnLVZkSCCmKpGmXskyP14zuEju4Ck0pLCg29v8U5j6Td6cDHNoxpjxd5kvSHfeOaaxRENUf+TtljwyvTzxloicbD5Ns9d1JhTc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075844; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=phCWfde/k3PwpmEaLj8YUM0UGcdWotmvtNXZKUWY8Jo=; b=VJJWAp5Sn4EouJtLa4bliLCrUXG+FmicKAKf3rrxem6rDaVLAov9v84yqAPGV6RJq+aRgeW/AUg14T9IUlJOOFiti4akZL6Ver39wT1t6u5ObPWJMPTBSl3t6OYuFJsGJGcVnfcqk34Vw34da0dGRA/3Bj7PL1dutsMgIxvC8Wk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075844002214.37042540154937; Wed, 6 May 2026 06:57:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKckG-0002AI-6r; Wed, 06 May 2026 09:57:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKckA-0001xb-FN for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:54 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKck7-00081y-Ef for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:54 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso62619445e9.2 for ; Wed, 06 May 2026 06:56:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5382a327sm90417895e9.0.2026.05.06.06.56.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:56:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075802; x=1778680602; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=phCWfde/k3PwpmEaLj8YUM0UGcdWotmvtNXZKUWY8Jo=; b=cVe+pDO138sx5ZPrWp+ySuQsc1ONsYl6B1R8+SLpP4SyIGRbRXRZdLZ903od6Sy0++ /vRfGH6eUyKuI8yDxohDXM3HALtuNS35+R3LJt5EV+TJaFqDs2JImUiWUtyHvuE/UsJW MHX0oroeaTD4GL2aTflm5NsmUL+20Z9s3bnoyPFCyHHySwKeXRpvZ7kXcvit4TMFl4w5 G6Xc6t2PUSnkPN2FB7/FrKGvmP2+zGJ3MBTgdkRHULqL7LQRuQRtJ26aRPDwhE9PvTAu A5pS7IJOFNR68jUW53hWdpkh6KKIFbkNnuwS7kXG/Y6Tg1PpnzYD1UVP+jqllvqtNiiI Jo8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075802; x=1778680602; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=phCWfde/k3PwpmEaLj8YUM0UGcdWotmvtNXZKUWY8Jo=; b=CiYhM4xtbTzp7XE1Yi+Rwyyr7rZX5OJrKThQ+eCLDzMCqeIAL/TYrAKyhIQxD3hPps AR5mnQ8KJVGZkVDRGC4MGBRgTP5nu1amJdir34G6HRiGiSwjvnzewWo+OIpJJIODQZ06 J/WU+eMVYRoGzPpVIXXbN1RptyNPxJWdqiP8Y4kAxeqij9700iFegvMFoOI7o3rZfV16 zzYptHvM90ZXoDy/qN8xkR8jrvcuVyGug6eDtZnkqM1k/nVhUG1yd6kP8c5ySlYjNkTy yq5rHwEPH8vM2sUxUGGI4clvo3dsVv1FNTVbrDYkGVLp39/3AHRI7jQwBpfigjETqhvg DANA== X-Gm-Message-State: AOJu0Yzq/N4VuQ2RdUDaItm58YqDlpxg8vxNTWbgzR6OiZu+S1o2hA3w 2+XKtF7pDl1dRqGNWxlQjXi1rxka2UHCxIFXQ3f4Vpk+gj02k/XL7zW9qM2wR+j9ZXYfTClZAkt zzVNu86k= X-Gm-Gg: AeBDiev2Jji7owym02a3DdigKr67iHzBv1dyeSIGZMLXgaie9k4pH4fkacGsiIgocbk tsWfssncsO8FBieLxZNDGOCXhyJKskqgMFM2ov8nG8LWqZMNYNIMMJK273mkwLkbc/AteZfuiHw TjfH7QJS+px565bmnLehCWAQePXfZLIkyreQX0OZ3MiURxs0Q7uvqWPG60AaME0fC6Uk1xY6iJ5 /rcBIBAN8dBk8zTVSlz8S4UYgBox9b3EZubJ/lnQ+88RhxmtUQFjhP1hJuub6S50jJKTW1sjOBV /u6NUM5I8xBml8UYpjgyRwOKJP4LkyVKNp/FEwSQ77K3EAksfQy2M9M57+mhxe4zcJlP8/6LCv7 /2jPPXfuxlMyk3wf+heLcX1KuUNpKwweG1TRWy2gskfCewb8ST6x4eNppx8erE1JHWIXUIUturm ILsoper8PH9P+Eg9xvdBhPUzDJo+uUxgz/DPSbhfKnfhGJNQ87LKByIjuhyzEqlMEuZie2b+Y/R 2rkQhAnvEo= X-Received: by 2002:a05:600c:3b17:b0:488:ffb1:494c with SMTP id 5b1f17b1804b1-48e51e1f0b2mr58972045e9.12.1778075801579; Wed, 06 May 2026 06:56:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 010/110] target/riscv: Include missing 'exec/target_long.h' header Date: Wed, 6 May 2026 15:53:42 +0200 Message-ID: <20260506135524.20617-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1778075845441158500 The "exec/target_long.h" header is indirectly included, pulled via "exec/cpu-defs.h". Include it explicitly otherwise we'd get when removing the latter: ../target/riscv/cpu.h:605:1: error: unknown type name =E2=80=98target_ulo= ng=E2=80=99 605 | target_ulong riscv_cpu_get_geilen(CPURISCVState *env); | ^~~~~~~~~~~~ ../target/riscv/pmp.h:73:1: error: unknown type name 'target_ulong' 73 | target_ulong mseccfg_csr_read(CPURISCVState *env); | ^ ../target/riscv/debug.h:139:1: error: unknown type name 'target_ulong' 139 | target_ulong tselect_csr_read(CPURISCVState *env); | ^ ../hw/misc/riscv_cmgcr.c:112:15: error: unknown type name 'target_ulong' 112 | static inline target_ulong get_exception_base(RISCVGCRVPState *vp= s) | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-14-philmd@linaro.org> --- target/riscv/cpu.h | 1 + target/riscv/debug.h | 1 + target/riscv/pmp.h | 1 + hw/misc/riscv_cmgcr.c | 1 + 4 files changed, 4 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 81c41e34296..df55a77c403 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -27,6 +27,7 @@ #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/gdbstub.h" +#include "exec/target_long.h" #include "qemu/cpu-float.h" #include "qom/object.h" #include "qemu/int128.h" diff --git a/target/riscv/debug.h b/target/riscv/debug.h index f76b8f944a2..066e9c585f1 100644 --- a/target/riscv/debug.h +++ b/target/riscv/debug.h @@ -23,6 +23,7 @@ #define RISCV_DEBUG_H =20 #include "exec/breakpoint.h" +#include "exec/target_long.h" =20 #define RV_MAX_TRIGGERS 2 =20 diff --git a/target/riscv/pmp.h b/target/riscv/pmp.h index 467fb6b4b1c..17307ef88af 100644 --- a/target/riscv/pmp.h +++ b/target/riscv/pmp.h @@ -22,6 +22,7 @@ #ifndef RISCV_PMP_H #define RISCV_PMP_H =20 +#include "exec/target_long.h" #include "cpu.h" =20 typedef enum { diff --git a/hw/misc/riscv_cmgcr.c b/hw/misc/riscv_cmgcr.c index ab9b6c7d878..0390996f78b 100644 --- a/hw/misc/riscv_cmgcr.c +++ b/hw/misc/riscv_cmgcr.c @@ -19,6 +19,7 @@ #include "migration/vmstate.h" #include "hw/misc/riscv_cmgcr.h" #include "hw/core/qdev-properties.h" +#include "exec/target_page.h" =20 #include "target/riscv/cpu.h" =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075856; cv=none; d=zohomail.com; s=zohoarc; b=Id8acOIfiaG9G47XHZa7iUMpk9zqzFz3U8U8FUszt1el+w16V7ds9J+uO4J0j+rH+3L91qE2Fcy3vGtOyi5LWHvUS6zMMtnDimL+olrMylUCDrQROvPOlAVDKjManG7qonuiSkDQsI7sq4Vj5NsgJA/5XAD2UaD0kvqaBLbdS0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075856; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=bcwpOmxDI9s9xmjmr5qH53DsN9jYAX4P5W66NxwpuT0=; b=OWndgIo4COk5Jt2ZUhVzp8Jhz8BL4jB3jdBqXGRi6+C6q9OAvz3k5nyNzCZ0RKPhziWinMYRG+XzbVJ0bpB6EsqtcqVB8nSrQGLIuf0ZCp5YhzKomSFgWT0ZzSqrqOb1zRLgepGckuG1Cs03MzTmMkEPg+Q7aPj9ZOm/h5a2hW4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075856839284.7396645882877; Wed, 6 May 2026 06:57:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKckQ-0002Vd-Ny; Wed, 06 May 2026 09:57:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKckD-000249-4L for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:57 -0400 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 1wKck8-000839-09 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:56:55 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-43d77f6092eso4066337f8f.2 for ; Wed, 06 May 2026 06:56:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538a8159sm56395805e9.6.2026.05.06.06.56.47 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:56:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075809; x=1778680609; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=bcwpOmxDI9s9xmjmr5qH53DsN9jYAX4P5W66NxwpuT0=; b=ykOV1JX25vPgrrZakSh+OT66NPA6QFPLqi2k65gjYxeDShZwkY7g2dgHU0PXTzfoQM uc5VJUjC2OfkY/JOMnuUm4QIH8hb3Gj/AfzSlehmFAVwzYcWuNG7uGX78qtyLD3GUKHQ MSZOsX1CijhofSILSnRIkOtA50lZDPcNyJZDzL52EhZqJ9O7+Wy7NNH+GOrNXHI/zIj8 R3uxUY+jpvGJ/NLbxLSZVWC+GNuaS5JP+xbVlg9yXa1usXOkLPqnyKbHF4rKxPNMYtCr WhsBpkXKZXE1Y1XpqUK79muYFRGnEfqSluiZFCEUYD1Dtp9ZckT2HRI9Xue+uSaqPfyL /slQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075809; x=1778680609; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=bcwpOmxDI9s9xmjmr5qH53DsN9jYAX4P5W66NxwpuT0=; b=l34hRStpMY8Ct5M4eebYZY0MCBIujAEwkDrbRKkmNJQ4EkvjxgYdWCYacrI/FV1di9 ds2kZJvn6JtyXrUs2gUHgAn2iU17vVsCOavOStyMUPB+AHrWL0Sdzsl0ZoZUOVdejitH zWiqB6IdCz3OMcjgFSrblOPuRy9SKN1QO8PbPnCDoIMnAo/jgVbfaLtXTrIAXkfLuffQ C/obw/j7IW17fXoINiqEI33JjqrsbYmW5pcNsjUUJlQ3u9E5Dd/Snu34ZcSu2dA/yrOZ rrdvcrWDfcKJFIRoyPmxrYW0Ec34L8Rdqf02wdpnYaoZu1twfUyPgMeoTKjkNa5mMaRH i8Mw== X-Gm-Message-State: AOJu0YwM1l1bBtjvQnXLH7VE6pdNcODLh8YLHn796WNLQdRjO8Jw4OKm CdwFjdXhujT6RtLhJQv9S42az9ZxaYtUop19u+a7Sfi4OkgWL88hvJEi7I9YI6/DPZl8JYpi4Z6 I1e405HM= X-Gm-Gg: AeBDiev8D0VVj/rbN09Knr2h9Et8KTnPpU7jHAjaQ3hpxDLInog5pkAM5J+fQfwpSrc Zj/MOYtgJsezk+gsbEcaP8bCP3zZqXBdxs7+dSLCBMXM9K+tsTXKT1zHOSqwMkLJZqLxIoD1eer QbYbpSDSrvgJgkelEckm8/DM+pun8zHuNrFtMoEV9Uj0ZoTnm489KDAZVTFVvF+rnn2Y501AxK3 dtnXOW/c4z93lhbRBGKxlaXjfYTnLJpUhRAmFLktydPLqvcpz3TyC55Av2c8+GWR2stUQwFkQg+ z/Ah31pzafqUjBZEcISJ5zF5Q6q40hkJy8gnrKQh9mMN26ZFYxgzr07vRImBuWitAksz3GZ/7FZ 2rKUr9onFRS9RbB7GiQjwna7dScOXXOMDVuK6E8e+IxyQq6PtNIQDUjUcjxb6SY9nJCJ4gIzZrn 2pDnMUFznu0BdhBC9PL4vGAuLVkXEbfvzeudBJ520/pF15WKgtrKHvYz0CfU8JsxzWiBOFvPp0M LEL1tT7HxU= X-Received: by 2002:a05:600c:3548:b0:488:c40b:c8a4 with SMTP id 5b1f17b1804b1-48e51e097a2mr63284135e9.1.1778075809387; Wed, 06 May 2026 06:56:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 011/110] target/sparc: Include missing 'exec/target_long.h' header Date: Wed, 6 May 2026 15:53:43 +0200 Message-ID: <20260506135524.20617-12-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778075859977154100 The "exec/target_long.h" header is indirectly included, pulled via "exec/cpu-defs.h". Include it explicitly otherwise we'd get when removing the latter: ../target/sparc/cpu.h:615:1: error: unknown type name 'target_ulong' 615 | target_ulong cpu_get_fsr(CPUSPARCState *); | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-15-philmd@linaro.org> --- target/sparc/cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 0139732e4cc..155aa8ec637 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -5,6 +5,7 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" +#include "exec/target_long.h" #include "qemu/cpu-float.h" =20 #if !defined(TARGET_SPARC64) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075848; cv=none; d=zohomail.com; s=zohoarc; b=S21gwrdZxHj9QmvbemI3oWh7efVTJkunPRtQ38EKiPrpjUNu6ZncfmZNxng0h8v+yRL3o0y93v43k7a1qLKendrOmHNcNfipBRsgWoH943MEiGKWV9BCQE9YXx1tbjhZ4+vfXlAP+Vo8lxQeswTM+7tkLBLmpR/oDh8GwduE4Zc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075848; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=X0ChLyLrnnWxFhFlsorIZFcSiHRTf4Wb3PMdP74ILOM=; b=gFS19WYGc0nYYTHogZYvDMb3e+RxsjqqVLK2ZZrNlEtftqYRzP1ueTKdIVnppaTpPGIERdEzNKbChgFcbbIjS42/48ciKdP7PM/r+49D2XRqDNs2gmSnFGFWiYOm+gyfuOI+Jf4rYGoqGgl2FPADg/b39up//4Ys/91Wzy/eIOM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075848368648.0878251365259; Wed, 6 May 2026 06:57:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKckR-0002e0-Km; Wed, 06 May 2026 09:57:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKckM-0002Gr-Pe for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:06 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKckF-00085D-9A for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:04 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4890d945eb4so6171545e9.0 for ; Wed, 06 May 2026 06:56:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45054b02802sm12815109f8f.17.2026.05.06.06.56.55 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:56:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075817; x=1778680617; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=X0ChLyLrnnWxFhFlsorIZFcSiHRTf4Wb3PMdP74ILOM=; b=HpUx71KirWsJAcf4pb36ndXLN/j0F1XXi6pGHJ733kP1wlBCDuBM82L9p17Dgo1ec/ YgU4lJZDgQjqFOJAS77HsHufdBsi2GcUzJVCSC8NfHz29OmnAUNnM/bwfPd3Kuw3qEvn CPyneVNve3VBi9g5fRdDVlUQkW2zXo+U6PYI8OdDMwvGM69x7HCZO0h8u9piFpVzd+l/ Tf8tIalGsmOt+/r2XG0v0Ai6KiDYJ2yGpAAc97YUDQCYSZbZOvmjcTeOMd7jlSdgOUog di53EWmIovf2zT93xQ23lddsXjwQMFeccs+S8kOVE2gIqHmPk8S3w806JqDYIRfqN/v1 opiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075817; x=1778680617; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=X0ChLyLrnnWxFhFlsorIZFcSiHRTf4Wb3PMdP74ILOM=; b=m0tKJBh4y3wR9qytNIDSQ1o/a2AZPcXE/Oki7UOuCC5dioTxsDm/LwcZYEgyiCNjWK hIp54B0ideug7xFR/AIy1TYiCZkCHh6ag2qCKfgM/vKTMOWMnE29LEPcmlr/BKOJokqt ajjKycgROZFuIDvAUe/2o2qFgdZTU/P4BV3Vcziy0jeZACw+6kTF0Hl8qlFLsS79YXzI 6eZxnBZX8zPlow9hgtlRzlPQHSr5Riy405NwG6pgNu2/ePMMCHO14+SC5hBQqTcLThTc 9WC0Vv5cpo4Pkm6dtx+3u0Ar+m1c5Tx5zxCvIw2kZ5C8yoNn1tz7fawfVP6SzWi/TqlF 7v4w== X-Gm-Message-State: AOJu0YxxoYcJyqqo950TIR6OeCKY9qQASTNmc6DsQlXlhCgDLyLFcl+8 q0W9URyUWPmgAP+jOKUhVWm8Ni85XVgMg+YOXuBIP+eHX6AbxMf2rdB1N4JcwQP3ZNJbtgUdEp9 GZPmPZ+Q= X-Gm-Gg: AeBDiesvqLeeboPhb+3yhoTpBgbiJlNXymAhrm3Ac8oV8HM0lnUOVAjdvsDZLN/XkXL h0jLk7f+uyXJ2MF6SUPcUIdC9BK6v+WBZDbet5TJ7xVpEVKp2GFKd/VHGs0FiEtCYLhWIW7wMmn WznJZhqRNp9ZwCViMq+7fzSOPl/PHP29MOAWT9lNSs6sInfhFbW+h3JtckuAIff70RCu7GkhEKJ MihKyEaSfQYQyAuL9wEPvu+02lDa3F51PD2R64+0ZodJ702KtEz7/eeGHD+007/sxznruRE6zNd yzcl1rML41pcauhEH2IXPZwMcR4zBUgiA2toYUsoqsTo914VL2GPn5xrwEz2t8ZakV85LhE5zDd ffBXeOjCyf9lCCTM4K088PkQ6S+fWUJ7wGjhl6u+OAaqmhWU0LxJzZ8S+oeiQTYvTE2C7Gxr1Y1 NJpqLThPJMqtsEfskOwpi53INW/35n321x7NZotPn9sQCsz9HktB5+sd4CloHQGxY+rtNPgQWmL OVeMzNVEAU= X-Received: by 2002:a05:600d:644f:20b0:488:c21a:4754 with SMTP id 5b1f17b1804b1-48d143a4c1emr102969145e9.18.1778075816735; Wed, 06 May 2026 06:56:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 012/110] system/kvm_xen: Include missing 'exec/target_page.h' header Date: Wed, 6 May 2026 15:53:44 +0200 Message-ID: <20260506135524.20617-13-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1778075849460158500 The "exec/target_page.h" header is indirectly included. Include it explicitly otherwise we get when refactoring unrelated headers: include/system/kvm_xen.h:41:55: error: =E2=80=98TARGET_PAGE_BITS=E2=80=99= undeclared (first use in this function) 41 | #define XEN_SPECIAL_PFN(x) ((XEN_SPECIAL_AREA_ADDR >> TARGET_PAGE= _BITS) + \ | ^~~~~~~~~~~= ~~~~~ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-16-philmd@linaro.org> --- include/system/kvm_xen.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/system/kvm_xen.h b/include/system/kvm_xen.h index 7d0e69f1334..ed8c357193c 100644 --- a/include/system/kvm_xen.h +++ b/include/system/kvm_xen.h @@ -12,6 +12,8 @@ #ifndef QEMU_SYSTEM_KVM_XEN_H #define QEMU_SYSTEM_KVM_XEN_H =20 +#include "exec/target_page.h" + /* The KVM API uses these to indicate "no GPA" or "no GFN" */ #define INVALID_GPA UINT64_MAX #define INVALID_GFN UINT64_MAX --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075863; cv=none; d=zohomail.com; s=zohoarc; b=A2PNyIBsd4yCa3mi5tp9oLxkUDHLcZvGO+OvHgkKW79LlquohwEx1G2TbDJZLjrKoAyhvL1RT26nKFP5lAf0CfuL1O43BfyvOkI9S/nfHk/o1lgllo2g2Mhqr7Tp5l0cNIZC/kawhT6UU6P0dxloZuyskAm4sQch7EqSrwIqp9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075863; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=jn1u55xWzu0MsyEl19yV2ip/+YjodbZU5/4gzMB8MyU=; b=M4Z3kwAp00aEtk0Lw/gmeXqqIfzstOtlXLVMp8VQ944v+RIjSXzjr3l8hUrSzKDALXrKucInhpnbldyHJzGNmx5wxkQgurPsrh/7dXEZSE5frh6JBqM6HGBSTwg9PA7MfA1hltQ40bCersggorgP3rgYrc9/eUJLmQBTuxI5RA4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075863511669.4917439202353; Wed, 6 May 2026 06:57:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKckT-0002xc-Jo; Wed, 06 May 2026 09:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKckQ-0002Vc-0H for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:10 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKckN-00085v-Ik for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:09 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-48d102471a4so32440225e9.2 for ; Wed, 06 May 2026 06:57:07 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538aca14sm46296545e9.7.2026.05.06.06.57.02 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:57:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075825; x=1778680625; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jn1u55xWzu0MsyEl19yV2ip/+YjodbZU5/4gzMB8MyU=; b=KBUQi6odZypBO/JhPrFMPzgHjJdHKrEiPTL1J8QepVHKWnQgxCLUYPAkQY+sWSLwLz RkJAphSNIbBH8IMDrYJiFhDCIplMX5goKHGOe4kNly8KxiZ/ain+9YtFBEoTSK8nWz8t j8LMldJUJvOhhu2a34vmmr5aNN+4pn6eKZGrm7NfTeGm8O/zFFUTYyRzgma8N3jnlbcJ rZLZnzEAk5+Cr8Es/isV7Pcsaoi+F/pUf4vxl17Tn6wZt1FRn5x03Mc1derxe71rQyJ/ HC5wvTmn0y/JgdstxjayVhUr/YAivo7xeWJIOfd8LAx0rm6jvEoqetN6XIkHzPTynG84 pwXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075825; x=1778680625; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=jn1u55xWzu0MsyEl19yV2ip/+YjodbZU5/4gzMB8MyU=; b=ctZ1tGhJZieDNWqft0aydPryx7cvSIW1tdnj+jdcZe2gr/DxDu1L7iwHELi8cbKE1h 3TcUDOzPZ57FkIZ4XHlVEPj6eBgts+/2cH7aAUXN+wcrukXJ118BBrSodoxWzWOW7hBt AIUKul6o4zr3rckk99wSgp0Oz0JaO1LQuCtPWas+fcJ+AQ8Xp4u/cuI67ocJjhKZwfN6 DYddt9RBqOEzXWCqiQyitGZhr28P2RuK0RxmmbvAU+ieR/HCQAXVGGe36Vf+Ah4Eh26U om6D9mpjqNYAKxSN3GssIMCvsZgygO8pr7SPbN7fSFsD4cmshO4O7Ng6Rcw0fAu8kHR9 1mkQ== X-Gm-Message-State: AOJu0Yw9hHn7tHHlu0QsGTYkt+rKtHVxL/2fdWwBxm3kwdgZcYrM1ApR apWDH3ZOX1CQg9lDlbi/36oW8LpoWRe1Axsps2y/swkiFEgFVArbrk91qVQZUWwSgDiIjYH7c4K f4RFn1e0= X-Gm-Gg: AeBDieus2nMjdqSnVVBjFYugXSSasKVAyqjNe1XwBCmGffyyn0PvnLuf0Vtq14sY0DQ n6HZHFAU0GJP764+tbJVzrDfJsjYdb3fDuUZCdOWPG0LWAqmxmKBgOzMVpHFaCLPmaRBPErBHK7 r+5Esflkx6PAmSIvZSeHJaE7v2r9GaPJWEU7Yexw6nSfaxSIr42LCzgRnFUlUccmf4N4I6teWTP RdwPlT9tjSYdogLQGIHicYWv4hhgLxy2hBcjTyjMg9vdqBrgQKyFc8XRiAJGE623fbrLcx32t1f 19kiIMhkYWEPYKXJnZfj/5uoQ/sd/geXiwavfql413PV83Ow3rJL+DyKxidupkUFw6xvc5//NfL W8Ph/87i4DfczuIAbIvPdY99bE674L5Czyei1AfQ0egdr6rt1XSSF2ikkTNcJLXZ3eNSoeM7was +RvAiZtj1K67K/ZqOUzG83aWuKT7VqZPKtJ0y/PjITWbT+Fk6iE/eZeARm0dsxfqs+Uwx8UpRK8 HveC9xjzxE= X-Received: by 2002:a05:600c:8908:b0:48a:5821:5ff2 with SMTP id 5b1f17b1804b1-48e51f24340mr42275375e9.8.1778075824679; Wed, 06 May 2026 06:57:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 013/110] target/s390x/tcg: Include missing '*cpu.h' headers Date: Wed, 6 May 2026 15:53:45 +0200 Message-ID: <20260506135524.20617-14-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1778075865588158500 The "hw/core/cpu.h" header (declaring run_on_cpu_data) and "target/s390x/cpu.h" are indirectly included. Include them explicitly otherwise we get when refactoring unrelated headers: ../target/s390x/tcg/tcg_s390x.h:17:44: error: unknown type name 'CPUS390X= State'; did you mean 'CPUSH4State'? 17 | G_NORETURN void tcg_s390_program_interrupt(CPUS390XState *env, | ^~~~~~~~~~~~~ | CPUSH4State Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-18-philmd@linaro.org> --- target/s390x/tcg/tcg_s390x.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/s390x/tcg/tcg_s390x.h b/target/s390x/tcg/tcg_s390x.h index 7c8aede80d2..975f60085ac 100644 --- a/target/s390x/tcg/tcg_s390x.h +++ b/target/s390x/tcg/tcg_s390x.h @@ -13,6 +13,9 @@ #ifndef TCG_S390X_H #define TCG_S390X_H =20 +#include "target/s390x/cpu.h" +#include "hw/core/cpu.h" + void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque); G_NORETURN void tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code, uintptr_t ra); --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075863; cv=none; d=zohomail.com; s=zohoarc; b=nvI8d0NOG+xLWiJdc1NTq4nGYZu0bPC9QJ2niG0vGZqFgittvLmrapx6rwkW8y1svU50IdIMYn0z8FKfA7rP+U+6cj2xYQkaL7L6M+tbEdhz9JNhYp1junxk1Rqd55/ePogNIMB5cTDcy6bWKd8uDd4O+m9u8EN6fHd/XQsx7+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075863; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=9Qd6zcp9RiZdXoE6n5XVtyx6tpGhxU5ssW9UnbrdSnw=; b=OZZ/8FLUg1439jcMt1wyo8oJuXcXkY7DOa6jBzuEV362U7asLh8oJk4Kmg0Xe3oad6hnG8ag9XP1T2tj1aF+kjqHaQ4ZJSCLcwNaAwt1VR4wfHbKoSoeaDYuXLNk2di1xMEGtHe/uLqYTWEqsXGgEswZvu/x51nLEC3JI8vPkOY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075863903993.8374350558286; Wed, 6 May 2026 06:57:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKckZ-0003Ws-7Z; Wed, 06 May 2026 09:57:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKckX-0003Q2-7V for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:17 -0400 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 1wKckV-000878-Kf for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:16 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-488d2079582so67246925e9.2 for ; Wed, 06 May 2026 06:57:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45052a48b23sm13017139f8f.14.2026.05.06.06.57.10 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:57:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075833; x=1778680633; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9Qd6zcp9RiZdXoE6n5XVtyx6tpGhxU5ssW9UnbrdSnw=; b=Wgx63rCGKU/w7dcpj5LQFBZ9SX7hF1GFKUw570dMuR4JVkkvFJ0Lnj3IhvijpIAN+r ZfEJXRM+Ipucxn0MqF2Ia56CRmIQEnilZt8v185qHv1U6fqJhBIFkuLImQgj7mD3Wp42 ultgNB1cX00YoFr1oG/yghhp6uXj24PMjlKZDjA0zSnyyBFvBxY7W52kfwtoBco/mU/v nDNLAZGa0ZlpAAlbWvxCf0hLrPbrohGWVwdLgaYiKCxYJwzXBvXyIBkevDvsvUlmwlOo SGoLzUb0UB3tEKJnhziiesEcSl34t0EL1SlXhem7ZHjc8+8TCOOa/dZI0liMx+vXqfAE 1Q/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075833; x=1778680633; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=9Qd6zcp9RiZdXoE6n5XVtyx6tpGhxU5ssW9UnbrdSnw=; b=aMXWCWAFyLBnkQhULQaUWhYBDZiG3fmmJFE4ipiH6NmTGh+Ta3x3PFAVEPG/bcHNqh v8qrA4x3XN6V2XCCmSuZ3u2Px+iz8V2q4q4nGVh9Ug2yQZ4kSfHnnYHaGiNZWyTfQAB4 hccjhDy1ySCVix6fYUPyUk+HivNLyDYqXpjOstl2EyosILnxQi8s1JZyEq1IKCVIqaU/ TV7aVALSdWnHuvnCWMCenG7u7vCf00Jdz6A76300mr3f7gLk4VuIEoLLtqffSBIWonTY rp3Yg1GjOuz9wWcLReKIuGrfIhvFkX1x4qmyr4VT1YGu28GYXMbsmxV+o83GmSAtiOgl VPeQ== X-Gm-Message-State: AOJu0Yw8zVC6sWfcOUHjaVUVzWsRAZVnqjrCZ2IkqNlT4SnuZ5YGoCzR WOuzKVHs/tsqW9Z1Us+DW/Wkk+vURG5P3QmzG+RttbJ6yFhhSYBCHFzun/8VFVqZeoEBcJCR/fJ 9vrO8TcU= X-Gm-Gg: AeBDies54avFhizKvVc5c4P43jQEzZGpF88CQdfXPd+m0CIzo80eIaYqWPKgZFnO/QK 9kotZr7nll3SL0US8PcHrVVhojWVK3QTIVYc1VNZI4V4ddHsL7XO5ay0CnUAG9bdwmrV/pDfyAv lgCxB6G0HeKUpCqv9DVjG0+gIX8oXcLkDbDd8htlotVEsiNr1DC/CiVMXa44C1noccGNH6+8SqY rJju3mkhK6i0zjEEFJ/G9ySlk0Ke9rE7TxVj9qc39pcFyXLKcbHSKHVhvBFQXnhEULzGNtX3Uy/ yCfS7GcI3XYtRS1w9c89pH0HC0aQs7hLS2eKNc6XDzaYB4CN/UjFfGhpsYerp/7mtJEPrS/r03O s1cTJeaHyMNiRkmkj+vIeuDlBHLxpiS0hpJxLc4vsWt1MclGwv79MgBn5d4U+iFWsVOflP9OSBA z5EjID43p4+WFiJefxUe1m/u3SCngIDoIB121B2QSaImQwd/L1nUgffYqLlAJAlrmBeTbLUR93B FmH7eN8H+w= X-Received: by 2002:a05:600c:4343:b0:48a:563c:c8c5 with SMTP id 5b1f17b1804b1-48e51e15662mr31870205e9.8.1778075832598; Wed, 06 May 2026 06:57:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 014/110] exec/helper-head: Include missing 'exec/target_long.h' header Date: Wed, 6 May 2026 15:53:46 +0200 Message-ID: <20260506135524.20617-15-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778075866076154100 TARGET_LONG_BITS is defined in "exec/target_long.h" (which is currently included implicitly by various headers). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-19-philmd@linaro.org> --- include/exec/helper-head.h.inc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/include/exec/helper-head.h.inc b/include/exec/helper-head.h.inc index 5b248fd7138..7dec5f5b067 100644 --- a/include/exec/helper-head.h.inc +++ b/include/exec/helper-head.h.inc @@ -46,14 +46,13 @@ #define dh_ctype(t) dh_ctype_##t =20 #ifdef COMPILING_PER_TARGET -# ifdef TARGET_LONG_BITS -# if TARGET_LONG_BITS =3D=3D 32 -# define dh_alias_tl i32 -# define dh_typecode_tl dh_typecode_i32 -# else -# define dh_alias_tl i64 -# define dh_typecode_tl dh_typecode_i64 -# endif +# include "exec/target_long.h" +# if TARGET_LONG_BITS =3D=3D 32 +# define dh_alias_tl i32 +# define dh_typecode_tl dh_typecode_i32 +# else +# define dh_alias_tl i64 +# define dh_typecode_tl dh_typecode_i64 # endif # define dh_ctype_tl target_ulong #endif /* COMPILING_PER_TARGET */ --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075858; cv=none; d=zohomail.com; s=zohoarc; b=W7pqEhIDUhUH+YZpONvcTIiwWu/MXj+zskdzYORb37PUKaqXynGzdaQYROa500U8aSy4fE605E/E+fTDfZ87HSHfQyToWwCUZA8fTXIQnKqgaYR4C3VUTpv1Ko/xs4nbCm6APtosHdgQoh7+9Nf5Zk4Znx0lIDM6KngjF9RA6GY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075858; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=EfrcVSX6J2/8Is5CIR1OlIYl1W02vIXtlF5jlh3xIlY=; b=YRObGlyxrEz4U16ha7BWAwT/OPG1uU2MHBjNEeO+OdEuNjqA6p59UVbBRwYAABuuKtx9aGl0rBe6BFix9hr7H1+NMMn1C4Vl+/Lu7Hu/BoNXwaOhvFuq+grILuiXtCHKeOQtaacipFSLufwOSQKecdagOv2Y6q7DGF4CYBLmwkY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075858446150.24285005236015; Wed, 6 May 2026 06:57:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcki-0004Ka-3D; Wed, 06 May 2026 09:57:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKckf-00045F-Gh for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:26 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKckc-00087l-U3 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:24 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-488ba840146so57310105e9.1 for ; Wed, 06 May 2026 06:57:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5311f891sm28479385e9.4.2026.05.06.06.57.18 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:57:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075840; x=1778680640; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EfrcVSX6J2/8Is5CIR1OlIYl1W02vIXtlF5jlh3xIlY=; b=E6gRRQ4neVQM8Zxngu5myILnpT4Q30ZkJRGP8aOF6pyuyyM/+T3h0xVARCAQmMXVyD REHW6rMoiWTkiybDZKvKyD8UAcmbPlSjilNo9xAgvG20zs1+jFSQXQ0cefJinH1ADPnE pe1q2FNsJLeBW39bJtJpuUXoYEnozxe3hbiCi24OPGC/z4tkFsHYN9MfuFwU6UFPHasC wMtiebRTkenT6v95bfLqXL3oIurOtsklO6HTmylLDGJ5ZNy6UkdpSvby0LCpOVRXG4XF dgc+KiWhvrvpJtVyVPRkX4PCIeTWR0KJ08YPMhfXGDkYXSuGriLY5RWDRH8SGF71kHof 2L8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075840; x=1778680640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=EfrcVSX6J2/8Is5CIR1OlIYl1W02vIXtlF5jlh3xIlY=; b=Z5mac2tTjzv8UJORiqtwjRTVZzT83VnORu17OQvXmWUzkHzHR+Mtq2ElAba/l2w3x0 uldOVnh7HM0hzoIf/a4Yaw6PYjfrUlolGblX38OVwlRdhoaQcYqy72nd/8d1Yldm8xjQ e1uOEZpP20iFZ2zm6SxqT/wx0SOIZZFxF69q4IrOwTudpxcy3ldNnSNZ6nfyCzAlqMMF 50QY5xRbgGZ7yV3Z3zfCsVO7hhDERp9s6sYg1KRqLEUUGtBxZrMwvAJFTrZuvybMuY3s BvOq6gbdHWxy1hCh5PMDDueLCBKN3oEZRyn5O94+ZihkgWJNiSIvb1fseQH5bRPOaGx3 Y+ew== X-Gm-Message-State: AOJu0YztbVJtutAwtMTiuem+SOhtFTe3v13fdfJXgqBatSAJNCRp0GZ6 rrJRGpbBqSe75/DaYWCaN9w3T93dxOXSnEMrnTmYeivC/5Lw5sfvOkUglAXz0fU8YICvcXGSH92 C0rGi+nE= X-Gm-Gg: AeBDiesm8mD1FaAZy1MO34t7yQEU9cNs3b6Croc18+Cy7SGIHY+x1gI3Jt6gn/c5NIk rIjDCwzzW9D8wnV04HOvsp1irm27KCDoFaKnk5zZIL+r5M6nuC5aNmUssM6GR4sAQM+rB5fcPGR HXP8Io1i0zfrdehSEHj0yBacTQz/tZ8RmwWqQx/c47/p5vEBG+AaSddDwx8hCiOkeNYXcbb+f8S blJC+grF6hJErzWUF9RyMjTON/61HIUvtEklTnNzP6klWfUOY5SvMnLEil2dgPNdJNPt9Jg22iA qPLnLDtNI1PN5HD499O6Yzda8nU3aJXD21FYj9k5XL00fxS7Fo+9gWLrgi2Sq1/DYF8X/QUj6QV 7YZ59lQkSJiJwiejpQjsS9iXXC6v8VJihK3eguxTk7Gv7TXTMzQHxebKBVfhf7TynMbZVo7Uq71 x2m3fY1Qe6M+LJU7vf1JjREEB/FE1wg5bXr6TLrnzQ9bfACLLklXdS0oHnWMqx4zO4m5sn8ASUR VMgy0/IX850nEhaPYGMkQ== X-Received: by 2002:a05:600c:8b04:b0:488:bfc3:efc with SMTP id 5b1f17b1804b1-48e51dd69d6mr61235605e9.0.1778075840125; Wed, 06 May 2026 06:57:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 015/110] target/cpu: Do not include 'exec/cpu-defs.h' anymore Date: Wed, 6 May 2026 15:53:47 +0200 Message-ID: <20260506135524.20617-16-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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: 1778075859660158500 Nothing in all our target "cpu.h" directly uses definitions from "exec/cpu-defs.h": no need to include it there. This remove a lot of target-specificities, simplifying inclusion of target "cpu.h" by common code. Inspired-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260313062055.2188-20-philmd@linaro.org> --- target/alpha/cpu.h | 1 - target/arm/cpu.h | 1 - target/avr/cpu.h | 1 - target/hexagon/cpu.h | 1 - target/hppa/cpu.h | 1 - target/i386/cpu.h | 1 - target/loongarch/cpu.h | 1 - target/m68k/cpu.h | 1 - target/microblaze/cpu.h | 1 - target/mips/cpu.h | 1 - target/or1k/cpu.h | 1 - target/ppc/cpu.h | 1 - target/riscv/cpu.h | 1 - target/rx/cpu.h | 1 - target/s390x/cpu.h | 1 - target/sh4/cpu.h | 1 - target/sparc/cpu.h | 1 - target/tricore/cpu.h | 1 - 18 files changed, 18 deletions(-) diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index b530cd0088b..2f611397782 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -22,7 +22,6 @@ =20 #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" =20 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 5e4f12f1e77..0b9755533b0 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -25,7 +25,6 @@ #include "hw/core/registerfields.h" #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/gdbstub.h" #include "exec/page-protection.h" diff --git a/target/avr/cpu.h b/target/avr/cpu.h index 518e243d812..3da885c7ccb 100644 --- a/target/avr/cpu.h +++ b/target/avr/cpu.h @@ -23,7 +23,6 @@ =20 #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "system/memory.h" =20 diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index faa07a6e05b..7c09c97db85 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -22,7 +22,6 @@ =20 #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/target_long.h" #include "hex_regs.h" #include "mmvec/mmvec.h" diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 6ea4c9b6826..85f39401423 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -22,7 +22,6 @@ =20 #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/target_long.h" #include "system/memory.h" diff --git a/target/i386/cpu.h b/target/i386/cpu.h index fd8d98a4bdd..f57c99e8b4e 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -24,7 +24,6 @@ #include "cpu-qom.h" #include "kvm/hyperv-proto.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/target_long.h" #include "exec/memop.h" diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h index 4d333806ed8..096d7789285 100644 --- a/target/loongarch/cpu.h +++ b/target/loongarch/cpu.h @@ -10,7 +10,6 @@ =20 #include "qemu/int128.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "fpu/softfloat-types.h" #include "hw/core/registerfields.h" diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 7911ab9de30..d7f508a9e80 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -22,7 +22,6 @@ #define M68K_CPU_H =20 #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" #include "cpu-qom.h" diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 5a856edaaa9..5765786e6dc 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -22,7 +22,6 @@ =20 #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "qemu/cpu-float.h" #include "exec/cpu-interrupt.h" =20 diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 3517d2d42cf..17e9f6039ec 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -3,7 +3,6 @@ =20 #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/target_long.h" #ifndef CONFIG_USER_ONLY diff --git a/target/or1k/cpu.h b/target/or1k/cpu.h index c8e2827930b..5bb39b67519 100644 --- a/target/or1k/cpu.h +++ b/target/or1k/cpu.h @@ -22,7 +22,6 @@ =20 #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "fpu/softfloat-types.h" =20 diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index a0df7a467ed..aba8109bbba 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -23,7 +23,6 @@ #include "qemu/int128.h" #include "qemu/cpu-float.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/target_long.h" #include "cpu-qom.h" diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index df55a77c403..e42f3694089 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -24,7 +24,6 @@ #include "hw/core/registerfields.h" #include "hw/core/qdev-properties.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/gdbstub.h" #include "exec/target_long.h" diff --git a/target/rx/cpu.h b/target/rx/cpu.h index b3b1ecff5af..b500b7a2474 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -24,7 +24,6 @@ #include "cpu-qom.h" =20 #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" =20 diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 40bc1f0741d..3acbe83f0fc 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -28,7 +28,6 @@ #include "cpu-qom.h" #include "cpu_models.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" #include "qapi/qapi-types-machine-common.h" diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index b0759010c47..e36268b4256 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -22,7 +22,6 @@ =20 #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" =20 diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 155aa8ec637..ac0eb9f0faa 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -3,7 +3,6 @@ =20 #include "qemu/bswap.h" #include "cpu-qom.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/target_long.h" #include "qemu/cpu-float.h" diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index ab46192e261..604fb7792c6 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -23,7 +23,6 @@ #include "cpu-qom.h" #include "hw/core/registerfields.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "qemu/cpu-float.h" #include "tricore-defs.h" =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075864; cv=none; d=zohomail.com; s=zohoarc; b=PY4QmAkbHq+8wO9wThHyrVKiIYV2wYHhUzf+n4hvuun4+qN7C+vkFt29MP3UM6zkn+qru1Yoy3vO34kilnZBSQ0ffivI9gpKTPE7osSEwzGEyQyxvofAYWmy884aiunqQPdGdAf8hzSwBkNjmyrigsYgReDBEViAFSEzqpB9aNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075864; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=C0oXVvaWscf+akuMspWClDbckUbZlXEyfzZvyM8gMlw=; b=PT70i/5ot4CFbC1QOlbp0ZduTeenxfZFKTRjbF4nVmWpE7ZDltFqTxlCR5urM/JeXC7NidZJOvr8gMZUY2u0Fi0BFYmcyoQhPyhBg5n7sW3cLUPX7I0x1cHwxkBvdZdjjhEFCzXmF+K9yKEHdkuU1SBqb2iBLHGuzw2We3gYpJw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075864460532.3235556975548; Wed, 6 May 2026 06:57:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKckt-00059o-Ta; Wed, 06 May 2026 09:57:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKckm-0004tA-Qb for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:35 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKckj-00088b-W5 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:32 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so72840235e9.2 for ; Wed, 06 May 2026 06:57:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538a517bsm52623075e9.4.2026.05.06.06.57.25 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075847; x=1778680647; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=C0oXVvaWscf+akuMspWClDbckUbZlXEyfzZvyM8gMlw=; b=vciyK8VTnrLN64fV4nWeyOaWdi/Yb9IDskFKbHDeJLm6spYbyh1VdKcHtoTC/gpjdL hNWj9NYfkmKNrxVWgF0wLHro5OKFpPo4/dn3AxvZv0fQ0nW+KE6ssePfKALOesXsWGpM eSDmxN4PGBeVKY2CUBBgXAJaDiwt7Uyhc/Dp/xVSocPFQJ3QJstMDSZ8kPa3ezFeZ3zd XoB6m6m15XUysf9/cxfduNM5dxcl9DX02ch1QNNDqNyfTt2qIiy09KjfEyyZvDU9p4jC lIQ7KBmvmJGdk0Uam0uwsTwye02W0mfHbghKkMdmosUUt0W9JtyDEQEtZIvKNtlJDFL1 eOAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075847; x=1778680647; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=C0oXVvaWscf+akuMspWClDbckUbZlXEyfzZvyM8gMlw=; b=izhfmz6wefrK6q115qw8LC/ZpT1dNUSFirc2WV3EU1vein+6ILrMYeFBJ5AriUpU9N qSfy0ygqVFh0BgNrO3oWkGj0qjGipuJk6fl5j0Sl8On1zPaZwJ2aJ/0zTCselaMlcFMT XhiZaJhoGSvhbhPAUWyvpO9CYip0vmkVGdph8REtyr3PcCFBznTyZ6XU6s/KcTU9Pal5 mimm37M5H3UVgJjcNhUzrVxmzL0REnzsINRzaFFmcbMJGzYm+969zGMBLqiterfDmolX ZZzMHcu5tjHXFpZ+TvcBanNcvwVojAB8Pg47GQ0Cq5xqfnmgA/9PpiGIS5TynqTKIy7C ywew== X-Gm-Message-State: AOJu0YxJOOhYI+CmtvdHxyBXLFkXxSs9DTdIPOhSh+uE5NcMVb7aAiO9 MoRUYiqfmiV+iOYOTyJX4rKLOROZxfgXD2qQ24kPSDfT/LpBFWu8mVBYa5pc743xtj0fpHSzMKm FzzSiJyA= X-Gm-Gg: AeBDievI1OBliQzG2O0glICE2BmH6QwVp4R2/1DTHzyS8Amu3RxjvJdA75WmDWdMT4E BDZcWlxmPHUVQq1IusI1VB840MeFpKxCvCyI6/j1fJybSjia9Xdhfg6SUAtTLZlGml9Ku99TUXw GehZCaQrZlW5G/qL8iWs2sQjTonVD53YrqF/9A0fHEs6FZawHu/mdHtL8DEchJ/SaW/EUMSBDTl vk9R56bvRv4vKxCkoylXNyREIVej0JOmwuGaMLAjRHKwEQz3O9wFxFQ7kiD1xEGtet0VjkvAbch CgCSsP1mHHqO6kfpgBwlc00JlC3wbj8LddpMXtFyC3ggQ6PL0CEl+Zd9P+Wg6p09Wvv/xwsYH60 GxCuI80QGnenTiL1YrjT/m+idaiiem+SAuS3RVO7uP9dH+c7OeJiK5FnBlS9cm++tDb0ntykZqu +ao/7MANZ9gVZwJkn7FduWsN+/UmEFc05czqalcRjHxOzFxkN4kCNSD19RT5XVZCLNZEOEwimDr z0i2Icg0Ao= X-Received: by 2002:a05:600c:c494:b0:489:e126:b757 with SMTP id 5b1f17b1804b1-48e51f41be6mr57362585e9.25.1778075847297; Wed, 06 May 2026 06:57:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 016/110] target/mips: Move 'mvp' field from CPUMIPSState to MIPSCPU Date: Wed, 6 May 2026 15:53:48 +0200 Message-ID: <20260506135524.20617-17-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: 1778075865713158500 From: Peter Maydell The 'mvp' field in the CPUMIPSState is a pointer to memory allocated in mvp_init(). This is in theory fine, but in practice it clashes with the current linux-user implementation of cpu_copy(), which assumes it can do a shallow memcpy() copy of the CPU env struct in order to clone the CPU when creating a new thread. Almost all of the MIPS env struct is actually memcpy() copyable; one of the exceptions is the mvp pointer. We don't need this to be in the env struct; move it to the CPU object struct instead. At the moment the memcpy() of the env->mvp pointer doesn't have any obvious ill-effects, because we never free the memory and it doesn't contain anything that varies at runtime for user-mode. So thread 2 ends up pointing at thread 1's mvp struct, but it still works OK. However, we would like to free the mvp memory to avoid a leak when a user-mode thread exits, and unless we avoid the shallow copy this will end up with a double-free when both thread 1 and thread 2 free the same mvp struct. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260317175031.3035740-2-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/cpu.h | 3 ++- target/mips/internal.h | 3 ++- hw/mips/malta.c | 4 ++-- target/mips/cpu.c | 2 +- target/mips/system/machine.c | 2 +- target/mips/tcg/system/cp0_helper.c | 35 ++++++++++++++++++----------- target/mips/tcg/translate.c | 6 +++-- target/mips/cpu-defs.c.inc | 10 +++++---- 8 files changed, 40 insertions(+), 25 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 17e9f6039ec..42c5ca89154 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1174,7 +1174,6 @@ typedef struct CPUArchState { struct {} end_reset_fields; =20 /* Fields from here on are preserved across CPU reset. */ - CPUMIPSMVPContext *mvp; #if !defined(CONFIG_USER_ONLY) CPUMIPSTLBContext *tlb; qemu_irq irq[8]; @@ -1209,6 +1208,8 @@ struct ArchCPU { Clock *clock; Clock *count_div; /* Divider for CP0_Count clock */ =20 + CPUMIPSMVPContext *mvp; + /* Properties */ bool is_big_endian; }; diff --git a/target/mips/internal.h b/target/mips/internal.h index 28eb28936ba..95b8b7bb9c9 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -246,10 +246,11 @@ static inline void restore_pamask(CPUMIPSState *env) =20 static inline int mips_vpe_active(CPUMIPSState *env) { + MIPSCPU *cpu =3D env_archcpu(env); int active =3D 1; =20 /* Check that the VPE is enabled. */ - if (!(env->mvp->CP0_MVPControl & (1 << CP0MVPCo_EVP))) { + if (!(cpu->mvp->CP0_MVPControl & (1 << CP0MVPCo_EVP))) { active =3D 0; } /* Check that the VPE is activated. */ diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 0cbe9956e74..845b8d339e8 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -968,10 +968,10 @@ static void malta_mips_config(MIPSCPU *cpu) CPUState *cs =3D CPU(cpu); =20 if (ase_mt_available(env)) { - env->mvp->CP0_MVPConf0 =3D deposit32(env->mvp->CP0_MVPConf0, + cpu->mvp->CP0_MVPConf0 =3D deposit32(cpu->mvp->CP0_MVPConf0, CP0MVPC0_PTC, 8, smp_cpus * cs->nr_threads - 1); - env->mvp->CP0_MVPConf0 =3D deposit32(env->mvp->CP0_MVPConf0, + cpu->mvp->CP0_MVPConf0 =3D deposit32(cpu->mvp->CP0_MVPConf0, CP0MVPC0_PVPE, 4, smp_cpus - 1); } } diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 5f88c077dbf..789ca188b5e 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -339,7 +339,7 @@ static void mips_cpu_reset_hold(Object *obj, ResetType = type) =20 if (cs->cpu_index =3D=3D 0) { /* VPE0 starts up enabled. */ - env->mvp->CP0_MVPControl |=3D (1 << CP0MVPCo_EVP); + cpu->mvp->CP0_MVPControl |=3D (1 << CP0MVPCo_EVP); env->CP0_VPEConf0 |=3D (1 << CP0VPEC0_MVP) | (1 << CP0VPEC0_VP= A); =20 /* TC0 starts up unhalted. */ diff --git a/target/mips/system/machine.c b/target/mips/system/machine.c index 473d3ab0363..0a32665f835 100644 --- a/target/mips/system/machine.c +++ b/target/mips/system/machine.c @@ -251,7 +251,7 @@ const VMStateDescription vmstate_mips_cpu =3D { CPUMIPSFPUContext), =20 /* MVP */ - VMSTATE_STRUCT_POINTER(env.mvp, MIPSCPU, vmstate_mvp, + VMSTATE_STRUCT_POINTER(mvp, MIPSCPU, vmstate_mvp, CPUMIPSMVPContext), =20 /* TLB */ diff --git a/target/mips/tcg/system/cp0_helper.c b/target/mips/tcg/system/c= p0_helper.c index b69e70d7fcf..123d5c217c1 100644 --- a/target/mips/tcg/system/cp0_helper.c +++ b/target/mips/tcg/system/cp0_helper.c @@ -229,17 +229,20 @@ uint32_t cpu_mips_get_random(CPUMIPSState *env) /* CP0 helpers */ target_ulong helper_mfc0_mvpcontrol(CPUMIPSState *env) { - return env->mvp->CP0_MVPControl; + MIPSCPU *cpu =3D env_archcpu(env); + return cpu->mvp->CP0_MVPControl; } =20 target_ulong helper_mfc0_mvpconf0(CPUMIPSState *env) { - return env->mvp->CP0_MVPConf0; + MIPSCPU *cpu =3D env_archcpu(env); + return cpu->mvp->CP0_MVPConf0; } =20 target_ulong helper_mfc0_mvpconf1(CPUMIPSState *env) { - return env->mvp->CP0_MVPConf1; + MIPSCPU *cpu =3D env_archcpu(env); + return cpu->mvp->CP0_MVPConf1; } =20 target_ulong helper_mfc0_random(CPUMIPSState *env) @@ -514,6 +517,7 @@ void helper_mtc0_index(CPUMIPSState *env, target_ulong = arg1) =20 void helper_mtc0_mvpcontrol(CPUMIPSState *env, target_ulong arg1) { + MIPSCPU *cpu =3D env_archcpu(env); uint32_t mask =3D 0; uint32_t newval; =20 @@ -521,14 +525,14 @@ void helper_mtc0_mvpcontrol(CPUMIPSState *env, target= _ulong arg1) mask |=3D (1 << CP0MVPCo_CPA) | (1 << CP0MVPCo_VPC) | (1 << CP0MVPCo_EVP); } - if (env->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) { + if (cpu->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) { mask |=3D (1 << CP0MVPCo_STLB); } - newval =3D (env->mvp->CP0_MVPControl & ~mask) | (arg1 & mask); + newval =3D (cpu->mvp->CP0_MVPControl & ~mask) | (arg1 & mask); =20 /* TODO: Enable/disable shared TLB, enable/disable VPEs. */ =20 - env->mvp->CP0_MVPControl =3D newval; + cpu->mvp->CP0_MVPControl =3D newval; } =20 void helper_mtc0_vpecontrol(CPUMIPSState *env, target_ulong arg1) @@ -616,10 +620,11 @@ void helper_mttc0_vpeconf0(CPUMIPSState *env, target_= ulong arg1) =20 void helper_mtc0_vpeconf1(CPUMIPSState *env, target_ulong arg1) { + MIPSCPU *cpu =3D env_archcpu(env); uint32_t mask =3D 0; uint32_t newval; =20 - if (env->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) + if (cpu->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) mask |=3D (0xff << CP0VPEC1_NCX) | (0xff << CP0VPEC1_NCP2) | (0xff << CP0VPEC1_NCP1); newval =3D (env->CP0_VPEConf1 & ~mask) | (arg1 & mask); @@ -689,10 +694,11 @@ void helper_mttc0_tcstatus(CPUMIPSState *env, target_= ulong arg1) =20 void helper_mtc0_tcbind(CPUMIPSState *env, target_ulong arg1) { + MIPSCPU *cpu =3D env_archcpu(env); uint32_t mask =3D (1 << CP0TCBd_TBE); uint32_t newval; =20 - if (env->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) { + if (cpu->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) { mask |=3D (1 << CP0TCBd_CurVPE); } newval =3D (env->active_tc.CP0_TCBind & ~mask) | (arg1 & mask); @@ -705,8 +711,9 @@ void helper_mttc0_tcbind(CPUMIPSState *env, target_ulon= g arg1) uint32_t mask =3D (1 << CP0TCBd_TBE); uint32_t newval; CPUMIPSState *other =3D mips_cpu_map_tc(env, &other_tc); + MIPSCPU *other_cpu =3D env_archcpu(other); =20 - if (other->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) { + if (other_cpu->mvp->CP0_MVPControl & (1 << CP0MVPCo_VPC)) { mask |=3D (1 << CP0TCBd_CurVPE); } if (other_tc =3D=3D other->current_tc) { @@ -1560,14 +1567,15 @@ target_ulong helper_emt(void) target_ulong helper_dvpe(CPUMIPSState *env) { CPUState *other_cs =3D first_cpu; - target_ulong prev =3D env->mvp->CP0_MVPControl; + MIPSCPU *cpu =3D env_archcpu(env); + target_ulong prev =3D cpu->mvp->CP0_MVPControl; =20 if (env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) { CPU_FOREACH(other_cs) { MIPSCPU *other_cpu =3D MIPS_CPU(other_cs); /* Turn off all VPEs except the one executing the dvpe. */ if (&other_cpu->env !=3D env) { - other_cpu->env.mvp->CP0_MVPControl &=3D ~(1 << CP0MVPCo_EV= P); + other_cpu->mvp->CP0_MVPControl &=3D ~(1 << CP0MVPCo_EVP); mips_vpe_sleep(other_cpu); } } @@ -1578,7 +1586,8 @@ target_ulong helper_dvpe(CPUMIPSState *env) target_ulong helper_evpe(CPUMIPSState *env) { CPUState *other_cs =3D first_cpu; - target_ulong prev =3D env->mvp->CP0_MVPControl; + MIPSCPU *cpu =3D env_archcpu(env); + target_ulong prev =3D cpu->mvp->CP0_MVPControl; =20 if (env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) { CPU_FOREACH(other_cs) { @@ -1588,7 +1597,7 @@ target_ulong helper_evpe(CPUMIPSState *env) /* If the VPE is WFI, don't disturb its sleep. */ && !mips_vpe_is_wfi(other_cpu)) { /* Enable the VPE. */ - other_cpu->env.mvp->CP0_MVPControl |=3D (1 << CP0MVPCo_EVP= ); + other_cpu->mvp->CP0_MVPControl |=3D (1 << CP0MVPCo_EVP); mips_vpe_wake(other_cpu); /* And wake it up. */ } } diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index 3426acd37b4..e334cf98b78 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -8085,6 +8085,7 @@ cp0_unimplemented: static void gen_mftr(CPUMIPSState *env, DisasContext *ctx, int rt, int rd, int u, int sel, int h) { + MIPSCPU *cpu =3D env_archcpu(env); int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); TCGv t0 =3D tcg_temp_new(); =20 @@ -8093,7 +8094,7 @@ static void gen_mftr(CPUMIPSState *env, DisasContext = *ctx, int rt, int rd, (env->active_tc.CP0_TCBind & (0xf << CP0TCBd_CurVPE)))) { tcg_gen_movi_tl(t0, -1); } else if ((env->CP0_VPEControl & (0xff << CP0VPECo_TargTC)) > - (env->mvp->CP0_MVPConf0 & (0xff << CP0MVPC0_PTC))) { + (cpu->mvp->CP0_MVPConf0 & (0xff << CP0MVPC0_PTC))) { tcg_gen_movi_tl(t0, -1); } else if (u =3D=3D 0) { switch (rt) { @@ -8309,6 +8310,7 @@ die: static void gen_mttr(CPUMIPSState *env, DisasContext *ctx, int rd, int rt, int u, int sel, int h) { + MIPSCPU *cpu =3D env_archcpu(env); int other_tc =3D env->CP0_VPEControl & (0xff << CP0VPECo_TargTC); TCGv t0 =3D tcg_temp_new(); =20 @@ -8319,7 +8321,7 @@ static void gen_mttr(CPUMIPSState *env, DisasContext = *ctx, int rd, int rt, /* NOP */ ; } else if ((env->CP0_VPEControl & (0xff << CP0VPECo_TargTC)) > - (env->mvp->CP0_MVPConf0 & (0xff << CP0MVPC0_PTC))) { + (cpu->mvp->CP0_MVPConf0 & (0xff << CP0MVPC0_PTC))) { /* NOP */ ; } else if (u =3D=3D 0) { diff --git a/target/mips/cpu-defs.c.inc b/target/mips/cpu-defs.c.inc index d93b9d341ac..faefab04738 100644 --- a/target/mips/cpu-defs.c.inc +++ b/target/mips/cpu-defs.c.inc @@ -1034,7 +1034,9 @@ static void fpu_init (CPUMIPSState *env, const mips_d= ef_t *def) =20 static void mvp_init(CPUMIPSState *env) { - env->mvp =3D g_malloc0(sizeof(CPUMIPSMVPContext)); + MIPSCPU *cpu =3D env_archcpu(env); + + cpu->mvp =3D g_malloc0(sizeof(CPUMIPSMVPContext)); =20 if (!ase_mt_available(env)) { return; @@ -1044,7 +1046,7 @@ static void mvp_init(CPUMIPSState *env) programmable cache partitioning implemented, number of allocatable and shareable TLB entries, MVP has allocatable TCs, 2 VPEs implemented, 5 TCs implemented. */ - env->mvp->CP0_MVPConf0 =3D (1U << CP0MVPC0_M) | (1 << CP0MVPC0_TLBS) | + cpu->mvp->CP0_MVPConf0 =3D (1U << CP0MVPC0_M) | (1 << CP0MVPC0_TLBS) | (0 << CP0MVPC0_GS) | (1 << CP0MVPC0_PCP) | // TODO: actually do 2 VPEs. // (1 << CP0MVPC0_TCA) | (0x1 << CP0MVPC0_PVPE= ) | @@ -1053,12 +1055,12 @@ static void mvp_init(CPUMIPSState *env) (0x00 << CP0MVPC0_PTC); #if !defined(CONFIG_USER_ONLY) /* Usermode has no TLB support */ - env->mvp->CP0_MVPConf0 |=3D (env->tlb->nb_tlb << CP0MVPC0_PTLBE); + cpu->mvp->CP0_MVPConf0 |=3D (env->tlb->nb_tlb << CP0MVPC0_PTLBE); #endif =20 /* Allocatable CP1 have media extensions, allocatable CP1 have FP supp= ort, no UDI implemented, no CP2 implemented, 1 CP1 implemented. */ - env->mvp->CP0_MVPConf1 =3D (1U << CP0MVPC1_CIM) | (1 << CP0MVPC1_CIF) | + cpu->mvp->CP0_MVPConf1 =3D (1U << CP0MVPC1_CIM) | (1 << CP0MVPC1_CIF) | (0x0 << CP0MVPC1_PCX) | (0x0 << CP0MVPC1_PCP2= ) | (0x1 << CP0MVPC1_PCP1); } --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075870; cv=none; d=zohomail.com; s=zohoarc; b=ZVFo7TKv1TGLqZdF933msSkA0DJlJRQvH5YQql03JEbVYpytCRCTIzMmap58kZSSgNNU/VCytYiKR3YG9LWX3Y1oms2AJpWcucDb2i/U7alO1oWXChqiH3j262F50z5Uh5ERr4VIzaBXM5Lhu/YeB3L/fsIRTKc7jsNiOOfeJ5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075870; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=W6A7GgrsjueT0xS7mHR1GVHfsU+Z/AFvXxLf0nDYqIU=; b=e/Uz8i/pwgGcqomRgrOXkPFIp/oAwWo4HKXGyHTAWJyJj6vhIliIcN+2AzT3d381PFlqHrwc2wq0TPK4NVEECU3YLXZIQytIz0z+62ovVpwtWZW5FWoIstQpYT6EYZKRzHBdP5UNcUXBE4rTp+pGVYH7HeaZbWsT3toADMs4WvM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075870313798.6111794385231; Wed, 6 May 2026 06:57:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKckw-0005US-PS; Wed, 06 May 2026 09:57:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKckt-00056r-H4 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:39 -0400 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 1wKckr-00089j-C4 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:39 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-48374014a77so76873235e9.3 for ; Wed, 06 May 2026 06:57:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538c4ae1sm47066845e9.12.2026.05.06.06.57.33 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075855; x=1778680655; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=W6A7GgrsjueT0xS7mHR1GVHfsU+Z/AFvXxLf0nDYqIU=; b=iyV9hyKC/DJUhdCMvYxqBO+lOaLdwPSaJ+XC0uQLl2iEercUspfAZJQRxTw1UGZEUu paxoGNNmFSmi4A4p14opGK180KDDA1hdubO+fp+2/43F2fpWkogr364nvRxTTooOb5s/ 2yXHGpxuhT1nAXn4p43bE9rRTsLgEXoswYRY+SjIBcUBQhwpJlslH6gnV7zGBM48N7ZZ mni+dbM7FhYwz2Zw+tsMPw5EX00UCDp7Pmp5ZsgPv7AH2JOVNfSd7PK0hSPTrnASvNs8 0V3f4GIEgrmBN2iwvapBd1SkTYYik6TXAtJDawzjjyMyCB71piF76CO8Je6fx+7jqhUe A9mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075855; x=1778680655; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=W6A7GgrsjueT0xS7mHR1GVHfsU+Z/AFvXxLf0nDYqIU=; b=qWaVj0FKybKPPdX6UPJKQdd5PW+zWTylKPe2bvoHbMeQVEdGByYcPqvC4el1Q5znMB +Lu0LE1uFr5F/xauaM7VZXkwvzyYH32ni70H/Azbg8GoUXuPbyOtrwgH8FHZoLUNHpWq wCeGwGHUah63hfxNQA9KmOj4/h/Wsgui0xkzu+U+DPRbqYlomjjyjDDisV+AvRPOFgV6 szf//2daT0hxQo60txmq1rej9KB/W7Bm8Gpx57KSMENROXFEIdLtT3nSemksUjF4WY5O lC0VbGz3erJeMb3aallBdCTR2IMkJnlilkTYPQgDhhsB1CZjPe58sVLK5ZmCUZzx2m6P EVcQ== X-Gm-Message-State: AOJu0YyFq4AHFDwU/rEYmB91agmXKzQ7w7SrrV8aICut3D7D9IicEuQ2 MMgrkEen10xnIiZex7QjTKyqZMduX50wNYd90tF0Zl1EhkkeFT5jC5jT4SbW+L9LaqrMSzoPV/R NXGoyh6s= X-Gm-Gg: AeBDieumZVNDsLwZ2h8e1MoDtqkkTpRBdPGXeWBXVJCqnhOE8F8+tiDbRO+uFypKXPR ZI+lvXpkZ724objl2CpAnwXMszgdRowGxQKT9d/YruUNlP8iFMHGpHf6g3rNT3h0eO4uJs3yM07 Gnw6uqtswyXQs3g3mf6AQiozks0lBWhtLUtx1qH0MYBIG/j/KzVsdF7RY3iExYOiiVQsXS/eqtL czY1xwoDKcgYyEkOZADr+5J8w6S8ktSPLMmIp/TopjUJ5xreFRSTJQECedP5QvNZaia3691vCFU NbrOwFqWfVN8DWlufXsC/4/Znldd/y9cEDRT0cPYlnckZPxcY1GuTc5WJ/dlz1d6bHnCBalEXWR awGCaf43eaK4x7l0fqkf1/J5zKvAJarDYW7NVTqMuNog02nnTna/i5NJZRhpGcjPdrvlChCeSUG VzaHNayvLQN79dIcyee2/DN0u/F5R23VrZtmjrXGiYxMu20uqJ4+mWVBGpkds7w80x0vPk7v698 G4gMkw8oD8= X-Received: by 2002:a05:600c:871b:b0:483:709e:f238 with SMTP id 5b1f17b1804b1-48e51f4652fmr64624515e9.29.1778075854578; Wed, 06 May 2026 06:57:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 017/110] target/mips: Free mvp in unrealize Date: Wed, 6 May 2026 15:53:49 +0200 Message-ID: <20260506135524.20617-18-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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: 1778075872205154100 From: Peter Maydell We allocate memory for cpu->mvp in mips_cpu_realizefn(), but we never free it, which causes memory leaks like this: Direct leak of 24 byte(s) in 2 object(s) allocated from: #0 0x5f9458e61c8d in calloc (/home/pm215/qemu/build/san/qemu-mips+0= x4d8c8d) (BuildId: 4153e33b3d08657a71ce2a04a82d0c2954966d9c) #1 0x74761891a771 in g_malloc0 (/lib/x86_64-linux-gnu/libglib-2.0.s= o.0+0x63771) (BuildId: 116e142b9b52c8a4dfd403e759e71ab8f95d8bb3) #2 0x5f94590687aa in mvp_init /home/pm215/qemu/build/san/../../targ= et/mips/cpu-defs.c.inc:1037:16 #3 0x5f94590687aa in mips_cpu_realizefn /home/pm215/qemu/build/san/= ../../target/mips/cpu.c:489:5 #4 0x5f9459366a3a in device_set_realized /home/pm215/qemu/build/san= /../../hw/core/qdev.c:523:13 #5 0x5f9459380a49 in property_set_bool /home/pm215/qemu/build/san/.= ./../qom/object.c:2376:5 #6 0x5f945937bace in object_property_set /home/pm215/qemu/build/san= /../../qom/object.c:1450:5 #7 0x5f945938816c in object_property_set_qobject /home/pm215/qemu/b= uild/san/../../qom/qom-qobject.c:28:10 #8 0x5f94592cc100 in cpu_copy /home/pm215/qemu/build/san/../../linu= x-user/main.c:240:25 #9 0x5f9459309931 in do_syscall1 /home/pm215/qemu/build/san/../../l= inux-user/syscall.c #10 0x5f94593058d8 in do_syscall /home/pm215/qemu/build/san/../../l= inux-user/syscall.c:14422:15 #11 0x5f945905c73e in cpu_loop /home/pm215/qemu/build/san/../../lin= ux-user/mips/cpu_loop.c:124:23 for linux-user, where each new guest thread is a new CPU object that we need to destroy on thread exit. Add an unrealize method which frees this memory. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260317175031.3035740-3-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/cpu.h | 1 + target/mips/cpu.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 42c5ca89154..efb6a6df4cd 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1225,6 +1225,7 @@ struct MIPSCPUClass { CPUClass parent_class; =20 DeviceRealize parent_realize; + DeviceUnrealize parent_unrealize; ResettablePhases parent_phases; const struct mips_def_t *cpu_def; =20 diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 789ca188b5e..0663cda0036 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -502,6 +502,16 @@ static void mips_cpu_realizefn(DeviceState *dev, Error= **errp) mcc->parent_realize(dev, errp); } =20 +static void mips_cpu_unrealizefn(DeviceState *dev) +{ + MIPSCPU *cpu =3D MIPS_CPU(dev); + MIPSCPUClass *mcc =3D MIPS_CPU_GET_CLASS(dev); + + g_free(cpu->mvp); + + mcc->parent_unrealize(dev); +} + static void mips_cpu_initfn(Object *obj) { MIPSCPU *cpu =3D MIPS_CPU(obj); @@ -606,6 +616,8 @@ static void mips_cpu_class_init(ObjectClass *c, const v= oid *data) device_class_set_props(dc, mips_cpu_properties); device_class_set_parent_realize(dc, mips_cpu_realizefn, &mcc->parent_realize); + device_class_set_parent_unrealize(dc, mips_cpu_unrealizefn, + &mcc->parent_unrealize); resettable_class_set_parent_phases(rc, NULL, mips_cpu_reset_hold, NULL, &mcc->parent_phases); =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075873; cv=none; d=zohomail.com; s=zohoarc; b=Doxr8guZSwx5o/w2Lfe5kkAVp+g6HgzrTITtSRWRlAlPBZm20DDdWaXMQRPLsHMocb6po/gUhhuYZXrKQKWJS5Ws9b23/+ccHthsMbtyj0708IZiCJ4sduwjz/yY6hc/VUc+9CYXIX6BpSfyGSNUvAuHtbSgg7ASkUicUn63Fnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075873; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=qB5su2eFZnP8oQgJ5Fgov2Yx3AulDJhKn7UhrfmzMqc=; b=YLhZmynXxPSbVaXinPphAD3qiF1C1+JhbIrNAFucZ1x276Q9GV0knEdKPRm1oLQuRm3m7kGxcorCtG015sItsjD0To+2SXNU4CVtyd0DHvnToecgd1RGXM+3aG7A0/YO1qfqKtqykd7XH3CW7An9h6qrC2U/Rx6gN5Dya6s8Jzk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075873031880.4875934775207; Wed, 6 May 2026 06:57:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcl2-0006Av-Rc; Wed, 06 May 2026 09:57:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcl1-00060J-BL for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:47 -0400 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 1wKcky-0008AG-Jr for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:46 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-488d2079582so67253995e9.2 for ; Wed, 06 May 2026 06:57:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5313b023sm28071305e9.5.2026.05.06.06.57.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:57:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075862; x=1778680662; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qB5su2eFZnP8oQgJ5Fgov2Yx3AulDJhKn7UhrfmzMqc=; b=SQvIuGqmuES3BaQKPRvoUp9HiwEbial4DwYu0rHOZyT2GvNfdJa5/1n60R9hJepfQT ZW5ELtWUxDzD4GvnlD9fT+5e9yJ/QbcYmHgXk0ldVm8HTfOLSDxd67/k2/jDKCSeFkya BWB8P09/fB89d/z1Oz4w4rFIbE/KjG06KSfbC60Oyfs4n3sOUMHHlo2Al+UhRCuVfawJ 6zYcB/gqZSdcpQqt8RQ52DXGzgP/bRCUdkx+0nmdeFyMj5jZGYcmkTPczP/WlogzQiiZ OiNcEMKRp45/G+jASmuCQgBXSJy1+fu6GB/GedQFRFLrMbHxivSlyTFlUElNCDD0i6aS Quuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075862; x=1778680662; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=qB5su2eFZnP8oQgJ5Fgov2Yx3AulDJhKn7UhrfmzMqc=; b=V+ObDglT4JcYqmmT5uUuXcgDOvs60d5UlBhFrqbeH8ZiFOjCv+Zc9KGcfMDKj9nCQR UFYh82Y6BrAOi54KjNChFir+QsLuUMOISY3UaCxvVmZf4RSWy51YuQFaVqNxQCRLWYye KjBtztA221qf5RxwgPj354C3YNB7niEkSBYsDZEsbJ2OgWnG5iDYYracXIQKSMoLZJVT HnXi6C3+XD441IKdVttF2ZSIImT1Y8VcPIeBJ0K9gb0Gb/ePbiReQICUHUzZWWgrCnin lXbCeTcQ0jmyrgM3gNydSEKlDTBRe29JEj/ElyXWa0YQPS4WaropbpOraWdNQENXox5z VqhQ== X-Gm-Message-State: AOJu0Yyust+JrloC6VW5mmDJ0CvYH4GsYJisr3/t9skDCtK7tXSIo/pB GILNUe3m5n7MUgH0rQvvX2V3H/GcgcMhHAp6PUXeYqTqXWkghPtY/tmwZSVN1uTqKHwutCVrnNw 2XNEjdlE= X-Gm-Gg: AeBDievQQUJWAMCQPKfpKZOj0720KGOSJzGo0FDji6pMs5BIw0qHADSgo0q5U+DNTMW aASys3sSA9VXjkAljKUpL2J4V56AUA/lpZkqtSinAiaq+o0vzIB/EUjInskus4OOhGsFno5oGis /TdsRhh8dJUJdranyXv6NAY7Ed572ccd9UG7fPXqBqP3/IQhMP7BI2wpJoEO4E73iNXS7cugLLJ vuWtnffV0RRozDMKdAbyYPkl2bpG56fyGiFkcEfW8pvnrXxebmZ3rS3W9TM60b2lMRL7mQyIaqw 41iAGQ7QBwQTsK8+Km+Usl1roq9Mnd4S4dqebEjehDgxY73ZTASKiUqIHwouvZFGEWi5XKvJ9rM /PqwG9tdJ0OMwoNPHcfRynWWIuyl3gHmzoztnipxDSujcVpakcY2ASvJ5cHPFVTBaY2K3Jm3JHz js7rsX47cLY+ZhShpINdd0tQbWqyZ5T92Id0BQSU/SShqEJRQFfKIy3M5bSqfnKYnlISBDWZNU/ DgX9xNxLoU= X-Received: by 2002:a05:600c:4343:b0:48a:563c:c8c5 with SMTP id 5b1f17b1804b1-48e51e15662mr31878585e9.8.1778075861834; Wed, 06 May 2026 06:57:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 018/110] target/mips: Move count_clock to MIPSCPU struct Date: Wed, 6 May 2026 15:53:50 +0200 Message-ID: <20260506135524.20617-19-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778075873676158500 From: Peter Maydell The count_clock pointer is not something we can do a shallow copy of, as linux-user cpu_copy() does, and although it is a system-mode piece of state we unconditionally create it, so it is present also in user-mode. There isn't any need to keep this in the env struct rather than the CPU struct, so move it to avoid possible memory leaks or double-usage. This also puts it next to the other Clocks that this CPU has. I haven't seen any sanitizer reports about this field, so this is averting a possible problem rather than correcting an observed one. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260317175031.3035740-4-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/cpu.h | 2 +- target/mips/cpu.c | 4 ++-- target/mips/system/cp0_timer.c | 12 ++++++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index efb6a6df4cd..cbb9b3e1b1c 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1188,7 +1188,6 @@ typedef struct CPUArchState { =20 const mips_def_t *cpu_model; QEMUTimer *timer; /* Internal timer */ - Clock *count_clock; /* CP0_Count clock */ target_ulong exception_base; /* ExceptionBase input to the core */ } CPUMIPSState; =20 @@ -1206,6 +1205,7 @@ struct ArchCPU { CPUMIPSState env; =20 Clock *clock; + Clock *count_clock; /* CP0_Count clock */ Clock *count_div; /* Divider for CP0_Count clock */ =20 CPUMIPSMVPContext *mvp; diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 0663cda0036..f803d477632 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -449,7 +449,7 @@ static void mips_cp0_period_set(MIPSCPU *cpu) =20 clock_set_mul_div(cpu->count_div, env->cpu_model->CCRes, 1); clock_set_source(cpu->count_div, cpu->clock); - clock_set_source(env->count_clock, cpu->count_div); + clock_set_source(cpu->count_clock, cpu->count_div); } =20 static void mips_cpu_realizefn(DeviceState *dev, Error **errp) @@ -520,7 +520,7 @@ static void mips_cpu_initfn(Object *obj) =20 cpu->clock =3D qdev_init_clock_in(DEVICE(obj), "clk-in", NULL, cpu, 0); cpu->count_div =3D clock_new(OBJECT(obj), "clk-div-count"); - env->count_clock =3D clock_new(OBJECT(obj), "clk-count"); + cpu->count_clock =3D clock_new(OBJECT(obj), "clk-count"); env->cpu_model =3D mcc->cpu_def; } =20 diff --git a/target/mips/system/cp0_timer.c b/target/mips/system/cp0_timer.c index afa163c3196..634c2a66bbd 100644 --- a/target/mips/system/cp0_timer.c +++ b/target/mips/system/cp0_timer.c @@ -29,14 +29,16 @@ /* MIPS R4K timer */ static uint32_t cpu_mips_get_count_val(CPUMIPSState *env) { + MIPSCPU *cpu =3D env_archcpu(env); int64_t now_ns; now_ns =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); return env->CP0_Count + - (uint32_t)clock_ns_to_ticks(env->count_clock, now_ns); + (uint32_t)clock_ns_to_ticks(cpu->count_clock, now_ns); } =20 static void cpu_mips_timer_update(CPUMIPSState *env) { + MIPSCPU *cpu =3D env_archcpu(env); uint64_t now_ns, next_ns; uint32_t wait; =20 @@ -46,7 +48,7 @@ static void cpu_mips_timer_update(CPUMIPSState *env) if (!wait) { wait =3D UINT32_MAX; } - next_ns =3D now_ns + clock_ticks_to_ns(env->count_clock, wait); + next_ns =3D now_ns + clock_ticks_to_ns(cpu->count_clock, wait); timer_mod(env->timer, next_ns); } =20 @@ -85,11 +87,12 @@ void cpu_mips_store_count(CPUMIPSState *env, uint32_t c= ount) * So env->timer may be NULL, which is also the case with KVM enabled = so * treat timer as disabled in that case. */ + MIPSCPU *cpu =3D env_archcpu(env); if (env->CP0_Cause & (1 << CP0Ca_DC) || !env->timer) { env->CP0_Count =3D count; } else { /* Store new count register */ - env->CP0_Count =3D count - (uint32_t)clock_ns_to_ticks(env->count_= clock, + env->CP0_Count =3D count - (uint32_t)clock_ns_to_ticks(cpu->count_= clock, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)); /* Update timer timer */ cpu_mips_timer_update(env); @@ -116,7 +119,8 @@ void cpu_mips_start_count(CPUMIPSState *env) void cpu_mips_stop_count(CPUMIPSState *env) { /* Store the current value */ - env->CP0_Count +=3D (uint32_t)clock_ns_to_ticks(env->count_clock, + MIPSCPU *cpu =3D env_archcpu(env); + env->CP0_Count +=3D (uint32_t)clock_ns_to_ticks(cpu->count_clock, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)); } =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075886; cv=none; d=zohomail.com; s=zohoarc; b=caF4qUCAN3w3PI3IkwBlDkJamwEMdyu0c903F/MfcoP1w5OOaWZ9zAcfJYEz9tjuw9RdNC1V+vWlY7aSxEfimIIli/1HYtnIRyXgQ3G2olxL8NhH7o3WQxYNawgomBzMxeZIjxwsyWcPIG8azUmVsFabwHy6jxpR9SjIHxO+yzc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075886; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=I+845LPtOii5DZwrPWQNjQI35Zsa4q0wb4JUAuCn6FM=; b=ZmBBdyXt3KPWYfl8IQ2nB58yM/pQwZU9IlP6RA/eCTmai76ks9EhSJZpnrpaWfytTwuFPStvfd1/t+gpEyb2qYAbYvNS5gSzRM7KtVXUqfPk0LjFaLXvxS0fBgKr1+jgnagECxiZHQ2OEmPsPNh0RJyn7ZoX9JeTOeQfKv2xeKY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075886647779.0933966214335; Wed, 6 May 2026 06:58:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKclF-0006vl-UU; Wed, 06 May 2026 09:58:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKclB-0006cr-CV for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:57 -0400 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 1wKcl7-0008GJ-1j for qemu-devel@nongnu.org; Wed, 06 May 2026 09:57:56 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-488ff90d6c7so61534865e9.2 for ; Wed, 06 May 2026 06:57:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4505285e765sm12290509f8f.10.2026.05.06.06.57.47 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:57:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075869; x=1778680669; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=I+845LPtOii5DZwrPWQNjQI35Zsa4q0wb4JUAuCn6FM=; b=jWqgVFU6O3q+8h/+muxORI7EH84SRucGWaZoVmkAaJIuaPWoIRLLCkMDF/AN37+nhI 833RroaDYJkVtahJ/KW0kkMaXHIPaKjBU1+TiYbzIvnZy8Su+CKaxZJeiplwTpGMnNqG FO09VUVH+CsqMy27B2cLm5cgMhh2LZ/TwunzpXo3/C3/LFe3dkzRstENeUQ4C8KIRFFi d6nV3u8bF+wwDG7Ay5He6oDXXHtP/CB6X18yQplBF7XPqrMgBGLA/6zs9KbWzpKkygh8 unbarVPR2Xh9L8/AVYAwVvXu+SuvbHHau5sKpLz7P9fWplSw2aYdVL3Day/6zbUPSbDK dhmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075869; x=1778680669; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=I+845LPtOii5DZwrPWQNjQI35Zsa4q0wb4JUAuCn6FM=; b=RTFKHRSnhHnK4nfR09sQlfX2H+zlMlb/0q/crVk13VSPa30Ea2guPZrdr563DHztKK PpF27bOyt7idx4jdHXUqlLk9d9jzmqjDGkqRMG1mIisSm/D4ZJWbUblGdHA8qJ8YEMBH YxAu52wYgEAiPL5Ay5ypz6WWBFGMZo8+UHncUKsQRHb42ZlsBWT53ra6QzKP9HivY/jN /F0QOnxJwXGrCwJuKy3xC731OxEBDWiNH68JF/TuCUpwlfGdyjoBcKksrMZrPekCn9I8 31hVCy8Alznp+eP1ItSeqFCo/pkWfMqAJcxR6wpVXoQzBfnvWty+9Xd6i6fTeb+4Ld7j Bx9Q== X-Gm-Message-State: AOJu0YwoteAsdO6i0e4NSFlep2ZTL5TblibHHr65o/QNlaOc3e8mk+bG Khe5CGwticyJFrx/5ynLQMIp1okEZm/GlFsRzGVlexp5vqP/7dgFzM1ZDEFPZO1xMsjhXWV8Z/e 03bRG1ic= X-Gm-Gg: AeBDieuVkUzExUME/a/sIpClacF+hfqLcZjHYJuxxIOQJQkCoMIR/w3mNhROaycTMSZ Y4nJYeQvobAx0ISLJz0eAptXGJQKjpjDcpKKe1TG3pa05b1y3I86IGcIaxembcZD7gVwSzyiKNp iO12TY3IhJcz6h3Pj/Ri/s22RjNPig7F6k3t4E9hWsiYXvDhJx3QnnDvt9ci/j6hVaUal9gEdMP tvyocdcFDTse7ZrTJchvnR5/VwTlcNLTjz5LZACXkQwzQcxbbdoZko6aPjJ0K9y7+7QeCWEtC21 t5Wok20Mxjkj7neZX8FmfT+EG3XTtJWb1C9/lwVmI5QfyAxxt52Iu3mqO52cKzRBsnqCqJyTOnT AFYC66AYHVQMPdmBSablBEvXYZ7wkDrmhaiV4ntvwVyygVH54DKSMx182s9ktmueVyQcfNIqvgj EXYOSNBaQitRHn5x7yFH1kifUbMYJNpSiT/svQD8YypPOm7NflX+pwiCce2g1X2ba4ovxmHWh5L ULvLEu0Hq2FYTn1MyPOqg== X-Received: by 2002:a05:600c:3f18:b0:487:2671:fb8f with SMTP id 5b1f17b1804b1-48e51e19668mr60581155e9.8.1778075869108; Wed, 06 May 2026 06:57:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 019/110] target/ppc/mmu: Remove unused hash32_store_hpte() helpers Date: Wed, 6 May 2026 15:53:51 +0200 Message-ID: <20260506135524.20617-20-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778075888425154100 The hash32_store_hpte() helpers are unused since commit 6e8a65abbbd ("ppc/hash32: Rework R and C bit updates"), 7 years ago. Remove them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Harsh Prateek Bora Message-Id: <20260319111936.68041-4-philmd@linaro.org> --- target/ppc/mmu-hash32.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/target/ppc/mmu-hash32.h b/target/ppc/mmu-hash32.h index 04c23ea75ed..5705f57935b 100644 --- a/target/ppc/mmu-hash32.h +++ b/target/ppc/mmu-hash32.h @@ -87,22 +87,6 @@ static inline target_ulong ppc_hash32_load_hpte1(PowerPC= CPU *cpu, return ldl_phys(CPU(cpu)->as, base + pte_offset + HASH_PTE_SIZE_32 / 2= ); } =20 -static inline void ppc_hash32_store_hpte0(PowerPCCPU *cpu, - hwaddr pte_offset, target_ulong = pte0) -{ - target_ulong base =3D ppc_hash32_hpt_base(cpu); - - stl_phys(CPU(cpu)->as, base + pte_offset, pte0); -} - -static inline void ppc_hash32_store_hpte1(PowerPCCPU *cpu, - hwaddr pte_offset, target_ulong = pte1) -{ - target_ulong base =3D ppc_hash32_hpt_base(cpu); - - stl_phys(CPU(cpu)->as, base + pte_offset + HASH_PTE_SIZE_32 / 2, pte1); -} - static inline hwaddr get_pteg_offset32(PowerPCCPU *cpu, hwaddr hash) { return (hash * HASH_PTEG_SIZE_32) & ppc_hash32_hpt_mask(cpu); --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075893; cv=none; d=zohomail.com; s=zohoarc; b=BSicpxp9VNMob7/C/yLaAcZCGu+OZcZVvWmSVPPV3+YVDJ+r5HopN7FAeM0X+pvTKScYUEdVJVzEKHd3W9vjEcT1YKQ1qG3+o31axahPDo9y/MXMPRAbXGYG8jvSvECE1pmgnaPlsRuBqQTums/QD8eD8cm02UZfi1Ky8O7CBU0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075893; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=XTYyf/lmPyz+PLU0Y7TEYZKsWWt4PgHM9yxseIT1vDM=; b=idtckFiK3NmwlRZVRuaY7x3vU5bE8+Q1vVwhhnugwrtZmNg8+7VrJ96NxuOACDyTWfdYrAt3NCPpfMfQHW7Dj4KOW6VqArcBDHy3Ob/YujOzW3gWAddFF2tgkR+QhaUXFi6wor2xymKO81ayLSnODHBnBiCvNkja2KugPzPydyY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075893926888.0802708566237; Wed, 6 May 2026 06:58:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKclJ-0007CM-NI; Wed, 06 May 2026 09:58:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKclF-0006y7-P4 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:01 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKclD-0008NC-MP for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:01 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso46411585e9.1 for ; Wed, 06 May 2026 06:57:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538c4ae1sm47088615e9.12.2026.05.06.06.57.54 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:57:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075876; x=1778680676; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XTYyf/lmPyz+PLU0Y7TEYZKsWWt4PgHM9yxseIT1vDM=; b=kIQZvHQIxI3AB+ytnjWywNrka0Xe4/XBDg1abhBm/7gBUa/2OPfu3GM1rglHXhZ/+8 g49qAgDQuKkXSsn3SUebJArtKjyCSYI+0XQ6bWAyYcsivqG3W6aoieIqqrT0PmJQTtW7 yRsWj29h9eNNexXgnpukEDELJgYBcjPBW0Ef0wMJmHMVaSmtBaOLDxJ7ijw15lU+ketf iPH3VkdVRI3DVuj4sO4gjJReJnterrkCQyinfxklFpsnZHhNO4hslQ2YCghqN8AssiD3 Gwl6ozkUjOQvKdedNtROFx+f6sN/bQtjbRfsZ7qjK04bWIJmQFLl8tE/GxiyTEMZIgmQ Sfaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075876; x=1778680676; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=XTYyf/lmPyz+PLU0Y7TEYZKsWWt4PgHM9yxseIT1vDM=; b=Klc/wkZxzsjDQTO7gR2T43xqYz8HLjB/OfWHlpmLkyHdoe9ZXOJ1lj1d+ywEtjWOBC LzmS2C2gxTyHgWsGZoPPZMQ9bz7e9xnmwnm7kEq8RE9H4RziOG++IFTeQ9Wo15Q6j9Zw O8o7E+GfXv1WXoayIEMulELeQcfsyhnJ/Jd+eGjmHwHRfJB27oNOcTz9QXE0PMa6M2vA kced8vF5iWf3Giou9CPHAh3KRscl7eCL7IBlthFUn4eIDO/ueUC8EJSvkDc9RV38lBA8 GcQpaYoh6oG+J0MT3BfASGC7kdEvy7Q+kRbD1tEZTuxOmtX62rkmHj+n3zPBINimO2Pb +5wg== X-Gm-Message-State: AOJu0YyPmj1K6BZ8nKJGd2W0E3IY70vi0GqApz87EkWLMAhdd8bNBCAb Oe0t/EFJbLuGM1lEviIhLZ2NMmVtB6nLEO6WUJ4E4SUW8IeQr90FTtPQ4YduvdMDJ2ViFErWueS Aav5u7/o= X-Gm-Gg: AeBDieuZnudc/zaBvYoXzhdZSHDyWV29+PaJ7dlPImug9V1sbGhV3UFju7WycXt5kKR Dzmkqrkx+XIMsjSjTQIJKwijwn0xhWBqIIsWuJQ34g5w4mpPJRWjE3tQOfJ8FWsyj5PmE0dBPGt OYL3ijTBii0VmWzRFd5dePEFx+T6S+DWxL6H0/S3AkcX96xwWxOO0o55h5Vb5MQxBTcTeuESoiL S/W+ntuymOSz7xSRMGgEIh4eu6v61dveNUxZ0DX6asIo1rSUGcz2mnyHYHuJdiDISGJYRUdeiyK MK2EzmagqIpEx2nuPliNyU6ObmcDuVJsFhli6bx7LfJZZnfDWHzWu/HAKF/j8MQ6iVooKE0mVRL x+9F5nkUKuVxln8kBtv3zef5fNCo2ffecdM42nCoIGUSANF8gHV706orTezlu4ijtFXmP50jFR6 eX4MeaTUp50zYuaBGRGZ+Gk/f31p5c/s+rbIYUXam1+PVNDa57BPVgNfGU+ojksFCeourvSHuTX tUnFIH1Lmvu6rkhkuDKmg== X-Received: by 2002:a05:600c:354b:b0:486:f634:ef1 with SMTP id 5b1f17b1804b1-48e51f32a7amr63637295e9.17.1778075876480; Wed, 06 May 2026 06:57:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 020/110] target/ppc/mmu: Restrict hash32_load_hpte() helpers scope Date: Wed, 6 May 2026 15:53:52 +0200 Message-ID: <20260506135524.20617-21-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1778075894564154100 hash32_load_hpte() helpers are only used within mmu-hash32.c, no need to have each file including "mmu-hash32.h" to compile them. Move their definition to this source file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Harsh Prateek Bora Message-Id: <20260319111936.68041-5-philmd@linaro.org> --- target/ppc/mmu-hash32.h | 16 ---------------- target/ppc/mmu-hash32.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/target/ppc/mmu-hash32.h b/target/ppc/mmu-hash32.h index 5705f57935b..bfea03ea872 100644 --- a/target/ppc/mmu-hash32.h +++ b/target/ppc/mmu-hash32.h @@ -71,22 +71,6 @@ static inline hwaddr ppc_hash32_hpt_mask(PowerPCCPU *cpu) return ((cpu->env.spr[SPR_SDR1] & SDR_32_HTABMASK) << 16) | 0xFFFF; } =20 -static inline target_ulong ppc_hash32_load_hpte0(PowerPCCPU *cpu, - hwaddr pte_offset) -{ - target_ulong base =3D ppc_hash32_hpt_base(cpu); - - return ldl_phys(CPU(cpu)->as, base + pte_offset); -} - -static inline target_ulong ppc_hash32_load_hpte1(PowerPCCPU *cpu, - hwaddr pte_offset) -{ - target_ulong base =3D ppc_hash32_hpt_base(cpu); - - return ldl_phys(CPU(cpu)->as, base + pte_offset + HASH_PTE_SIZE_32 / 2= ); -} - static inline hwaddr get_pteg_offset32(PowerPCCPU *cpu, hwaddr hash) { return (hash * HASH_PTEG_SIZE_32) & ppc_hash32_hpt_mask(cpu); diff --git a/target/ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c index 8b980a5aa90..08c9f63a132 100644 --- a/target/ppc/mmu-hash32.c +++ b/target/ppc/mmu-hash32.c @@ -201,6 +201,20 @@ static bool ppc_hash32_direct_store(PowerPCCPU *cpu, t= arget_ulong sr, return false; } =20 +static target_ulong ppc_hash32_load_hpte0(PowerPCCPU *cpu, hwaddr pte_offs= et) +{ + target_ulong base =3D ppc_hash32_hpt_base(cpu); + + return ldl_phys(CPU(cpu)->as, base + pte_offset); +} + +static target_ulong ppc_hash32_load_hpte1(PowerPCCPU *cpu, hwaddr pte_offs= et) +{ + target_ulong base =3D ppc_hash32_hpt_base(cpu); + + return ldl_phys(CPU(cpu)->as, base + pte_offset + HASH_PTE_SIZE_32 / 2= ); +} + static hwaddr ppc_hash32_pteg_search(PowerPCCPU *cpu, hwaddr pteg_off, bool secondary, target_ulong ptem, ppc_hash_pte32_t *pte) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075897; cv=none; d=zohomail.com; s=zohoarc; b=Djo7NLtLnSIUnBcOstLXjfm58i8Q7Gbpytl5WH0ECjUR2PXuBsT29xZA+bXjG4j9seW/KJf9Fs5OmmCfOYTmO4CYv4YYRCgqoM2i9jazMcgrdIEGim3unX5/4noG51HmebFWtsj27KcpsTjVYdiWFq1Jrb25oM2aK4lvTCIPPco= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075897; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=rU3TesF61QskIMqznS2UEFkxHazsx8us4woLWPiBNh4=; b=DOL4ABp7ILHDXT/wyNfTxDHHoik62d9jcSQxbbV/ZfsuqTU2bddKQqW4QbwZCF1dHjoe0XPP7HpmBEt+aHLKOh055iHiHj4EOZz+0TBYd+Jhw8zCdduI+fD7f6XLq/jDyW9JZNJWDraRWcUFtH9eRAMdDPp/Rh8w72B8V/12+tc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807589795578.00275712063387; Wed, 6 May 2026 06:58:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKclO-0007k6-La; Wed, 06 May 2026 09:58:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKclM-0007ZX-Dx for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:08 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKclK-0008O7-Mk for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:08 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4893940bb5eso36235715e9.3 for ; Wed, 06 May 2026 06:58:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4505558e213sm13573103f8f.25.2026.05.06.06.58.02 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:58:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075884; x=1778680684; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rU3TesF61QskIMqznS2UEFkxHazsx8us4woLWPiBNh4=; b=cTbk3W/6lDqiWJbhzmcO2EaX7xjyosfV0nYcwNhFDCNIzQ4vfWrw7CGGgB/er+f73U Sx/19UP813lZd7Yetj5C8Nn3e96GaL6L0JeiHpcLAqdHkOyb9M4WwpZSUMski7V5XQgO I7RgT/Y4alY2IOidGp9yqeoJI6Jb0BsyOTWzxWI4oD5mypdMshK/CokVJ1k5F6HpmUCn 7FlRqAmL+oi9RkJC/GDnYqFzo12aP+w+/J/3DUK+0PEwTJIsIrSEhTb62iQ4/3u1cfwl hf2v7UaXvKmIUCUqVpGGyCplbay55azMm8ryirp74te3tbNd56aZJYA1CyMGt4nbFJJg I2Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075884; x=1778680684; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=rU3TesF61QskIMqznS2UEFkxHazsx8us4woLWPiBNh4=; b=A5DchQFqP6LPj2nDwAM313pn0o8FqHB03aCUbFFM/iN7dZQtQ8oEeyI0xXMQsa5Fdm ccLBOtKiWpdlnSWRvAtBd8/onQcEXpITwJfdvLPX6zv3C7bBWvgis4nh/OVR1Q+upHuy aEB7Od88rSBaI5aJw2FUuirQ4y7TpMTuad0rlrO48OH/xUrJ2WnOcjwUzLFJA+PheVer /PEqf+JIAkF9e1ExEyMqrYr0n+sKuW9ReKd9/N8no9xkRi8PGaykys5+jsw5zVOMazHf GsqqLQ58qfJapmGVa0SolWaIQ8ITcIKKJi/3qm5s2N2g895ifrASI6Z1/1yP9htAAZkN MvPw== X-Gm-Message-State: AOJu0Yy4Qf4I+n/E0IC5Xj8+PtTKXTNr4Kq28E2IU6/qbY8v6ih/83pD gTaz7doRwCxgtuo4eN8RGhiOiMz6vBB+8eh2seUSjmMO6OVw5MQaqMgLJVz43rL4Tq5CL1EZNSB ZDnxMwYg= X-Gm-Gg: AeBDiesg83HC5Vw6aZ0uqM1ujsLEPV/8vq1tpgPqUzvsABXb+FX1GC4OZ+JjGMdfJ8N J5MSMknEZ+p3e1h+xjZr/irURmhCgL5l7JcT8WMAZzl+hfng3VLsMvt8lMMj5wFV8Ea9mDZJDJE ix8ucJhlxPA7a0MxeyFkcdFVVbjoD6wIs6KfKDZXOLNoDBF2f8POgksEvbuvHva+4P5L9bcTZiE eFtUUqAPZN3m3wFVA8j227uwWqCH5bE58skMvy7vBaupXHpKKRGpJRsnTJlzm9kQ8pJsKlF4j7W k+vqowbRueZpCw5R+6kBE60zAQQF2e2JvcVRL8M6gMj3kZ5skWl7aVug5rDyQltlWsEUtPzHadK k+sxUWxgwyuTedMibu2dIatqwYrxvqAkS+RCmx9MRNvBWLzB2QGqNTrfqSbpURFzBCSp2NKOhkl IT2b7w5igKMDtk4L2RcWi4tBgL+ybbtLutkgXdyf/UlhR1H/RCwhi09YSDimbkDtTCAJG3z2QA4 hNCDpWfxho= X-Received: by 2002:a05:600c:c4a3:b0:48a:563c:c8d6 with SMTP id 5b1f17b1804b1-48e51f24391mr59556075e9.7.1778075884102; Wed, 06 May 2026 06:58:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 021/110] target/sparc/monitor: Dump all registers as 32-bit Date: Wed, 6 May 2026 15:53:53 +0200 Message-ID: <20260506135524.20617-22-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1778075899783158500 All these SPARC64 registers are 32-bit since their introduction in commit 3475187dd81 ("sparc64 merge"), see target/sparc/cpu.h: 511 #if defined(TARGET_SPARC64) ... 515 uint32_t asi; 516 uint32_t pstate; ... 519 uint32_t cansave, canrestore, otherwin, wstate, cleanwin; Set MonitorDef::type to MD_I32 to dump them as 32-bit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260320091019.59902-2-philmd@linaro.org> --- target/sparc/monitor.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c index a60671a60a4..e9300ded4ad 100644 --- a/target/sparc/monitor.c +++ b/target/sparc/monitor.c @@ -41,13 +41,13 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) =20 const MonitorDef monitor_defs[] =3D { #ifdef TARGET_SPARC64 - { "asi", offsetof(CPUSPARCState, asi) }, - { "pstate", offsetof(CPUSPARCState, pstate) }, - { "cansave", offsetof(CPUSPARCState, cansave) }, - { "canrestore", offsetof(CPUSPARCState, canrestore) }, - { "otherwin", offsetof(CPUSPARCState, otherwin) }, - { "wstate", offsetof(CPUSPARCState, wstate) }, - { "cleanwin", offsetof(CPUSPARCState, cleanwin) }, + { "asi", offsetof(CPUSPARCState, asi), NULL, MD_I32 }, + { "pstate", offsetof(CPUSPARCState, pstate), NULL, MD_I32 }, + { "cansave", offsetof(CPUSPARCState, cansave), NULL, MD_I32 }, + { "canrestore", offsetof(CPUSPARCState, canrestore), NULL, MD_I32 }, + { "otherwin", offsetof(CPUSPARCState, otherwin), NULL, MD_I32 }, + { "wstate", offsetof(CPUSPARCState, wstate), NULL, MD_I32 }, + { "cleanwin", offsetof(CPUSPARCState, cleanwin), NULL, MD_I32 }, #endif { NULL }, }; --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075908; cv=none; d=zohomail.com; s=zohoarc; b=g86KwCXESdcN9l7m4AZihkJF8Gngm01fU4ttD72vgN2SEi7nvgDjM84TAcC+W/FOckKSon8s+RVoICjENyb/9uM1fua8Ktz3EQWaHyWO6vhxBrke2g2zn/LTwe5oSX85rK2zzVXFQNA5PHGgAsJ1TmKZRibV1nbSt2VlKynoPRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075908; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=8fEn5pkJWA65oSQIEFnruXn9B2oJ43OnPg+gNauUAyA=; b=TX3v/U7JIJDfrQDTHYhOHXSvfgNHwGcAIxzx41cFpYmItJo/bSNFtBN32wk6kPuKdrCW0OD1jrmYxmnjToy29m5q1zIo8PCz6f0c/Ox29czB6QVEuyZV/zUmYWV5sC1PJYJrEcccu5nvzEvmCXrOUEu3aQjJaYpG+kqtWxvnRwE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807590864686.1956061145911; Wed, 6 May 2026 06:58:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKclX-00080t-AU; Wed, 06 May 2026 09:58:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKclU-0007v4-6M for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:16 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKclS-0008Os-9v for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:15 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-488b3f8fa2bso9727835e9.1 for ; Wed, 06 May 2026 06:58:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538ca8c0sm46383205e9.13.2026.05.06.06.58.10 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:58:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075892; x=1778680692; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8fEn5pkJWA65oSQIEFnruXn9B2oJ43OnPg+gNauUAyA=; b=BWIEeDSE2A1kkKIjhuB+vcAbM678pmsio2Qm5+B4G1pr4eyZh53dVWWnWQ/M4k7qvQ xaJoZaCn9f48FJS2rByWwG6tGdyBGPLIHbAdDRyA74q0qjesWWkIjc2WjsTVvhp1K5aA 9Md19+6L9mkizHBimDeHglq0ghgj52iUs4W+gi3r07O/JeJU8DVMjzTR71zbcIqYY0BG zLOP/8Rp8mWtjeaGWjmNGdJ629vsOyseqVlSkuH0BE2X0BtInXFDtsNoMzKsbovGK4RD obQ9ig8dAnkgQ5y7pJ2rOW8t3EhyDTqK0gDfQJWNqnxlKylkEud0imgCVZgntLMnefpd 5F9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075892; x=1778680692; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=8fEn5pkJWA65oSQIEFnruXn9B2oJ43OnPg+gNauUAyA=; b=NHvLuF9VWbIKscUgk0pKRO/SSUb6UT3gbylb1GguDP0l2gdo5/4B9Q8rmvk6koOz2l 5RHVSG41A84xUzRF+54Xlk+Rz2NNRWxWwaT/SPMfk3Soucmw4u2ygl/7cHmjC1JfNBcP 8m+qxSfHGVfMSfWGGcxrcaD7qVj3UDEdSG0KDS2K7vZStJUnwxXbreCN0eWpInFQloSL msSSEY4Dt2qBd+cxJnTSNIZM0cApxXD5IUZjbk+uakBPI5jxxNTi70Y3/d/zx3t6FL+j t4AO2hs+bLjPBuOWaFr7VgjKS/u9Sp6xyQHXyBh5K2E/XANCrvev1/54Md6jFv8p2yS2 PdDA== X-Gm-Message-State: AOJu0YwcxnFOhFgR8QK4Y1qWfgqx99nZLQDRiR3TjNi81n+BlNpXqlIi Sr96fdXWTpJ7TS5Uk3ulCcjiZZnzJUlH+ya13I9EKZ9gTVxfuu5kxL88QcoWwe0X9z43hxK3qzC Fb/uzRzU= X-Gm-Gg: AeBDieuAJ/qIZ5NDr6ogGKfg8lI9S/EBFR5PPF7ISY30PSYe2Iq+cE1fZWdwCswBsyd rM0ik3rjEgMh3ORBYFqlCBtgWIMtN9y2urHeWgXQXxhuzovZdwx7iCW4WCjPAGEr0J8jk1ySeIz bxKkH9dKsi0tPIjGOH/NBZe2DcYSvfj4833T1KKoqVpUoOYJVXvDm/v/8e/X4ktjWCy2gvliPVW atFEcRcG8YD4YD/iuXhixkxzV9x8LPDR2H1jiPTNJFLdW7FwuD3IcUCklLSvbD4mtMxkCvZoIc9 Li4++Q/p03TBnvZQctaisruGfqy12FxoFF9C238abH1aH5f6fwTy+58rHJEMrl+55dLfyfTjcJR M5duKxEvlzRUw2fO+IeaYXrvs3ebpxJj3viqUaj6r5F75S+QKcASSoAyexN8yCqAFdjN/2gAiTR 5WTymEEzdMH46TAOqyHtLmmNmxXVCqzK9M/O1VVwbzXCDx/Ow9tGl0sbH36NXZDwjrQorKdEiXE BfYYIJQkOE= X-Received: by 2002:a05:600c:5291:b0:489:32b:ac0b with SMTP id 5b1f17b1804b1-48e52285af1mr47473525e9.6.1778075891791; Wed, 06 May 2026 06:58:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 022/110] monitor: Remove MonitorDef::type field and MD_TLONG / MD_I32 Date: Wed, 6 May 2026 15:53:54 +0200 Message-ID: <20260506135524.20617-23-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1778075909924158502 None of the few targets still using MonitorDef use MD_TLONG, they either use MD_I32 or the %get_value handler. Remove the MonitorDef::type and its definitions altogether: simply check for the %get_value handler, if NULL then consider 32-bit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260320091019.59902-3-philmd@linaro.org> --- include/monitor/hmp-target.h | 4 ---- monitor/hmp-target.c | 12 +----------- target/i386/monitor.c | 2 +- target/m68k/monitor.c | 24 ++++++++++++------------ target/sparc/monitor.c | 14 +++++++------- 5 files changed, 21 insertions(+), 35 deletions(-) diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index 898473b3ed0..ce0bb1983cc 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -34,13 +34,9 @@ struct MonitorDef { int offset; target_long (*get_value)(Monitor *mon, const struct MonitorDef *md, int val); - int type; }; #endif =20 -#define MD_TLONG 0 -#define MD_I32 1 - const MonitorDef *target_monitor_defs(void); int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); =20 diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index 420969bd6eb..3f019ae2a28 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -82,17 +82,7 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const c= har *name) } else { CPUArchState *env =3D mon_get_cpu_env(mon); ptr =3D (uint8_t *)env + md->offset; - switch(md->type) { - case MD_I32: - *pval =3D *(int32_t *)ptr; - break; - case MD_TLONG: - *pval =3D *(target_long *)ptr; - break; - default: - *pval =3D 0; - break; - } + *pval =3D *(int32_t *)ptr; } return 0; } diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 446428602ef..977f65fe16c 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -602,7 +602,7 @@ static target_long monitor_get_pc(Monitor *mon, const s= truct MonitorDef *md, =20 const MonitorDef monitor_defs[] =3D { #define SEG(name, seg) \ - { name ".limit", offsetof(CPUX86State, segs[seg].limit), NULL, MD_I32 = }, + { name ".limit", offsetof(CPUX86State, segs[seg].limit) }, SEG("cs", R_CS) SEG("ds", R_DS) SEG("es", R_ES) diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index 08ced037b47..94bb12833af 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -24,18 +24,18 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) } =20 static const MonitorDef monitor_defs[] =3D { - { "ssp", offsetof(CPUM68KState, sp[0]), NULL, MD_I32 }, - { "usp", offsetof(CPUM68KState, sp[1]), NULL, MD_I32 }, - { "isp", offsetof(CPUM68KState, sp[2]), NULL, MD_I32 }, - { "sfc", offsetof(CPUM68KState, sfc), NULL, MD_I32 }, - { "dfc", offsetof(CPUM68KState, dfc), NULL, MD_I32 }, - { "urp", offsetof(CPUM68KState, mmu.urp), NULL, MD_I32 }, - { "srp", offsetof(CPUM68KState, mmu.srp), NULL, MD_I32 }, - { "dttr0", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR0]), NULL, MD_I32 }, - { "dttr1", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR1]), NULL, MD_I32 }, - { "ittr0", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR0]), NULL, MD_I32 }, - { "ittr1", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR1]), NULL, MD_I32 }, - { "mmusr", offsetof(CPUM68KState, mmu.mmusr), NULL, MD_I32 }, + { "ssp", offsetof(CPUM68KState, sp[0]) }, + { "usp", offsetof(CPUM68KState, sp[1]) }, + { "isp", offsetof(CPUM68KState, sp[2]) }, + { "sfc", offsetof(CPUM68KState, sfc) }, + { "dfc", offsetof(CPUM68KState, dfc) }, + { "urp", offsetof(CPUM68KState, mmu.urp) }, + { "srp", offsetof(CPUM68KState, mmu.srp) }, + { "dttr0", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR0]) }, + { "dttr1", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR1]) }, + { "ittr0", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR0]) }, + { "ittr1", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR1]) }, + { "mmusr", offsetof(CPUM68KState, mmu.mmusr) }, { NULL }, }; =20 diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c index e9300ded4ad..a60671a60a4 100644 --- a/target/sparc/monitor.c +++ b/target/sparc/monitor.c @@ -41,13 +41,13 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) =20 const MonitorDef monitor_defs[] =3D { #ifdef TARGET_SPARC64 - { "asi", offsetof(CPUSPARCState, asi), NULL, MD_I32 }, - { "pstate", offsetof(CPUSPARCState, pstate), NULL, MD_I32 }, - { "cansave", offsetof(CPUSPARCState, cansave), NULL, MD_I32 }, - { "canrestore", offsetof(CPUSPARCState, canrestore), NULL, MD_I32 }, - { "otherwin", offsetof(CPUSPARCState, otherwin), NULL, MD_I32 }, - { "wstate", offsetof(CPUSPARCState, wstate), NULL, MD_I32 }, - { "cleanwin", offsetof(CPUSPARCState, cleanwin), NULL, MD_I32 }, + { "asi", offsetof(CPUSPARCState, asi) }, + { "pstate", offsetof(CPUSPARCState, pstate) }, + { "cansave", offsetof(CPUSPARCState, cansave) }, + { "canrestore", offsetof(CPUSPARCState, canrestore) }, + { "otherwin", offsetof(CPUSPARCState, otherwin) }, + { "wstate", offsetof(CPUSPARCState, wstate) }, + { "cleanwin", offsetof(CPUSPARCState, cleanwin) }, #endif { NULL }, }; --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075928; cv=none; d=zohomail.com; s=zohoarc; b=kG++iCj67IES5PQlvklrC7ILgt+m0yXrkw65DvaJ4Oiuc9fnaqP6HTqRopFgxCAvXlEkJHqEWHx2OJmn5FJuMFGRbQLozl6ntEYUr/wWHKWW2vyZfnL2tKuJEAkgl24YoVS6t9ZtJBUkk0U4lvPEoxxBTqiiCuJ6VTmKkuD53Rc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075928; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=oAJWvOlyHXXa761YRrbvQ94Cv0yNBj3ubObQ8ebHkXo=; b=VpPORm4YcJ9F89KRR+V3pPqL8OFpOfMUn6cSydNrhwvZTzZLZKFqQzeWB6sG+Tur7UAfPbncbRGjVEQiKNe4g15dV9xzzg47VfGnqsgulAS7IpLMf3mihTvSU6Bla5ix26eg87/2aJcpXROQM/krViUxV8QIk6Jhfp4Q8PyiGAg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807592854325.859836458036057; Wed, 6 May 2026 06:58:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKclg-0008EB-Uc; Wed, 06 May 2026 09:58:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKclc-00087f-J0 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:24 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKclZ-0008PX-Ub for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:24 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4891d7164ddso35852155e9.3 for ; Wed, 06 May 2026 06:58:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e530a67dcsm27288165e9.2.2026.05.06.06.58.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075899; x=1778680699; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oAJWvOlyHXXa761YRrbvQ94Cv0yNBj3ubObQ8ebHkXo=; b=BUahVIbjANbh3ZnWjsJlgwMOiKd7jBd1N9nZttvB7mPHYv8Vm0BzjHM8gvtvAuE/GI H9nHiZo9IHLCaqwmX587Nv8WjfbnoNBCMdYqRerHpsjYqmhPg9BOgXOBiTueKJYJUpBV CoG7tXScMXAFckdkjFaIi98+BjQZlUAOJ0eyAmhmo+cuY9uSm3/Q3ZkQFRgob3izTo+M 2qCo0HRJp9suhQp0mvolbzpUxVcrcBuQDf92xhjiFp4gs5yUu6Y1VO7rStf8V/xk6lUb 9xOv6kksgj1H3OaCzOdaj4hm/CSEe2K7Kvb68jCO+3twb1BdKPS3IKPrKVvDRyrWWDVB uvsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075899; x=1778680699; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=oAJWvOlyHXXa761YRrbvQ94Cv0yNBj3ubObQ8ebHkXo=; b=c1OLZFJQWsIZf89i4peKkLPhkuQhZMS164B7nzL4Z6Ynrmi5oxY0ohHlXkOlpA/DBO EG/saxuhnBkYRcKjjSIVlvqFdo1tczdtucQO8CQJsrdEDX92XRjfzwGDrDvN+iFkunLF Oivizcvj/Rc8gwUODKOPD/YqIcti4uvrWaE2ppg8R4nSdgcamYg2ksGluVKfJCllHzdb q9REUX+qPc/jYKizQGfFuWEuAmJW+/rl6IGZFr91Za6Qc7zQqi/NkQaYv0hc3ntzsqys zR04J4AbsldAO9v8oSmx6Jj5i9pcQqU68kx5iSUyR/oATYPnSd5eDa9Cqm5WZppQQnLK q49w== X-Gm-Message-State: AOJu0YzD+Jmc67Z4gnqdcSlJRD8fkiadkSd66p4q4ICriVp8ZS7O1K6l cCy+XeUUhcLoWWMhoaaow37ciokf/44ox6H8qINX6RDu7z/phN2exhsK0OJt61Rg54UbtqKuKYK Ues9n4xE= X-Gm-Gg: AeBDieslCGSyIdaZgvToZ2ONEsM6dsNlZ/AyyvxgLK0SyCqoCkjBEBJ2p2s2lHd+Gqa uoakutZSD6l5QQ8apHO5L1OmWXrbfZUn8BcbWV1e655S+YpxcyKQiCKc4xgY9DoxCQVrxg7xbT/ YqjERKhJdg7daOIwRmjqB5AbpZMMDT4zsRnhO4w3w9UwmiKKFCXVOVMublllHKT79wEMTSHMcmY coYg07D41HibB4JXruyA60opEBpfuHftfOSok+RP11J4jJUYYvZq0BPzvEkHlN7qZaJRkOTXzjF WQNnMUzDWzT6xrm5EKuR14++86h2j1oXXpB5EqLDM9jCB5Z5je2Sfo/ZyiqX2s4ethzuXUVfdHn atPQnW4dpXVSxhWTtXbfwyBi2Dd/NsK/xJtZzGPaI3/JX1PN3oBjgcKcG/H6rY8UlALIDYRpG9O FRai07FJJdN3jasivhv26xd62z2JpQYeO591JIav8+ZdIszD1DVkjAEmmmMLBc9ho0zz0d+2ykO IqRpq84D3M= X-Received: by 2002:a05:600c:b8a:b0:48a:56de:d620 with SMTP id 5b1f17b1804b1-48e51f32ac3mr64925905e9.14.1778075899312; Wed, 06 May 2026 06:58:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 023/110] monitor: Extract completion declarations to 'monitor/hmp-completion.h' Date: Wed, 6 May 2026 15:53:55 +0200 Message-ID: <20260506135524.20617-24-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1778075929187154100 Many files include "monitor/hmp.h", but few of them really need the completion declarations: move them to a distinct header. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260320160811.28611-2-philmd@linaro.org> --- MAINTAINERS | 2 ++ include/monitor/hmp-completion.h | 40 ++++++++++++++++++++++++++++++++ include/monitor/hmp.h | 21 ----------------- chardev/char-hmp-cmds.c | 1 + migration/migration-hmp-cmds.c | 1 + monitor/hmp-target.c | 1 + net/net-hmp-cmds.c | 1 + qom/qom-hmp-cmds.c | 1 + system/qdev-monitor.c | 1 + system/runstate-hmp-cmds.c | 1 + trace/trace-hmp-cmds.c | 1 + ui/ui-hmp-cmds.c | 1 + 12 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 include/monitor/hmp-completion.h diff --git a/MAINTAINERS b/MAINTAINERS index afa178c5cce..ac47299fd83 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3403,6 +3403,8 @@ F: monitor/monitor.c F: monitor/hmp* F: hmp.h F: hmp-commands*.hx +F: include/monitor/hmp.h +F: include/monitor/hmp-completion.h F: include/monitor/hmp-target.h F: tests/qtest/test-hmp.c F: include/qemu/qemu-print.h diff --git a/include/monitor/hmp-completion.h b/include/monitor/hmp-complet= ion.h new file mode 100644 index 00000000000..dab21867dc9 --- /dev/null +++ b/include/monitor/hmp-completion.h @@ -0,0 +1,40 @@ +/* + * Human Monitor Completion handlers + * + * Copyright IBM, Corp. 2011 + * + * Authors: + * Anthony Liguori + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HMP_COMPLETION_H +#define HMP_COMPLETION_H + +#include "qemu/readline.h" + +void object_add_completion(ReadLineState *rs, int nb_args, const char *str= ); +void object_del_completion(ReadLineState *rs, int nb_args, const char *str= ); +void device_add_completion(ReadLineState *rs, int nb_args, const char *str= ); +void device_del_completion(ReadLineState *rs, int nb_args, const char *str= ); +void sendkey_completion(ReadLineState *rs, int nb_args, const char *str); +void chardev_remove_completion(ReadLineState *rs, int nb_args, const char = *str); +void chardev_add_completion(ReadLineState *rs, int nb_args, const char *st= r); +void set_link_completion(ReadLineState *rs, int nb_args, const char *str); +void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str= ); +void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str= ); +void ringbuf_write_completion(ReadLineState *rs, int nb_args, const char *= str); +void info_trace_events_completion(ReadLineState *rs, int nb_args, + const char *str); +void trace_event_completion(ReadLineState *rs, int nb_args, const char *st= r); +void watchdog_action_completion(ReadLineState *rs, int nb_args, + const char *str); +void migrate_set_capability_completion(ReadLineState *rs, int nb_args, + const char *str); +void migrate_set_parameter_completion(ReadLineState *rs, int nb_args, + const char *str); +void delvm_completion(ReadLineState *rs, int nb_args, const char *str); +void loadvm_completion(ReadLineState *rs, int nb_args, const char *str); + +#endif diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 9b66458d21f..27ce1c303f4 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -114,27 +114,6 @@ void hmp_vhost_queue_status(Monitor *mon, const QDict = *qdict); void hmp_virtio_queue_element(Monitor *mon, const QDict *qdict); void hmp_xen_event_inject(Monitor *mon, const QDict *qdict); void hmp_xen_event_list(Monitor *mon, const QDict *qdict); -void object_add_completion(ReadLineState *rs, int nb_args, const char *str= ); -void object_del_completion(ReadLineState *rs, int nb_args, const char *str= ); -void device_add_completion(ReadLineState *rs, int nb_args, const char *str= ); -void device_del_completion(ReadLineState *rs, int nb_args, const char *str= ); -void sendkey_completion(ReadLineState *rs, int nb_args, const char *str); -void chardev_remove_completion(ReadLineState *rs, int nb_args, const char = *str); -void chardev_add_completion(ReadLineState *rs, int nb_args, const char *st= r); -void set_link_completion(ReadLineState *rs, int nb_args, const char *str); -void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str= ); -void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str= ); -void ringbuf_write_completion(ReadLineState *rs, int nb_args, const char *= str); -void info_trace_events_completion(ReadLineState *rs, int nb_args, const ch= ar *str); -void trace_event_completion(ReadLineState *rs, int nb_args, const char *st= r); -void watchdog_action_completion(ReadLineState *rs, int nb_args, - const char *str); -void migrate_set_capability_completion(ReadLineState *rs, int nb_args, - const char *str); -void migrate_set_parameter_completion(ReadLineState *rs, int nb_args, - const char *str); -void delvm_completion(ReadLineState *rs, int nb_args, const char *str); -void loadvm_completion(ReadLineState *rs, int nb_args, const char *str); void hmp_rocker(Monitor *mon, const QDict *qdict); void hmp_rocker_ports(Monitor *mon, const QDict *qdict); void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict); diff --git a/chardev/char-hmp-cmds.c b/chardev/char-hmp-cmds.c index 8e9e1c1c021..f377e00b699 100644 --- a/chardev/char-hmp-cmds.c +++ b/chardev/char-hmp-cmds.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "chardev/char.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-char.h" diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index 0a193b8f54a..d5712d11b8c 100644 --- a/migration/migration-hmp-cmds.c +++ b/migration/migration-hmp-cmds.c @@ -17,6 +17,7 @@ #include "block/qapi.h" #include "migration/snapshot.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-migration.h" diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index 3f019ae2a28..da7dd7f31f2 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -29,6 +29,7 @@ #include "system/device_tree.h" #include "monitor/hmp-target.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "block/block-hmp-cmds.h" #include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-misc.h" diff --git a/net/net-hmp-cmds.c b/net/net-hmp-cmds.c index e7c55d27876..2b24c9e6049 100644 --- a/net/net-hmp-cmds.c +++ b/net/net-hmp-cmds.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "migration/misc.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "net/net.h" #include "net/hub.h" diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c index 32e40630c96..47110ca58c0 100644 --- a/qom/qom-hmp-cmds.c +++ b/qom/qom-hmp-cmds.c @@ -8,6 +8,7 @@ #include "qemu/osdep.h" #include "hw/core/qdev.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-qom.h" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 5c00bbf483b..e90eb6247ea 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "hw/core/sysbus.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "monitor/qdev.h" #include "system/arch_init.h" diff --git a/system/runstate-hmp-cmds.c b/system/runstate-hmp-cmds.c index be1d6769926..02d1d42bf39 100644 --- a/system/runstate-hmp-cmds.c +++ b/system/runstate-hmp-cmds.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "exec/cpu-common.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-run-state.h" diff --git a/trace/trace-hmp-cmds.c b/trace/trace-hmp-cmds.c index 45f4335ff5d..390173095cf 100644 --- a/trace/trace-hmp-cmds.c +++ b/trace/trace-hmp-cmds.c @@ -24,6 +24,7 @@ =20 #include "qemu/osdep.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-trace.h" diff --git a/ui/ui-hmp-cmds.c b/ui/ui-hmp-cmds.c index 6c93d452c9c..1e9bc77bd80 100644 --- a/ui/ui-hmp-cmds.c +++ b/ui/ui-hmp-cmds.c @@ -18,6 +18,7 @@ #include #endif #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor-internal.h" #include "qapi/error.h" #include "qapi/qapi-commands-ui.h" --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075933; cv=none; d=zohomail.com; s=zohoarc; b=gPPPtaoV0EYDJyIXCCRfTFvlAtWDlo7uJ+dOf/qMgwXm6/xmgkNBpids/mEEVBX4TGDbcywndH/0HmyyG4bHDNLGTDWh6mQp32EzzUdc+nG6yI3fMjOFUW5stFhwpuDeTDyWhN99buPG5MiDGt+MuafNj0Sp77cTi8tZV+CpL/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075933; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Jv9fwwqWCOIA7tkY/IRQQiea14CdYAGlBRTbGc/KAYc=; b=b5kqz39YamiIp7145Imxp+HqUVCleUcNeK39hpb+uz+/P5gaqJOzJZq3CNJd9qQuaqxism8VueEOrAsh4zxQMwgmARmKwDNbWouomLIAiFloZ6gpqRe5S4aG689zOi3fJv+2p7Pz6GzVza9gY0Ym2EqDJdFdM258TGsaw2d7VWw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075933184665.7906144642017; Wed, 6 May 2026 06:58:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcll-0000Ba-CJ; Wed, 06 May 2026 09:58:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcli-0008Qh-Ks for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:30 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKclh-0008RJ-1b for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:30 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-43d734223e4so633577f8f.0 for ; Wed, 06 May 2026 06:58:28 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45052a48b23sm13024464f8f.14.2026.05.06.06.58.25 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075906; x=1778680706; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Jv9fwwqWCOIA7tkY/IRQQiea14CdYAGlBRTbGc/KAYc=; b=Tn6z0iOWcB9gM8lWjg1Mu6pcjSqyY4ChoT7A+xzwk6zkI9o82YnmOd0yQXrTWiVNlY gPdk5ybmw2cy8A2rZSdiKsW+3AbvSOQIQN3Uadz67VbbEU9yNLQv8wc7q0Guue/JevAq k+HxRMzSobZe9D7ACRUliP8/1n1Qz0wfh2UPm44jWg5U+lG/Oo4JwxaJpX28h3gv0N7J 00/cyUlPnw3DcZJCbWdckVr2S7J3P8xIUFMaOEILAYQux9WBDEAKEPEPcr2nqdePgg2Q suxidTC4a+01yjVRPTTdKSdaJHcj3m5ZsrNCqQaiLLPlVLsIUABwlTJKHGxyBhT8JWQ8 XrfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075906; x=1778680706; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Jv9fwwqWCOIA7tkY/IRQQiea14CdYAGlBRTbGc/KAYc=; b=nApILNI9y/iGHuYevNkFjm3ugC7Nbd0EUryJjhXLNDHNRjIRSHgwN/QFxxPK/2sSqF uzmKBYkmd3WheSnWAg9Bk6pz8rGVFtn09t+6v0AT5UnOeHgKHDReOfMmW4kgO3VvJK7n mQ/Sg1I+TyZs2g606LXcUx/25LItlq5Kgppo/k5uh8YOMWvQrB0C2GTLnDbdsSqye/4R kbHGoNr1umkrHqyIhMJ6U2ih7fKmZnbHnhzEoX1ccbhvUIvuUnw45kN2GuNNZhCZFmBY /lVYWWcgv1OrZINc5A4i6NJD+lFDgGbrxxy2frmvRRUpdpNKEugGPGtdaNEfGGwkmcFQ tDXQ== X-Gm-Message-State: AOJu0Yzxvvdxx9ezQRl2472D6Ms6PUga1cWN/9V/huPJcblOBwP7ni6+ omUh4lBZKeVzP+fzhNQpulOqS5x1J8vV37dpi109hxrfNmkZJ5Q+Lk9czbtnkwulUg4t887xPu4 9Mppfve8= X-Gm-Gg: AeBDiesbWPuJpegmpAo7SY/oBrKSO9nFdRxR12UsjOLlbrluvEuzXGyyhpk4osGk4yL pEsLOST9GGPsymSCz+g4ZYQw5q4fzOcU1n8D61PrL3eRbM8wsSxWGMGM/PqTsafNcSWlc5XhxnR Djd4Ufjef0WAELbU6J9UAJrtDTcuAMsU8ZA+knXkHRD52KZs3bt4G+WKgLuUy2OCfLym+3NddVr DKW8zJVoOmTS5fD1sMjGXEDi6jqVhUU6y80eb4UWtR6XynOlkikggZQK0LdCSowuRCLp8NJaXuV 6C+GHdJ1kfoLF4uK4YRTU+6EFwmPB4HrEHjePMWZL4uL0fNkU8SdxqVGG5wGO/r08a8k395W5qN 2/JWiZcrAgdEoQhYUg/JzvymHTygO5tFmiXvuVCmvqPHI9Sc12kCuG9i+4nvLiGuYFPbLTn4+na FlTWNF3pkbSO6oWQ2OWI6QriPIHyXtUkjxvLnCrHsyMGyta8COIZAy+Tp7VpSZ2zhsAotf8TBL/ DtJK1xD7XE= X-Received: by 2002:a05:6000:40dc:b0:44f:da08:179a with SMTP id ffacd0b85a97d-45165d24154mr5641798f8f.16.1778075906536; Wed, 06 May 2026 06:58:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 024/110] hw/misc/allwinner-cpucfg.c: make compilation unit common Date: Wed, 6 May 2026 15:53:56 +0200 Message-ID: <20260506135524.20617-25-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: 1778075935183154100 From: Pierrick Bouvier include "target/arm/cpu.h" is needed because of: bool target_aa64 =3D arm_feature(cpu_env(target_cpu), ARM_FEATURE_AARCH64); This file is reused between various allwinner boards, including 32 and 64 bits cpus. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260312224702.1608408-3-pierrick.bouvier@linaro.org> --- hw/misc/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 245ab9b98cc..cd084a19363 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -46,7 +46,7 @@ system_ss.add(when: 'CONFIG_ALLWINNER_SRAMC', if_true: fi= les('allwinner-sramc.c' system_ss.add(when: 'CONFIG_ALLWINNER_A10_CCM', if_true: files('allwinner-= a10-ccm.c')) system_ss.add(when: 'CONFIG_ALLWINNER_A10_DRAMC', if_true: files('allwinne= r-a10-dramc.c')) system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-cc= u.c')) -specific_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-cpu= cfg.c')) +system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-cpucf= g.c')) system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-dr= amc.c')) system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3-sy= sctrl.c')) system_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sid.c= ')) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075955; cv=none; d=zohomail.com; s=zohoarc; b=ksaRUVATTtn8SAheEFliA3uAsof14H2aPO/HQUQriadtBW05H2XRt2N/Ch2ogNOQpxBikb477RCbpLPzjcaj3TAFw7ytPhODUDQ/0V+7crsBidfyg+FpOZXtf1qcof5/VGB3Di5n0O2SP/GDUJIk2fSoCmyrypCZmozi8wXx5Ts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075955; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=60coApDZP+p798+jT/PZ7anbii2bv3aln1igBOsFf3w=; b=Qk65THNTtm0WwMYUncfdZKKnsyObLtVJa4mlwMgsMgnpyUzkgnexJdZZvzTI3taVfCXxwTMKjdNO1mBMhHBwqZepWGUNETUt1D6W57GRTLSgM2t2fIoc9I336GsnVm75B/j0Pym7JEWrzp6J7Xcgmu9AXNBhdpk9UbrQD9tmnIg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075955206288.64325194866; Wed, 6 May 2026 06:59:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKclt-0000gw-Fp; Wed, 06 May 2026 09:58:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKclq-0000Z9-Gj for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:38 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKclo-0008S8-F5 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:38 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-452169ae568so381224f8f.3 for ; Wed, 06 May 2026 06:58:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45054b02c5asm12705649f8f.19.2026.05.06.06.58.32 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:58:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075914; x=1778680714; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=60coApDZP+p798+jT/PZ7anbii2bv3aln1igBOsFf3w=; b=mPLUIFijtf0dByUrf+rTaWyiAyUKmmXGEZkli+/maW56fgfl34LOOYtr3h2sHM6K72 3TFAVk75myYDAfREUzQWo/VBSBPF9atgAZ5goS+RtcToQWGQErUWhJqBoKFUw3po8G1E cZJuWd48PpK5gtDDdg9I5IUy+VZm+TBaBbNlAXmoHhUvSL97nSdLnJenbrxUocfk3gan GdTvzVQAa0MWe3vkqhvFVqOjxZy73+M1C7Xgp/i1TAw97xhY6r46gE6B2FIU3B15RAXD SefaCbJjDwIlgAxMF8os0Ch2ubJ74QNcjDNVU86ZQTqIwQrIW+TP/N78ADyDKHIddkpC Sklw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075914; x=1778680714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=60coApDZP+p798+jT/PZ7anbii2bv3aln1igBOsFf3w=; b=fKU69jqmDZKD0KbSO8ZABOblI1wEm+nk6ylHfJrRV5IvuHtXM5ON4wOFur2c6on7Xb mEULwzTVxfYrTnARBB91ey595Gdbb/H9ALOM9JgG/gLydbm5iBZMymeoSUuHOoUrlj/B Uug2B/lh3m2PRXHwhDQ8HlKKp1KS1oklwCID9lv1vwbVCRMnzoKmiCunFBiSC7GOYfw6 tUfuleFssqK0LrDixpso829/TKnkACx65Ve/upBTZ2xYq8OSp/Frtm20yXhmJdrd2lcd Cw4EXTDBDvApZ8T8C6Dinz9Fo1mHXjye8EawHD3Iwv+kzvICA+rAnaUJTmnBoDZ1lSXR W8wQ== X-Gm-Message-State: AOJu0YwIGbj+5f1v7LDdKwrGnjLolXWlUWzREBya2kU51KJ/9FvfOFR4 nPzyhQWvZnkHn1UUZcnfWdDOadpZbXA7B0NflfUl0YwbzYcObZDguPzck/9L9DYuXbyZBZWQ9xW mwDprxxo= X-Gm-Gg: AeBDiesJLfpM4x8LEY6IHGdUSmamQyvrI3AsAdMfxQEUh+piEVgIgwhXtl4oGlYhHwB +0lxB+/OUXMfL8v6aoZrKVZl6WiR72W7acgX+1HtuvzBndvlHVsewr+y2JWoGsf2aFemQ20fHWy iqFFGUSb+wC68ga1nsKElPJUQ8SLNfweVuLoW0+0CUTPHA0GtcuOZG0QDhDAlTLlhFa9K+uGbXF o9+X4yLmbDAKcm2juonY40iENi1MIdi3BwNHG5yss64b6ycnAQcaFpWbTu3ZYpLNI2EQsg5WWGU D3V+ms6UGNjZzhbO4PQIs0OtXiMWbF+CeJW/TzKQJP4YKv3JN/Am/lSQRr7pKwL09cxNTDVkGDo O+jeZo99aOzXelNmzwvBsKb7bfa1CyMghu9XNXaJ/vGVMX1PKjGhpXsWfCaJg3MOuEkgjwV5yxZ 2WkmLix1Nimd/I90/PH5+K9w3TxH4bO3tT+0dSokQQnbhJ3uquh+f7G2Kf3X+JYaLu594SqmEiu 1cSM8352Vs5L2gl3VsVLA== X-Received: by 2002:a05:6000:1885:b0:44b:d975:1293 with SMTP id ffacd0b85a97d-4515b056ab6mr6830452f8f.1.1778075913851; Wed, 06 May 2026 06:58:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 025/110] target/loongarch: Replace legacy ldq_le_phys() -> address_space_ldq_le() Date: Wed, 6 May 2026 15:53:57 +0200 Message-ID: <20260506135524.20617-26-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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: 1778075956147158500 Prefer the address_space_ld/st API over the legacy ld/st_phys() because it allow checking for bus access fault (although the modified code doesn't check that). There is no logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Message-Id: <20260319104944.66690-2-philmd@linaro.org> --- target/loongarch/cpu_helper.c | 13 +++++++++---- target/loongarch/tcg/tlb_helper.c | 10 +++++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/target/loongarch/cpu_helper.c b/target/loongarch/cpu_helper.c index 60441687667..4b7743c4f28 100644 --- a/target/loongarch/cpu_helper.c +++ b/target/loongarch/cpu_helper.c @@ -7,6 +7,7 @@ */ =20 #include "qemu/osdep.h" +#include "system/memory.h" #include "system/tcg.h" #include "cpu.h" #include "accel/tcg/cpu-mmu-index.h" @@ -145,6 +146,7 @@ static MemTxResult loongarch_cmpxchg_phys(CPUState *cs,= hwaddr phys, TLBRet loongarch_ptw(CPULoongArchState *env, MMUContext *context, int access_type, int mmu_idx, int debug) { + const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; CPUState *cs =3D env_cpu(env); hwaddr index =3D 0, phys =3D 0; uint64_t palen_mask =3D loongarch_palen_mask(env); @@ -174,7 +176,7 @@ TLBRet loongarch_ptw(CPULoongArchState *env, MMUContext= *context, /* get next level page directory */ index =3D (address >> dir_base) & ((1 << dir_width) - 1); phys =3D base | index << 3; - base =3D ldq_le_phys(cs->as, phys); + base =3D address_space_ldq_le(cs->as, phys, attrs, NULL); if (level) { if (FIELD_EX64(base, TLBENTRY, HUGE)) { /* base is a huge pte */ @@ -204,10 +206,13 @@ restart: context->pte_buddy[1 - index] =3D base + BIT_ULL(dir_base); base +=3D (BIT_ULL(dir_base) & address); } else if (cpu_has_ptw(env)) { + uint64_t val; + index &=3D 1; context->pte_buddy[index] =3D base; - context->pte_buddy[1 - index] =3D ldq_le_phys(cs->as, - phys + 8 * (1 - 2 * in= dex)); + val =3D address_space_ldq_le(cs->as, phys + 8 * (1 - 2 * index), + attrs, NULL); + context->pte_buddy[1 - index] =3D val; } =20 context->ps =3D dir_base; @@ -239,7 +244,7 @@ restart: ret1 =3D loongarch_cmpxchg_phys(cs, phys, pte, base); /* PTE updated by other CPU, reload PTE entry */ if (ret1 =3D=3D MEMTX_DECODE_ERROR) { - base =3D ldq_le_phys(cs->as, phys); + base =3D address_space_ldq_le(cs->as, phys, attrs, NULL); goto restart; } =20 diff --git a/target/loongarch/tcg/tlb_helper.c b/target/loongarch/tcg/tlb_h= elper.c index c0fd8527fe9..892e0eb4738 100644 --- a/target/loongarch/tcg/tlb_helper.c +++ b/target/loongarch/tcg/tlb_helper.c @@ -20,6 +20,7 @@ #include "exec/log.h" #include "cpu-csr.h" #include "tcg/tcg_loongarch.h" +#include "system/memory.h" =20 typedef bool (*tlb_match)(bool global, int asid, int tlb_asid); =20 @@ -709,7 +710,7 @@ target_ulong helper_lddir(CPULoongArchState *env, targe= t_ulong base, hwaddr index, phys; uint64_t palen_mask =3D loongarch_palen_mask(env); uint64_t dir_base, dir_width; - + uint64_t val; =20 if (unlikely((level =3D=3D 0) || (level > 4))) { qemu_log_mask(LOG_GUEST_ERROR, @@ -736,7 +737,9 @@ target_ulong helper_lddir(CPULoongArchState *env, targe= t_ulong base, get_dir_base_width(env, &dir_base, &dir_width, level); index =3D (badvaddr >> dir_base) & ((1 << dir_width) - 1); phys =3D base | index << 3; - return ldq_le_phys(cs->as, phys) & palen_mask; + val =3D address_space_ldq_le(cs->as, phys, MEMTXATTRS_UNSPECIFIED, NUL= L); + + return val & palen_mask; } =20 void helper_ldpte(CPULoongArchState *env, target_ulong base, target_ulong = odd, @@ -802,7 +805,8 @@ void helper_ldpte(CPULoongArchState *env, target_ulong = base, target_ulong odd, ptoffset0 =3D ptindex << 3; ptoffset1 =3D (ptindex + 1) << 3; phys =3D base | (odd ? ptoffset1 : ptoffset0); - pte_raw =3D ldq_le_phys(cs->as, phys); + pte_raw =3D address_space_ldq_le(cs->as, phys, + MEMTXATTRS_UNSPECIFIED, NULL); tmp0 =3D loongarch_sanitize_hw_pte(env, pte_raw); ps =3D ptbase; } --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076212; cv=none; d=zohomail.com; s=zohoarc; b=dCZq/OWicuJy9DvGBcLYRqEo9ry1Qm9fXB2jSKdXQvvFF0AFvFj4m4rQsRVg9S3rxkPLdgqFjDm618fpZ8v4kjmOCowIC6UQiGxWpmo6Dn9RGhmiwhk7S0vPVx1613EanUTk3KKNPXQ5Iw2oDLk8LeK7cyPbCsW5l8pen9MKwwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076212; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=d7TIY9G+i221kVT/MKKd9WydWOZ6glVEIgxZHbUxyNM=; b=EEjhM3v7XWIx9p05veJ4DK0MkFkTpM+6GIb0VKj6c2FdBSB88mBPPVtMwlH3Kdyk/9FaEFwBO2xDnPaSty+F4OeCYQmY8WfF1AQVgpUJPOQZIZtXmwaWajHPZNQt8jMQVEcpeLbY/3BA6Scc2+ZFMOhW1duZQPFfLG5PW8tFGr8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076212442520.7877029396776; Wed, 6 May 2026 07:03:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcm0-0000mV-K0; Wed, 06 May 2026 09:58:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcly-0000m5-BI for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:46 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKclw-0008Uk-TS for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:46 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so99804835e9.2 for ; Wed, 06 May 2026 06:58:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4505285e765sm12296126f8f.10.2026.05.06.06.58.39 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:58:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075922; x=1778680722; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=d7TIY9G+i221kVT/MKKd9WydWOZ6glVEIgxZHbUxyNM=; b=wr9UGd0B+CY99gTY55gPRAcejlNwKPknkwu7pLTFhG/TwjIfvngYQcw0V00ZVu7bv5 vnwffs2w8BP4FuiDfyezGItkNSNyVk4KzaR7+ne9qy4aK/tWruYuiw0jKLdn3MQb/IHo sGI/0qMaPJtSDB0O8CSc8ynQASR7vZ2Gc3BIDpySEOgSvKBCKgHFQ/UF/LlG8qKLhKbG lPLpDvkTdsJm6b//Lsu/Nv1jEXO0GPqNPOzM7BXkv2b7ZIecrxpxvCWaPAbHoC3H2q5G yRKyAWZDm/NQUGMMGBckSGJCaXOm9itKqzPBDmudAfj2kiF/zdMK5x28vQRMmKdCIyXU c7OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075922; x=1778680722; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=d7TIY9G+i221kVT/MKKd9WydWOZ6glVEIgxZHbUxyNM=; b=oXzEOO786EPAFRLKTRJwS23dq50t/1yPh89IflEtuElNJjgf3N/LcOpaZWCgcq1iVv e0yfsdUcQvX8Hh+HEq50m4vEGie+iWWON2N8khlFV/Jxc+trriwuLMzMYz8CtQBsQzt1 uHiEd2Fpp8CBofCBR42uREft1Ynl8x02QqNT7Vmolw48jFkcvCYn3dAabbbgfFoPRUtC Hw0dUwnqHseKo91uox31VRodg0yMKZXeGMaxuErP4comiFeMA7K0FvPXiX8HwFiGoOga FKMx0oMD50161FzrnLSL3dtcM9e3unj2+17v47qptMJ1ok5VGvwEGg95MO6oEXT+cXYj H1pg== X-Gm-Message-State: AOJu0YxcoG4SSpVwesECxQ1O5IlAjBpL5PW2eDMW7UYHHc0IG9xSw/Ge gN1jKqUEzXWGQqPymiXuTptx6g9An0upnllx1mKxBTp9FDH4gGHE+mpCUqlOgEjYkd7WqpIPCTB rtcfAaUk= X-Gm-Gg: AeBDieuI6otwA+feFo/EBUnRCdx99haPTkIIoeA4foqEimfLHeuHgxzTyBWV4v2u1FX SVYn/0O72S3T7NajR6gBzZGWSGg/EY8FE1kkrSlvWoM84ld8wB0oCU2odHsgxQqeXkCB4gSjLNT RSvon/rcYSyY7Xhcps3iq+cbdi3mB+oyVqXAOsE/Or8e+EtDRObskoHkDZa2Bv2U0Ea76dMAy3w nJmu8nLeEhwxv4KoUVoBMNK73i0nPyNQc2B48wUYjY5/Cpy4nobGUQNH+p5MoE1UPIAIxJjW3Ah GSSNNuMYowM8e2fznFQu+cXLpgmyF1CTmxGqH8YPjgGE40slgXB1Qbosch3H6xAgAUYVL5MZHZZ LCUdDkWzxLyF/OMNs6E2u7IIyvK5M9OalRBwwchp1slWUrLyBJwEVWizgtQFPh5xdd5Crn6+MTV fjT/haneTUo0YErxDLO5LqAfnHWX6jsxIJwtxqgvnCG74qSmszQF5hbl1hROTPeGpMT3mwCAGUA yom8vu5GIk= X-Received: by 2002:a05:600c:8115:b0:48a:9540:1a3a with SMTP id 5b1f17b1804b1-48e51e196f9mr59171685e9.8.1778075922057; Wed, 06 May 2026 06:58:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 026/110] configs/targets: Restrict the legacy ldst_phys() API on LoongArch64 Date: Wed, 6 May 2026 15:53:58 +0200 Message-ID: <20260506135524.20617-27-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1778076214280154101 The LoongArch64 target doesn't use the legacy ldst_phys() API anymore. Set the TARGET_NOT_USING_LEGACY_LDST_PHYS_API variable to hide the legacy API to the qemu-system-loongarch64 binary, avoiding further API uses to creep in. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Message-Id: <20260319104944.66690-3-philmd@linaro.org> --- configs/targets/loongarch64-softmmu.mak | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/targets/loongarch64-softmmu.mak b/configs/targets/loon= garch64-softmmu.mak index 476407f9413..a425b3dbaae 100644 --- a/configs/targets/loongarch64-softmmu.mak +++ b/configs/targets/loongarch64-softmmu.mak @@ -6,3 +6,4 @@ TARGET_XML_FILES=3D loongarch-base32.xml loongarch-base64.x= ml loongarch-fpu.xml lo TARGET_NEED_FDT=3Dy TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy +TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075967; cv=none; d=zohomail.com; s=zohoarc; b=FwkKiI7c7KHNSIRVXSiRILF26vwCbirJ68y3+ZSD4jgLIb6Sg+7rtOxEUnLogyi6NXLOfWUL9Wh7yDHfUvql6b7p7EIs+D7vIBFgLex65N1hjin4kNonrkSKjpXqYYgix+najePLX9Gd3TB10+qXQTmKUpxMTQXvEuP5H2jTZBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075967; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Rg9sH0NGDIiEEpW0hzEJcpCTEAxsUkbnu7qniyS3cVY=; b=jpGNzlBzFQFWdDw9UHrp3BJQI5KwH3C6zywpjiTJN9AM9kR9Dr8e5Ezu907zonfeqSRJmmRS3pERea9mCJMhUWXzSyMWtFrnqqoWgTs3JkR7Tqa+mmi/f7n9SZPOtHuPTk8BYlQxkS/cJGvfT60Qp5NeN61Sjr/Xz6yMc2y13to= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075967472305.1762330124718; Wed, 6 May 2026 06:59:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcmF-0001Fk-4p; Wed, 06 May 2026 09:59:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcm7-00016d-2U for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:56 -0400 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 1wKcm5-00007C-F3 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:58:54 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so99807555e9.2 for ; Wed, 06 May 2026 06:58:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e530a68aesm26570585e9.1.2026.05.06.06.58.47 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:58:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075931; x=1778680731; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Rg9sH0NGDIiEEpW0hzEJcpCTEAxsUkbnu7qniyS3cVY=; b=VkaPTGxdsaQSmqeYvi+84oBe1a/LQqHkgAhSRiui31GSLA4VrOAaT/s7kcY6lU0Qd2 7zz+tQu39oW1rjmiFneelxAjeEjpLXOdrIQjaQc9RtdyIJrTc0m9F+kdxM/lCb49lvGE mpOk/Dcn56ZXwvdRiFO3NNusJgJjRrw136vRHcKSEBDXhLfVK4eixq9s+NXRXAQ6ftHZ 9rp4mMQE5iUz2u5MNqPzoWma6AjOLqh+1OeH7smPvzRliKAiQQtVw8loCDvOxticTYpU Ug2x7JvfxBFMgKjYP2CvYK35IpbX/GzTuwUBv2WIRKlg1v6GZYpIuS6oFDNYm6YS6Qam oKjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075931; x=1778680731; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Rg9sH0NGDIiEEpW0hzEJcpCTEAxsUkbnu7qniyS3cVY=; b=O1edgmG1Lyq0HOXFVTKVdXu2nAtI1PaaGvkyTLQ5J/KQLQwTyKihdV2OEXJxJR98wc IGnJ2ffmkwH/oGYOka//bHJ/oBz5CW0ePZr7OmEqu7TvcxvyympXUUmxvLwNNWOoZaJQ CPjG8qwhmtXCy3qj6S3XVicUy6o8kSZ77+wVrIavGzl4IRKoZKnUATNpRAhXdPi2nibq kiWSmmhaiXixgL0S47vwpqEpvK5nXdvw5Ez1GV9oTkQFn0Wi/kp0jUTRXz1qAUR1IkFl LxS6C5MacDScik2Ex1qG9ENgHHzx+mgE7w07jSPV/X5P/U0+2KKqvDLy9vPAzQHQv/l8 Wc/g== X-Gm-Message-State: AOJu0Yz4yVcxCayosZMV6XO5T8Z3O77FBCerrlDcbT+VPtqcCXnAHm0w yu1Y04gVXUioABWB2ew3wB6CcV8Ic+2hOkX1hldSxDYQ2oza48jOfzMkLod+uipgOw5b1WpZgOr LTfiZ8Oo= X-Gm-Gg: AeBDietFTX+d5dteg+gZhhZAnqgtqHpmsJja+QiPa43EmD3RCyY/9OYCTgLIWCp1NcT Gwx7lf0DTIq8+QayXyvhvE2zueMLAmtze+Rb+Q0HUBOerVn6QzXGAXvNlE1TCH3cQrnfcVVDXm3 8AKrpcM3HZjm9HvM7+y1ZiMM/lvG1BBaQ+KYA0XIY8d4qUCgBPUUaTH4DNsl2FUod3tUypXXsqY FzWDfmfZrG1QrpIhHVYjxPY47NxSnTptyPCvIHOlzM2eAbqHG9QcguXBD2qWSXSbj7kPXx0MzVR EYGJuidJPNUM8HlkWe2DuwuSW6YerTmK3m5ZBGQbmDOISI/Bza8TTjP4GyejI96IRasuSpCjIS+ SD1TDabSNYXy5Q2O4XchxJV4M/99OAQgbaGcHvZMAW3JIuPXsyom+Uq6DsMUGYokxIbtFcFD8sZ UWYsypLYTPAFOsGedJAqMXeNCBE02+uX6LeNbSfLo5wG78e/SWrmDO+OeK6TOLu0ScggH/eHoJH Q9qCfHKFCQgcjC5vjAIag== X-Received: by 2002:a05:600c:4ba6:b0:488:a882:c7 with SMTP id 5b1f17b1804b1-48e51f4bab4mr34413535e9.25.1778075930483; Wed, 06 May 2026 06:58:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 027/110] target/loongarch: Avoid target-specific migration headers in machine.c Date: Wed, 6 May 2026 15:53:59 +0200 Message-ID: <20260506135524.20617-28-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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: 1778075969757154100 machine.c doesn't use any target-specific macro defined by the "migration/cpu.h" header. Use the minimum header required: "migration/qemu-file-types.h" which is not target-specific. This allows to build this file as common object. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260325211728.89204-3-philmd@linaro.org> --- target/loongarch/machine.c | 2 +- target/loongarch/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/loongarch/machine.c b/target/loongarch/machine.c index 28b9079d04e..4db53fec267 100644 --- a/target/loongarch/machine.c +++ b/target/loongarch/machine.c @@ -7,7 +7,7 @@ =20 #include "qemu/osdep.h" #include "cpu.h" -#include "migration/cpu.h" +#include "migration/vmstate.h" #include "system/tcg.h" #include "vec.h" =20 diff --git a/target/loongarch/meson.build b/target/loongarch/meson.build index 2ae96d68695..c5a2953b29c 100644 --- a/target/loongarch/meson.build +++ b/target/loongarch/meson.build @@ -10,6 +10,7 @@ loongarch_user_ss.add(files('gdbstub.c')) =20 loongarch_common_system_ss =3D ss.source_set() loongarch_common_system_ss.add(files('gdbstub.c')) +loongarch_common_system_ss.add(files('machine.c')) =20 loongarch_system_ss =3D ss.source_set() loongarch_system_ss.add(files( @@ -17,7 +18,6 @@ loongarch_system_ss.add(files( 'cpu_helper.c', 'csr.c', 'loongarch-qmp-cmds.c', - 'machine.c', )) =20 common_ss.add(when: 'CONFIG_LOONGARCH_DIS', if_true: [files('disas.c'), ge= n]) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075979; cv=none; d=zohomail.com; s=zohoarc; b=AHnoI35k6RIn9wa+aD+mTfVbGwgSIw6DsyctkS2zUkZDbir0OmSvBPH5i9LH6ubVVAJtn1HySenvkDz2eR1IBqITrAuFtZg7WjmXkWlcpbeHqu/TpDewR6LuvPUXHvOS7QxpKFClOeIBqmqgAnlV7Q9/oGSvXtBIfXtvsROOYX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075979; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=C+XEiL09lfmgyHO2Y4EFhGtAKLkwWNf3J69g+kf0h9M=; b=G3mjHQt9BflMo/Uap6tpn6eWKyDo5kLrxhtd4IOl9ltozBfV2eUwoY8qr3tZhC6yXXNAj/+WMeaYReUqpi3fNmtU79e+E4lL333888RuKL+sHI8tZnRsBrIJFeSWc7EEeb8PP9W2Wq0mtyvNNl+fLUKe/0EO0Al6tv5yq7gvMjQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807597967787.0120066352107; Wed, 6 May 2026 06:59:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcmP-0001R5-M1; Wed, 06 May 2026 09:59:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcmF-0001IO-N3 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:07 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcmC-00007z-TY for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:03 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so72867475e9.2 for ; Wed, 06 May 2026 06:59:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53895effsm47957805e9.3.2026.05.06.06.58.56 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075938; x=1778680738; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=C+XEiL09lfmgyHO2Y4EFhGtAKLkwWNf3J69g+kf0h9M=; b=kYj8nnrfkZGwR880+Bcv76pvxyl4JLdzjN5mixbCx3Ae8zkAva4bKmnteAPA5E8PWn QH42pPHiyNDZntfv2zKKMFEa0+8QZ8Sycmyuj391Y0zxEZCQdk+JKLNFh9+Tdi4qhDQE Ef7LasBv1oCvDeo61XZGWB/uoTl3bUkCY3mcfxNa2uRtH/TF7QYR9GhYNuRyVzua9btZ QSCi+gPhVKn9zpNpvO6SzRLkTZtngIFMIogtS99h+wqOvyA05JgwLvntKaRXfAAFkLIJ a//a7R+afH2s4asgj65YIzOBew4hMKz+Pc9XS71D/a20O3tdY+UzfyyeTz/tTJNA2Erp aLjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075938; x=1778680738; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=C+XEiL09lfmgyHO2Y4EFhGtAKLkwWNf3J69g+kf0h9M=; b=kR9xbMt/5zlLBt0MBbC2Sa/yY884+zgKoVoFjFYS/3N/HPDCl16pEGGtUNBWx4m2rg tkKDDSv3jaV/DK3sjiUpe/IHA0Ep5zuH4Ry4i7/4VVFPl1QnvCEkaEi4Nrxao3UwHm0q pOtnTjztKt0oEVDItsqIxQ493pSKd0mxvxn1Lmzyedhs4ImcGIv2z/UUaGZ8YsgYBfZ3 DorcjgCP0gyPvUiBOmQr2l2ZMPENFU/3DNHFGFllJobu2572d8fxSW2vuRY3ZXfPMYMl O1u6KvpOzO52kXTqCURb/rFhvPsBBer5Dd4k8/ux9QvYSsGlhwt3PsvMjBmYW4wIdJYg 1tWw== X-Gm-Message-State: AOJu0YwDIl5r9fCtOwfH8gzE7cmxeudKcrjZn5y/3y3JGZOnFR04xxsi Rh08iBJ52A9TRtgMyMisafjfceVnO2rUZ6nQVG5HyWNvUFhln8DNf8y2qzUEPcQh5bntVcu17rP auSOL1oI= X-Gm-Gg: AeBDieu97Aqgeiu91eC/7OtDTB+hJ6P0NFV3y+ooaec8BJXMGYPcDXV3WvrpRup16x4 JSNRToln4B0N92P6swfusKG+G4dtTduLDTcT3muLcfUPmbaRlFyiXu1Fh0v9gtKFxOZacUJ269f wtGPyeiX3wPcUrEFdImaMe3jY+gR+zrxBk5p5CAe9c001xVc2rbvFNNwG5kz5plYCdMnDxhWM8Z vihwbnsTuriy73DKOLJG55N6xYv+nCkFBSDvMSHJQUPkPMNk+HmSqchLY3Nys175zQ3ApDPmApD /6bV2bZUW1ElWuPBo6Zd+prgeiMqZT9n/0fzDmKV1J9wJs3dV23KBuf4qjGEELJ9BW6DBupOcXy rJudxW/EURNPB9VXaAKtJP3e+TxKbwcxj1kDMBg7tfOqfLEtaUgbFNK5eSQ6QHmZzHAbE8tra6C vh8Xq5+eJlCQT0uTavpF5Wk6XVchmsGE7v2XvpCYyG6Hl2eznfM1zsHqsv+Kz4cpiTkKy2lp2tY KOyMgk7UF8= X-Received: by 2002:a05:600c:a305:b0:48d:364:6c54 with SMTP id 5b1f17b1804b1-48e51f4144amr44601345e9.23.1778075938388; Wed, 06 May 2026 06:58:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 028/110] target/avr: Avoid target-specific migration headers in machine.c Date: Wed, 6 May 2026 15:54:00 +0200 Message-ID: <20260506135524.20617-29-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1778075980275158500 machine.c doesn't use any target-specific macro defined by the "migration/cpu.h" header. Use the minimum headers required: "migration/qemu-file-types.h" and "migration/vmstate.h", which are not target-specific. This allows to build this file as common object. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260325211728.89204-2-philmd@linaro.org> --- target/avr/machine.c | 3 ++- target/avr/meson.build | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/avr/machine.c b/target/avr/machine.c index 4402862fb96..8064a7214a3 100644 --- a/target/avr/machine.c +++ b/target/avr/machine.c @@ -20,7 +20,8 @@ =20 #include "qemu/osdep.h" #include "cpu.h" -#include "migration/cpu.h" +#include "migration/qemu-file-types.h" +#include "migration/vmstate.h" =20 static int get_sreg(QEMUFile *f, void *opaque, size_t size, const VMStateField *field) diff --git a/target/avr/meson.build b/target/avr/meson.build index af5e7d63741..39e5eb02c2b 100644 --- a/target/avr/meson.build +++ b/target/avr/meson.build @@ -15,8 +15,7 @@ avr_ss.add(files( =20 avr_common_system_ss =3D ss.source_set() avr_common_system_ss.add(files('gdbstub.c')) - -avr_system_ss.add(files('machine.c')) +avr_common_system_ss.add(files('machine.c')) =20 target_arch +=3D {'avr': avr_ss} target_system_arch +=3D {'avr': avr_system_ss} --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778075975; cv=none; d=zohomail.com; s=zohoarc; b=C98/XbBlKCP9A5qbmSGhYut7V9XrfCJbJt1gwPgweAuv2lAQa3TA0YyUoXlecX6SzNJYIUBMIHWyMPqO81iL8vpacpfsNIsITcjbDwk2jmOLVg6qlHDFpa4+GcHcKAE5qMFQlTIckFjdm21+zA8JqGXZ6RL721a2VjD/pw3eFoI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778075975; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=uN8T65pcJrUdZDCUXjXD1hQNK+NMnAn+DBz6aNKLp7c=; b=lz1FEdfuLTPen905L77mYRF63WiHMadzbqPLqJFBXjZTCF/Ai4BS99XpCeUjj3qX5Vjg16AMvwnHLK3lxfQyND6kOlq4YqZ6HFaT71i/7GGoAjG9W0afpgNlbLck5hGQCejv9cY9IrjD6Z79uT9ByB5cxbXX1aC6vtrStrKP1fI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778075975914541.6275590015642; Wed, 6 May 2026 06:59:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcmR-0001Zh-6H; Wed, 06 May 2026 09:59:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcmM-0001L2-Nl for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:11 -0400 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 1wKcmL-00008y-7r for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:10 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4891f625344so10775835e9.0 for ; Wed, 06 May 2026 06:59:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53147bc2sm28581545e9.6.2026.05.06.06.59.04 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:59:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075946; x=1778680746; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uN8T65pcJrUdZDCUXjXD1hQNK+NMnAn+DBz6aNKLp7c=; b=wX+eSdgkx6VCadmI3q2RkjVl8bsxON8tlu8sD+7pDZ87bMzOKLsj+WQ/L40AJaAIuE r5rpKNSiqOjZ26m3rwBnFxhcozN8yXDh9dAqH41TNgshJxtsttmBMHPCVy63wMYk0IFr 1Dvsfqhe8CHc8pSIR5/MfQvkObDpz/puX/1h9Dj6XeXl2UUZlny9N+kG3WVkYHylGPqM MaMak/urO7+sgAxF7VoqznaoB9qo4WpYzxIl+GP5n6IoIh/DLt7QDUZ1nT0nGAgD+xXn +XRpJUXPo/RsKG42C2DKgpijMqPubygJKeegOHolovjjKu6NlR1Wt/evxvnq5qAxfo1e B95w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075946; x=1778680746; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=uN8T65pcJrUdZDCUXjXD1hQNK+NMnAn+DBz6aNKLp7c=; b=HgxFFTQJ2Lb2sw0v6esHcMV1wOyTyeA+O1Sbbw8Ff1TSBdxNw8mf9NP/PSF60bBmB/ SY/rl4kS/El/9cLeT8kJ59cxFo6CpuNVE7Gm/IITxunHcZQxuxw6eYjS0+OLUsgNXsKZ B6sc5kgu1MqyVxBNZ7wl2o1oQzFh9EGPp7AI2SanlovQopyIJl7iL6b+fEWeWDgVuqBd xTsXF/mmlpVRBzQ0UXlT6GyFzWZ4hzS8s6yupdVbN7z+X14c77fVLJ0F3rl6JcB9CZik h6B85IvZZuyzAv6tNArCdjWYX7x8+0jCzV26Bkxk2MRV/2SCdm8qt7ZRBxUNFJTjjF1P qYGA== X-Gm-Message-State: AOJu0YxOiyvZ0A2kiI80juHyevLPQMjpKoYUuF7eZkXyrgkF1zltkQ3l KcyWu2YfVtnDSPcziwu5hTAj0Pm7Y9wqObYIvsGEGhJBmDAHNah6HZyHkmabC/RCx6jB294nWYv hEKVHHl8= X-Gm-Gg: AeBDievH6GlxTr5deIn7/NSrirJ4Voqet8VI9mwzn4hClpdv669QPVIHu5PkpsslJrX q7fkU+E18TUFnzt3N9e7NaMAuXY3h8tmaYXW9414wtfyzGky3r68TKolYWFpGWG3hPH9+TVqaqK mF9fYrF/MSq/RoeLLdditQcGQY3Wg+cz5GbCuH4AE8lUpCbo5+pD5rVUxTrZ8VMRVNULlO5+hvK q6YFYHxATGAqG0xomqxtD3BOxEOeUrfctAKs44lxuLu6avdEdNyyGhn8+8RCalp0oSQmE2o6ZbJ Ehr5Z8fsBxyX0rH1vSGatvgnmPpAVP3Sy68VyGTfzC+cbjh/E4BIF9RiXSCW2Jf7uCDKXOvMTG2 J96izjx52nRO02sP97DLCCGpl20kOxjZCIP1gDDSgIy4cpnJDb43Q4dMS7HDKy5joKBc8USUS75 lq6Zk3tpLGh8jwjB5raro5mg5DVGI6nTHN/07Wi0UjDqIxjovIrrg1RR8V0h01e55yZGUBwM7sA VKM0qUZWGQIk7OzrWARnQ== X-Received: by 2002:a05:600d:d:b0:48a:53cb:8604 with SMTP id 5b1f17b1804b1-48e522c0909mr40440065e9.14.1778075945900; Wed, 06 May 2026 06:59:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 029/110] migration: Revert "Add VMSTATE_UINTTL_2DARRAY()" Date: Wed, 6 May 2026 15:54:01 +0200 Message-ID: <20260506135524.20617-30-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778075976285158500 The VMSTATE_UINTTL_2DARRAY() macro was never used, remove it. This reverts commit 4597992f624c015ceb51fedb4628b3fdb1e5bbaa. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Peter Xu Message-Id: <20260325211728.89204-4-philmd@linaro.org> --- include/migration/cpu.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index 1335abe2230..e3d6c06b7d4 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -23,8 +23,6 @@ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) -#define VMSTATE_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, _v) \ - VMSTATE_UINT64_2DARRAY_V(_f, _s, _n1, _n2, _v) #define VMSTATE_UINTTL_TEST(_f, _s, _t) \ VMSTATE_UINT64_TEST(_f, _s, _t) #define vmstate_info_uinttl vmstate_info_uint64 @@ -44,8 +42,6 @@ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) -#define VMSTATE_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, _v) \ - VMSTATE_UINT32_2DARRAY_V(_f, _s, _n1, _n2, _v) #define VMSTATE_UINTTL_TEST(_f, _s, _t) \ VMSTATE_UINT32_TEST(_f, _s, _t) #define vmstate_info_uinttl vmstate_info_uint32 @@ -55,8 +51,6 @@ VMSTATE_UINTTL_V(_f, _s, 0) #define VMSTATE_UINTTL_ARRAY(_f, _s, _n) \ VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0) -#define VMSTATE_UINTTL_2DARRAY(_f, _s, _n1, _n2) \ - VMSTATE_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, 0) =20 =20 #endif --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076006; cv=none; d=zohomail.com; s=zohoarc; b=S3fjR/aBu7wf6WIw7aR/QKDIVuAHEVOqAPfmjxDQIh2QU2KzOnEL5gUbO2hQhBXKH7ohVgfHjMla01t16moxsdvt6tRyJHi+wxoG/52oAW6uscR/Ias/SATtkTCcnsPSBbxFnSIhUh9NXNFLzHaZ4wzoKEE4NJuFjoXzaLZbkoA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076006; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=em2bIFDKeutaom59G3vLD0YKyJW6+wSKDB4EoAo3nsM=; b=TudF6y3HefPpla79pYfQWSLegBBWT/OYveSII+xRjQSgzERSJjojvmwUhYbQ8HAZWzPvs2ydc7IsfHqCXTSXpkTSmyZex1CQgN9B3EVg46UZE+mmujoh8vxSvRgjPMnL9PX94KgmtTONx4U+/+d8RwcKR2Hg0fLqeAZKTWGbmKQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076006464321.8345856835325; Wed, 6 May 2026 07:00:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcmW-0001uk-O8; Wed, 06 May 2026 09:59:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcmT-0001py-R1 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:18 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcmS-00009X-3e for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:17 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-488ad135063so61522825e9.0 for ; Wed, 06 May 2026 06:59:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055f2203csm12912273f8f.37.2026.05.06.06.59.11 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:59:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075954; x=1778680754; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=em2bIFDKeutaom59G3vLD0YKyJW6+wSKDB4EoAo3nsM=; b=HUC+wMFgdHxGEGAn/iGmDRRmTLMIkYtynXWt+mvF5GZV7R9/cBW1uElR5Bf+A/TgHn tD/QokTEpoec8vSN2hpbabX93ZcModR5b7y9DLzLP6hUknjhAxCx1IcOJYWvpdYaHFWL cvWYO/7P3M0JkO6/7nHJzc+YX8q99QVxog7w4cbrzERW5vSv6fV1F63sy9DtaWgxiHAd 0k8B40aUx6qWGKOdLde4nUxPuELwz0qIyeJfdRqoZKzkvYpYxHEf7mPnrhwz1jOsBSYK W+WmsAKDDGwjwZtOcpdwacZCLaEN78pVt7h/kOffyV+WozrJF7hsZE80Q8uWInGNM2Xw aDUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075954; x=1778680754; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=em2bIFDKeutaom59G3vLD0YKyJW6+wSKDB4EoAo3nsM=; b=iyszz+HnR0RPMr8TW5demwsuOfnn/bInijuF+VJpuvYluuceLU8GD5fgBJHeGU3fqe P1EE6VVxAU75TvNQsPPBJnm39u1gPCAsb7jde4qIPJnFXDaYBH7nXwzRMiOwlAle6iwb YGj/U9qy217yunMwys0CjXaFN73L9AqGmQNyj9KAzqiQHTDA6knIapAem2aOfNM5yKHj k4qZC4u99BBTpudi0ieMO8bJeES2e+8PKgp5/M1+b80/4B5bcBPxKSO2sx3ZeWU8suRY QvwIhgl4QYqWuu1Y/+pAT21oR+FuP/Ox4ptWPE9OAVLa0cjcXz8ikzv095OwVl0s70m1 sz5g== X-Gm-Message-State: AOJu0Yw07K247APXocE86WBH/0CddN3ok8QeqZ9ZQVU89VZ/2hw6a0U5 GnR6t0sWxyqSJzoh2b80wKMU77g+Wg3WUh1tfrFnMIe4ADXZl6kmgX5hrWgB0XEiK672lcBe+yu ZKrONBtQ= X-Gm-Gg: AeBDieuL/zkIq0gUGTN/1K+BoxoXVSNdSTVxTji5VhvD/kCx6L76bDL61zPqj/vGS2M CLQ/fGfDCXfwJ7f1V8RfNOvG+23NgoCOoewl8EOAiYpIJFCALcmFQyRPYAOQeGWCiMIhJ7yklPp qDH3sDblRZ3pGVhCAJmz5js8kKBYNroSgMA7jY2dsjEo88CmODkBauNd/8JrzMZATMKTThazg81 KLSyy/TOfxyFmu3JzWIFQ+HbXJntdRMx7iy2UV9J2O5LWObaHVMN0ZaL+ZRzTRsZ+cBms2ZU81i 1rmDHy8nYoAK1ajiLwm2exmywClsvJZxcl2Ccj9Daco4GZiY5Zt+RySZ0M3LAo2Z/Bg/Ainsin0 7657X/G8/R0Kpq/l7r0rQvlgiY1SD3DWI8oEA8rS8bb9A/2zNVaBWcG18YRz4vM1EopVcrqAb1e Cq0vxjrOg7jkNVOIQkEknva6KAIQ3C7W1tvQfV+hsZEJ9At3feC9gpAWWueDxgGl5uzmt3dg4Ar ecna5S+BTM= X-Received: by 2002:a05:600c:a305:b0:48d:361:4df6 with SMTP id 5b1f17b1804b1-48e51e19680mr43423165e9.9.1778075953592; Wed, 06 May 2026 06:59:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 030/110] migration: Remove unused target-specific macros Date: Wed, 6 May 2026 15:54:02 +0200 Message-ID: <20260506135524.20617-31-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1778076008602154101 Last use of VMSTATE_UINTTL_TEST() was removed in commit 445d3facffe ("ppc/spapr: remove deprecated machine pseries-2.7"). The following definitions were added in commit b6c4f71f508 ("Resurrect the safe part of r5274") but never used: - qemu_put_sbetl qemu_put_sbe64 - qemu_get_sbetl qemu_get_sbe64 - qemu_put_sbetls qemu_put_sbe64s - qemu_get_sbetls qemu_get_sbe64s Remove all as unused. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Reviewed-by: Peter Xu Message-Id: <20260325211728.89204-5-philmd@linaro.org> --- include/migration/cpu.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index e3d6c06b7d4..bb8ecfbeea5 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -12,10 +12,6 @@ #define qemu_get_betl qemu_get_be64 #define qemu_put_betls qemu_put_be64s #define qemu_get_betls qemu_get_be64s -#define qemu_put_sbetl qemu_put_sbe64 -#define qemu_get_sbetl qemu_get_sbe64 -#define qemu_put_sbetls qemu_put_sbe64s -#define qemu_get_sbetls qemu_get_sbe64s =20 #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT64_V(_f, _s, _v) @@ -23,18 +19,12 @@ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) -#define VMSTATE_UINTTL_TEST(_f, _s, _t) \ - VMSTATE_UINT64_TEST(_f, _s, _t) #define vmstate_info_uinttl vmstate_info_uint64 #else #define qemu_put_betl qemu_put_be32 #define qemu_get_betl qemu_get_be32 #define qemu_put_betls qemu_put_be32s #define qemu_get_betls qemu_get_be32s -#define qemu_put_sbetl qemu_put_sbe32 -#define qemu_get_sbetl qemu_get_sbe32 -#define qemu_put_sbetls qemu_put_sbe32s -#define qemu_get_sbetls qemu_get_sbe32s =20 #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT32_V(_f, _s, _v) @@ -42,8 +32,6 @@ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) -#define VMSTATE_UINTTL_TEST(_f, _s, _t) \ - VMSTATE_UINT32_TEST(_f, _s, _t) #define vmstate_info_uinttl vmstate_info_uint32 #endif =20 @@ -52,5 +40,4 @@ #define VMSTATE_UINTTL_ARRAY(_f, _s, _n) \ VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0) =20 - #endif --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076006; cv=none; d=zohomail.com; s=zohoarc; b=RnNQLdZARVf29Wz9aHV/YRZQFeaCu8vag5hSbaOQ/qgkajm+HWCIedTHqj5jS7ozlFgsHsS4ndzt2kqXEEPOY0HId56TiFqp/sDIuZzyCU0DvnGqkWtx3NgR0SNlxNZeQgPb7ljDfVKVOUtWx21xiKZ4NnlFb0G3p/TN5H4U7w4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076005; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=FprVQ5wR1d4Vf79cPTC1JLTTgXx+APXAerAyuJrHnZE=; b=Gq0dej0ovaxjDiimF7G4ClOmrrxaB07zzvDwPzz1gZN8iHeAxJVRJcRe/9zdpx2CAv5y/TzlfJByZrIH4fdifdR9qdVmcJkAgyroInXLbEQ8dPE0IhfMmpJulNsHsUxw/bW2NXFQwKnu07pNpL/znsaamRUS26mjuj+XsKtpdNY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076005991855.3904239708294; Wed, 6 May 2026 07:00:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcmd-0002MU-OL; Wed, 06 May 2026 09:59:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcmb-0002E6-Tp for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:26 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcma-0000Ac-1G for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:25 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-48d102471a4so32478325e9.2 for ; Wed, 06 May 2026 06:59:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538c4ae1sm47137335e9.12.2026.05.06.06.59.19 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:59:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075961; x=1778680761; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FprVQ5wR1d4Vf79cPTC1JLTTgXx+APXAerAyuJrHnZE=; b=Of+t8LVk7glJv9xWVnWX2/LxXT0k9izf7E6CjdcBuczIqz8xKL+Y6HaYuh7vUZpsKD Axb6d7JfoyXLNv3S54+0tPBisFiRLkf+0ZV98nR/x9cxkKMK3YoAaPoH4yO+SQXOQ2o6 tZ0x2h8PjAhxptDZyNvMQUHbYgYawWzIPSzy8XgeGGeIbSHnK8HFAbCENAqcX2OJrEDh ochQ56t9LmZus1+8MA4BgCO1bOo6M2dYJX7nw2PgOVBf4o2DUi1dr9DeVzj5wT0AQOB/ 4cqJnkoPswWVbzJenkDdL8EIVhRg74odhCkRamknlOdbb+BQlVYxAEW9N3/aJiSpNvWG jWsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075961; x=1778680761; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=FprVQ5wR1d4Vf79cPTC1JLTTgXx+APXAerAyuJrHnZE=; b=VeRQtvqU5uEzdW/qXYhMCjTqSyDvwoTha/UdV7K2PChXaFt3Q2wPJrGQ8h4Ahy8vVY iNqCBlZ+1akDylWaJazn/7Ss3nsZl+a3a2Q4LMEP7dO0TBJZpTrK3gIolxtQXZ/fs29j BDZ/ls3yyV1JFloTw9YZPMSRmuGuzxAsmlZAmjpnYrqZINlIyN41AvPDUsNxYdVCMW78 A25WBdDk4ZUCetaPrqdJabkbXqqSMeIaUj/Qy6nKFwKLvtcB7zFMobgX2GHaepBvx+oO oKe0jdhF4yBxJlz4ZEkHByOtfWZHlemjHPHOu05Bw2McLLBtb2zOgn1sWFm4WGD52OgO WzLA== X-Gm-Message-State: AOJu0Yy5xdXIU+JUKD4gBRfvsOeSIT+tIoptbGXo4Pgms8fafopgwqgf DX4kbORP0uULyYlavZzKlDSJHgR6H80iM2qF04a4D1jpHZquZoe4clkHKnjoEX8MbW4flqUJnj3 6hW0MiFM= X-Gm-Gg: AeBDies0XZPtIk4ZVSZGKq9cuzmaOMKP2iwnsMeyr6yvVYQuRxo4l6NkY8pBb5AApSy v53RBAkY7GeO9nWZuP50RTLxORBV3oTFDiRjqR1UcZQZAp3MLYDDWkR6O7CDkbhA7JFLRZZvHR0 oHi5+SkUSGYh0SYrkwysGTvoGul1GN5Ui8k5EEDRZ1wKAE/czKmXy9dt9/dJ11j//jSFtbZUd5y zjXtwEUNPvnzeKvSrlCmxvRjgs5/ojNHiaGxHeqOcJVzYbDLzfNQ1ru2UPV52AXcEGLLZs+uwBH DKUuo8UtkElGYAgAYnEp/JWdRjlg7KJulLxNFuRK1tJGX5ujOLu8KWIDNDBrqMMHQmOmzwQLrI/ r5uXldd7aF7kli3af8OueaC5Y16kYWyKsIbWCesD406L2K8pIYD7+GcafT4gIzetMbeWYOuSqsP 7SDE5iliLBhmjDGhG9tn7QfO3TbdULUCBBgAy9OyZ+jGHOMYxSlup/1gdZyMs3BrXB9/CuwqhiP 67qn7NFj9k= X-Received: by 2002:a05:600c:1d11:b0:488:a916:14a8 with SMTP id 5b1f17b1804b1-48e51f2c7eemr62085325e9.10.1778075960896; Wed, 06 May 2026 06:59:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 031/110] target/sparc: Inline qemu_get/put_betl() Date: Wed, 6 May 2026 15:54:03 +0200 Message-ID: <20260506135524.20617-32-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1778076008602154100 Use TargetInfo target_long_bits() helper at runtime to migrate the FSR register as 32 or 64-bits. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260325211728.89204-6-philmd@linaro.org> --- include/migration/cpu.h | 4 ---- target/sparc/machine.c | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index bb8ecfbeea5..87ca977a3fd 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -8,8 +8,6 @@ #include "migration/vmstate.h" =20 #if TARGET_LONG_BITS =3D=3D 64 -#define qemu_put_betl qemu_put_be64 -#define qemu_get_betl qemu_get_be64 #define qemu_put_betls qemu_put_be64s #define qemu_get_betls qemu_get_be64s =20 @@ -21,8 +19,6 @@ VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) #define vmstate_info_uinttl vmstate_info_uint64 #else -#define qemu_put_betl qemu_put_be32 -#define qemu_get_betl qemu_get_be32 #define qemu_put_betls qemu_put_be32s #define qemu_get_betls qemu_get_be32s =20 diff --git a/target/sparc/machine.c b/target/sparc/machine.c index 4dd75aff74a..0a449f2f8c6 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -1,8 +1,10 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "qemu/target-info.h" #include "qemu/timer.h" =20 #include "migration/cpu.h" +#include "migration/qemu-file-types.h" =20 #ifdef TARGET_SPARC64 static const VMStateDescription vmstate_cpu_timer =3D { @@ -86,9 +88,13 @@ static int get_fsr(QEMUFile *f, void *opaque, size_t siz= e, const VMStateField *field) { SPARCCPU *cpu =3D opaque; - target_ulong val =3D qemu_get_betl(f); =20 - cpu_put_fsr(&cpu->env, val); + if (target_long_bits() =3D=3D 64) { + cpu_put_fsr(&cpu->env, qemu_get_be64(f)); + } else { + cpu_put_fsr(&cpu->env, qemu_get_be32(f)); + } + return 0; } =20 @@ -96,9 +102,12 @@ static int put_fsr(QEMUFile *f, void *opaque, size_t si= ze, const VMStateField *field, JSONWriter *vmdesc) { SPARCCPU *cpu =3D opaque; - target_ulong val =3D cpu_get_fsr(&cpu->env); =20 - qemu_put_betl(f, val); + if (target_long_bits() =3D=3D 64) { + qemu_put_be64(f, cpu_get_fsr(&cpu->env)); + } else { + qemu_put_be32(f, cpu_get_fsr(&cpu->env)); + } return 0; } =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076016; cv=none; d=zohomail.com; s=zohoarc; b=VQcYwtGCsFzPLdhzvWXC8ITDyKsXLZBb8ws2VZszNFPZCEvoDLGnK1wzG/F7lduYBHqR2Dd7wJTm19NEw7yIKiDI1ZJa63AFBjApFPGWAt7F12lF2IOxmxRijGvhpGCNim7Z6Z1orh/VCzcun4+fNELlhTBYyaIbKkEpF+XRmXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076016; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=yBKRutgN3yjojHntkFFZk++yw8Yg1fzT+jwbzOTAYOo=; b=mP+MmVS+Ajst0oIVG7xaLG+7h8tEmxHbX+iOkqzhmXm1Tp0SWeBKEp1mpXAs3Q/SEXGQgRtvkTZNucrnVSEuJ7F1BVZPmnkHg1KknF6RCYqtxmYki2TySZ69ddO62rJZLE7xyEa1E8600lhOgyY1oib92qr5EZSTzAc30CKF6+k= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807601670069.43677329935429; Wed, 6 May 2026 07:00:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcmk-0002tJ-KV; Wed, 06 May 2026 09:59:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcmi-0002os-V8 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:32 -0400 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 1wKcmh-0000Bc-Ar for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:32 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-488b0046078so57216395e9.1 for ; Wed, 06 May 2026 06:59:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53141f41sm17381615e9.26.2026.05.06.06.59.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:59:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075969; x=1778680769; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yBKRutgN3yjojHntkFFZk++yw8Yg1fzT+jwbzOTAYOo=; b=bNAukAdvWEoruwEsA2EckT4jE0RMJI0oBr90zaVZi+Vi0WyXaq4+nPbqECBNT6yFw6 Fy8DyOxcJi6Q/IvhLpj1qH3uQRHrS5Jv8wzd/blZLRpG0anYe1GhqqY3oOt8cP/6stu0 AKDUZ1n6/4lWSrr96cjIlN9qPquAkTtALncaZPY908py+7Lvj6MKMnyZPluTZ21lS7Fd z/lMPQdcg3O0Y/kyqdAaWnDhhdX8HQ9MVdezUOKKbtOBDeUGl3T3GUHHUc1lfoIetblt Lxru48395XWYV9kx6a6Kl146ra2rOnWF0rh3lvzzxidTrSg6144vOHcZHlsjBZtV7g9/ GXjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075969; x=1778680769; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=yBKRutgN3yjojHntkFFZk++yw8Yg1fzT+jwbzOTAYOo=; b=bHl6AadtmdUI08KxhBHSBq4THUpw2132GuVQMSR+04D81UIzD70ueb/nJcqXVx4nxA HzY0fqEZd4A/2xgo0Uiv6XkbsdMR+mO46xHRfwLvGr51a/dhcjTnvNcGYY4+YQqUIcjR dlDmyC9zz+buas51ITSDgrxTvPC4U/U0YgBLmUQhdwKOgms5Qh53kKJz/wNEegIMgsKh qTyDikcr7f+Q+yON5hWCngAxfOL5XyrdydMkOdoRu65cqCjNbsaJYKaOlckO6oqVOVRc RTM5eCPlYt/tkh330W8gd2jopS5c4YMKZ5onxlf5B/yPeN73l2GfyOMa/ewzMjIVuEDI nCnQ== X-Gm-Message-State: AOJu0Yy2UvHzVMLYfRkvN4KE5OcMeE3c3GTSly5Ht+t72sJUnvX2Ky1+ Fmjii5RzMXxvKw5yjSUmjJAfqbZIe3auGcOALW4xXkMCdBUCIHsuz+lzZbisP02TLTHM7q2fNbM FygAdXsw= X-Gm-Gg: AeBDieuHfWZ//2Z3vHwLiazgU3Wx8b47dzLT9D/n2lQsqCPNZNdEcafhnELADeIv3nm 8y2PjQSot8Rw04C//KMg96kE3wAcP95WJQxPH5AYz/QwlpxMUlEC9DteNHdR8Qyt+tMQshkKDJ+ 57J0WPPr/qypwA2oGymDdq89SPRKv+xOaGmSHEGpKY1eSldaW6glo6j8K5YXIPLNUcUTSBwt1AR d8129dSf2s2GVucmRPL10t+e2t5sxIh4+ioYqpdog+DJAP8Lf4AicH/b73J2pD2OcfSykL5Enu7 dXqqU7N5I+smcgcfyO3m7mbCM2neNdFC1D8p9oOP1gLvJhDERdyl5gJBS/2m9T3noDFhAr+LCaq ecD0mpnrmJGVBF+EYxJ4DO6qzBeR4Koy9YXJ4h6W6LSh3BbyDlm8sNptmMm7PZ8GS4K07vudHyE fZPKdLNNFv0nCAPp/5kQpXs4zDR0NF+gLiX/S1L38rTaW0NR2XVKSuH0OKYPiw+nTuIP4cRHUNk CIowYOOFKw= X-Received: by 2002:a05:600c:c082:b0:485:3ec6:e634 with SMTP id 5b1f17b1804b1-48e51f327fbmr43772345e9.15.1778075968560; Wed, 06 May 2026 06:59:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 032/110] target/mips: Inline qemu_get/put_betls() Date: Wed, 6 May 2026 15:54:04 +0200 Message-ID: <20260506135524.20617-33-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076018835158500 Use TargetInfo target_long_bits() helper at runtime to migrate the VPN register as 32 or 64-bits. The "migration/qemu-file-types.h" isn't required anymore in "migration/cpu.h", however it was missing in "ppc/machine.c". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260325211728.89204-7-philmd@linaro.org> --- include/migration/cpu.h | 7 ------- target/mips/system/machine.c | 14 ++++++++++++-- target/ppc/machine.c | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index 87ca977a3fd..8260ce0a3b7 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -4,13 +4,9 @@ #define MIGRATION_CPU_H =20 #include "exec/cpu-defs.h" -#include "migration/qemu-file-types.h" #include "migration/vmstate.h" =20 #if TARGET_LONG_BITS =3D=3D 64 -#define qemu_put_betls qemu_put_be64s -#define qemu_get_betls qemu_get_be64s - #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT64_V(_f, _s, _v) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ @@ -19,9 +15,6 @@ VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) #define vmstate_info_uinttl vmstate_info_uint64 #else -#define qemu_put_betls qemu_put_be32s -#define qemu_get_betls qemu_get_be32s - #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT32_V(_f, _s, _v) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ diff --git a/target/mips/system/machine.c b/target/mips/system/machine.c index 0a32665f835..5880b401b07 100644 --- a/target/mips/system/machine.c +++ b/target/mips/system/machine.c @@ -1,7 +1,9 @@ #include "qemu/osdep.h" +#include "qemu/target-info.h" #include "cpu.h" #include "internal.h" #include "migration/cpu.h" +#include "migration/qemu-file-types.h" #include "fpu_helper.h" #include "qemu/timer.h" =20 @@ -140,7 +142,11 @@ static int get_tlb(QEMUFile *f, void *pv, size_t size, r4k_tlb_t *v =3D pv; uint16_t flags; =20 - qemu_get_betls(f, &v->VPN); + if (target_long_bits() =3D=3D 64) { + v->VPN =3D qemu_get_be64(f); + } else { + v->VPN =3D qemu_get_be32(f); + } qemu_get_be32s(f, &v->PageMask); qemu_get_be16s(f, &v->ASID); qemu_get_be32s(f, &v->MMID); @@ -183,7 +189,11 @@ static int put_tlb(QEMUFile *f, void *pv, size_t size, (v->D0 << 1) | (v->D1 << 0)); =20 - qemu_put_betls(f, &v->VPN); + if (target_long_bits() =3D=3D 64) { + qemu_put_be64(f, v->VPN); + } else { + qemu_put_be32(f, v->VPN); + } qemu_put_be32s(f, &v->PageMask); qemu_put_be16s(f, &asid); qemu_put_be32s(f, &mmid); diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 9eae0ff647d..569536bd02d 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -5,6 +5,7 @@ #include "helper_regs.h" #include "mmu-hash64.h" #include "migration/cpu.h" +#include "migration/qemu-file-types.h" #include "qapi/error.h" #include "kvm_ppc.h" #include "power8-pmu.h" --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076140; cv=none; d=zohomail.com; s=zohoarc; b=JFn9iSiMIgjQWuLScKTVGjrGd1bWIkQsn2NFK4W+98BUdYCK+G3bY3bYhJ4wssOdhsZoyUDDVKsCgh4U0wdWO4VAUkn3pAQ/S6mhw85LFEce1QmhzD2E6BPr8m6LCB/m9HdrIAcQ8Hez2dd8ElX/fMZiZGP7uuyQ/KSKHLKxv+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076140; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=DGXaedvuvPqBP32+XrDoox80BbxiKZlCAJ3TNdOVZak=; b=FMHXyrMV+CZuwj4ovJqUnsVLo9MBG0ozYWkvhQ4lmq4lnQSroYqYmOOjOU3MumqWmElEqka9hnvH6NBy+Ze/dYsM8TMhUrE3qMDk3F2IeMyI/bFzGfbtnVs0IsVCvHzxYX6Tf6IQ6eDGwtfeMExu5o2KbWC+aKCxrAer5WhJM7Y= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076140406527.730897803861; Wed, 6 May 2026 07:02:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcn0-0003Q1-IH; Wed, 06 May 2026 09:59:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcms-0003FH-1W for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:43 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcmo-0000DW-OG for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:39 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488a8ca4aadso68545655e9.3 for ; Wed, 06 May 2026 06:59:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538fb1a7sm97873935e9.9.2026.05.06.06.59.34 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075976; x=1778680776; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DGXaedvuvPqBP32+XrDoox80BbxiKZlCAJ3TNdOVZak=; b=CttPzYSp3snHFRgkA+D1iuJN3rSrYlaXCsv7i58PVDKbdGzIDN5+Q1hzldHvWel/qj Ip/PSnwSOKtMd6gKxEmhnDl1GUcIMmkfPsH9EW3PCy5KiVDeDinRe9oxPITBreyt0c2y tWW8YTRkxOKg3xI4SLstGxNchpMXDftFLGzc+g55mxZjmuBpVkY6/f1Pc8Yyra0LfcOc LgNHmpK2wQPP7Bwt3PUxGNhCWhGfIfwsHDolpGpSl+lfK3NYVzpY8+1rmdZqfeJEh05R z41LT3sDD6w4WPuqY9tDUL5VTU//H+auXKozUek377b234d7sd/Y49k98HQbHq/ZAxDL bcyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075976; x=1778680776; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=DGXaedvuvPqBP32+XrDoox80BbxiKZlCAJ3TNdOVZak=; b=VcjJLGl4AKqy+MWuzyyVWd1YUmj9aQAwlCsHFT6EoDHfpaCe1z2aXmfMvp1D167gnZ C+RMK/cN0THZ3Fx7PrJDug/y//s00hgwfdFpCKcWwMmXjpIwcCEKpOu4VDaayjQYLG71 UKy6SCM2k6fozfmflDznNeuqfiJMjhjkxnHBy6Nf4eKcFV8BWsf3FRvnf9h9kEDHyACa LoftJIlMJBr8QrpqINJRMQXK0b5C9vxMYVBVCId7ujSBk9PMcF/00GycLWyp02G7O38j XTAtzdspPjMSezIgLpkvpB4YaWe7rJRpWrPeAOhGEcx+QyYjsQsgxHC+d3LS4/yYzQA2 CUvg== X-Gm-Message-State: AOJu0YwUXZyWnYAx4TupkViFz623Ns8GxFXFj8wNYKOOYm0WhOYNkQRV 2aviLjyPE3lj2zeTh8/XFvuCu1+9GgcAZvk4TzYnfwUv2G8DEWnnQkQj4mYbuLjxOcvSqRaiSwr wb5G/hPg= X-Gm-Gg: AeBDiet/xdWXU0ujqmYIdJnMR6wFwuPGmPVMjJP9QIbAOJ2P2e+1iE9vCxlkVe92YkE tBkhFhUnR3+oe423q/dnqClwG+TA8TUpbjhf1X4nYVtvzHGEN3whE0Fm+H69fq3XjCggcc8TyZy ov9E//Qa3ACFcfluxd4ffIelIAjYRg0JcMKCKwfiDIuQ/EKlCBE4/Qhrv2z8qTjC3emeC+uoYhp OagI4rrrEcvbh3sHYxrasWXlQHEYLVCrrbfdhOoQWaFyvleTP0SJrFIIvJCLW8HBLX8RXYtefSt 6Fc7GOdS9EIydGPfyUmDcv7yhkgtk8wPuoiAu9rhJHnmimqDwUl79TD953xN4CV0OK+KUuTRVUl VxCpCLv+nhtNNN2BAEVVKRhdzUdFvVF1jbUg0GaSy8ekSwclxdJu+TuPstFlAf0Vf3DeuoQmc7G uHRMaqpU2HDrijRijOqrNl0Qrglg02hxsQKjiETO3btOTpkpf+gYEvtfTQPZDSFltgCbMV8PlZY 5TXPGPzIXo= X-Received: by 2002:a05:600c:c494:b0:485:46fd:7887 with SMTP id 5b1f17b1804b1-48e51f32c35mr57970135e9.13.1778075976106; Wed, 06 May 2026 06:59:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 033/110] target/i386: Expand VMSTATE_UINTTL_SUB_ARRAY for APX registers Date: Wed, 6 May 2026 15:54:05 +0200 Message-ID: <20260506135524.20617-34-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1778076141954158500 APX registers are only migrated for 64-bit binaries, so VMSTATE_UINTTL_SUB_ARRAY() expands to VMSTATE_UINT64_SUB_ARRAY(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260325211728.89204-8-philmd@linaro.org> --- target/i386/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/machine.c b/target/i386/machine.c index 48a2a4b3190..1f5c517e562 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1756,7 +1756,7 @@ static const VMStateDescription vmstate_apx =3D { .minimum_version_id =3D 1, .needed =3D apx_needed, .fields =3D (VMStateField[]) { - VMSTATE_UINTTL_SUB_ARRAY(env.regs, X86CPU, CPU_NB_REGS, + VMSTATE_UINT64_SUB_ARRAY(env.regs, X86CPU, CPU_NB_REGS, CPU_NB_EREGS - CPU_NB_REGS), VMSTATE_END_OF_LIST() } --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076075; cv=none; d=zohomail.com; s=zohoarc; b=GFKxlXe/7jH0OVnaboOU0m0l799N1m3YNb78uQvELk7R2UqU7vw9viaVdU6Dfqfkpd7kMBL24qTxBeoUtTsZ6Lvz/L21qgODvQAfVPxPpWzKk0YfCuCw9/DALNSnqeUF+DD98njUr7jOKhMrx5EGt7rhYpEMpQI3IJ1vB5c9CoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076075; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=rnr910XkDufERe9XVu800E0bqoN1SBghJFJ3GMyOOWQ=; b=Dyo4Tp6yKCRghmd6nu8wESDSGCDUpiNRuJG2IrmOxStp2WnY2NPJgEe5hUBjNaz8TEK6xlZNC/uqnAeIuhHimRZtZSNJvbnaQamSljSyyfBxs2FK27XAiSUE0UmSwQFYGS4w4ImlE/LQY+1CysMgWAdu5aFi+RzPL+F8tXb7s0w= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076075138457.8532709972925; Wed, 6 May 2026 07:01:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcn1-0003TG-7D; Wed, 06 May 2026 09:59:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcmz-0003Pz-T0 for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:50 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcmw-0000EH-HQ for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:48 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-488b150559bso44890855e9.1 for ; Wed, 06 May 2026 06:59:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055f249bbsm11329939f8f.36.2026.05.06.06.59.41 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075984; x=1778680784; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rnr910XkDufERe9XVu800E0bqoN1SBghJFJ3GMyOOWQ=; b=KNnMDfQbZO37UobELfJM659j60/UM26LalfwpOJfEWUW8kuHLlRS/5phNO772xpTiL /eSqSrjqDO9t0rJ9wk+f6fg6X+0xuZPsno0380mHGIb/zLQJZ6AoVWBUXmm9xDqB8uXX wwCMiNsu6yWSTXFT+bx6weIWS6ZJM5NZNVzYv45s1BfIS7kXm91wGI4n3JrUCsSK1iQA xDCwsMUOh0wDclPBhwymGWKi5IvzCaDvyuGIvoxoOO9uQMBNY9Rnhkp9QC8825l/mYVG x+8OtQMIEGxFFi9qoqpRz+K4Kj9AOksDMKU62o6tciOqZp/E5BKdBBQYxqaz4Lp5AJyl tTLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075984; x=1778680784; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=rnr910XkDufERe9XVu800E0bqoN1SBghJFJ3GMyOOWQ=; b=tCi4pEEhoP+O2xXgbCwbmvpKA5ik6RVNICO7p9Hs8BonNVosUH8GcMf62dgECxKn4P 0ekEIxnHYMwgYpONN68b0pr5B0dDLRLhwONPCMqbiXukbaYX7oW8/JPi6BiMf983MsrT WC5bmt1T1K4g86rixuTFnQAlaqy2h1G4RUIVukzozDDgW/aL1N3CI4WVnCOzVCBWcrPJ WBJsZyL8Q9BjXvAneOeNiyCbd0dTrElVRfRu1Mf5IydQhhVlCsH1Xox0Ra1kZfntnoGD jsdxdkOw1+tqvEsq0FLYrMkLPJp/Qz6nxiAhQz56bq6gVECgthAKXCbOBT18pdj7Gblp QZ1Q== X-Gm-Message-State: AOJu0YybeX1t3Yt639M9NHZA0eqnYaybhK4oXn1bsMWU0AWtGvKDX8UP KCjHC6tFObAz0uJpg3AjZVcZa8Imnh8cwa6fZBSimfIt3GDk0GxU/GIwAfVoCbo231LtjL7SNj1 2mVLOIno= X-Gm-Gg: AeBDiescV0czt9FutXzG5hocOLiRxs2A0qurQI8t+FuyBnTGcv/M3K5vvJ35+EtPC8P LDZ7F/Wtv+aO0/U4hhC973Wz9pe7qVscsE+cyA9Es4r0TsnRfQK7D+VuJ+oM/XZM+vZ2Mcb6uMs d8mUXW3BZ1OsxH2GCPaH2RMfQ3cgas8lIf4aUibNgEvdGUlcXhi0Y8RtpsNl5ZC0JmAt3av4Aug Fbc2kXrY0E6lrwpQ6mU9di3Aeh3C9aX682w8fn1ApN4E+QQeIJpf8C1K2hmz59yoJp1Tzr9fdL4 AimQerxvyp0kf+omxGgBPGaLERXkWK0kgxlO3sZrKX4/RkjnNIBInLz1+mfHGjubTedJqSD2Vzo 7HB2wkSIq+HtjkmBCFG+NE8HNChJNN/hqkR6L5GIMpT+oiup5VXVSjlUNRcPVI/IygVbhazh+Gf qNxx2kBbnycJbAE95PKdUNLCr1Ec0caSKMIbeMJhJ8Pn5yhExYSJ4ilVxP3fR2bPffAaRsC2JKC gxE1lYvf1A= X-Received: by 2002:a05:600c:4f92:b0:486:ff92:63e5 with SMTP id 5b1f17b1804b1-48e51e09711mr64830865e9.6.1778075983517; Wed, 06 May 2026 06:59:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 034/110] target/sparc: Replace VMSTATE_VARRAY_MULTIPLY -> VMSTATE_UINTTL_ARRAY Date: Wed, 6 May 2026 15:54:06 +0200 Message-ID: <20260506135524.20617-35-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1778076077309158500 VMSTATE_VARRAY_MULTIPLY() seems to be an "optimized" version of VMSTATE_UINTTL_ARRAY(), and is only used once. Prefer the generic macro. Bump the SPARC CPU migration stream version. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260325211728.89204-10-philmd@linaro.org> --- include/migration/cpu.h | 2 -- target/sparc/machine.c | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index 8260ce0a3b7..8d15783b8c1 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -13,7 +13,6 @@ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) -#define vmstate_info_uinttl vmstate_info_uint64 #else #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT32_V(_f, _s, _v) @@ -21,7 +20,6 @@ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) -#define vmstate_info_uinttl vmstate_info_uint32 #endif =20 #define VMSTATE_UINTTL(_f, _s) \ diff --git a/target/sparc/machine.c b/target/sparc/machine.c index 0a449f2f8c6..5f402e098cf 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -189,9 +189,9 @@ static int cpu_pre_save(void *opaque) * versions are different. */ #ifndef TARGET_SPARC64 -#define SPARC_VMSTATE_VER 7 +#define SPARC_VMSTATE_VER 8 #else -#define SPARC_VMSTATE_VER 9 +#define SPARC_VMSTATE_VER 10 #endif =20 const VMStateDescription vmstate_sparc_cpu =3D { @@ -202,8 +202,7 @@ const VMStateDescription vmstate_sparc_cpu =3D { .fields =3D (const VMStateField[]) { VMSTATE_UINTTL_ARRAY(env.gregs, SPARCCPU, 8), VMSTATE_UINT32(env.nwindows, SPARCCPU), - VMSTATE_VARRAY_MULTIPLY(env.regbase, SPARCCPU, env.nwindows, 16, - vmstate_info_uinttl, target_ulong), + VMSTATE_UINTTL_ARRAY(env.regbase, SPARCCPU, MAX_NWINDOWS * 16 + 8), VMSTATE_CPUDOUBLE_ARRAY(env.fpr, SPARCCPU, TARGET_DPREGS), VMSTATE_UINTTL(env.pc, SPARCCPU), VMSTATE_UINTTL(env.npc, SPARCCPU), --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076016; cv=none; d=zohomail.com; s=zohoarc; b=gmaZ41nQsmjQHiCqzcvDXOseiR/x94byEYzccpqd4XDJS7VCTYuPKWktHR/o8C/z/o3znVP7tQ8oM7y20A2nMsSf7XOuwEQ4WfHOIb1O7Fnl4w5qs/EMc8MliqK41Lbvx9JwCGYZapDR1C65AFK8ZWehYlcHZKC/xGrchDzyMWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076016; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=5ef0JMGJzLVkl819dhHRCN59pW8hGuKmoFkI/orJyaE=; b=lcsBL1+iCFjQPeH2D0rMGC0bKGtikEaMIqkUSFh6RC8K1u6LiFdZUcOxbefdNaxU6FBnP1n9j/UDPBLCDiBgM1o1YmewC61TBy955P/ItIGGwHC64yaRwYYl4IDcjxSFlAflg8qi5zzBheBJ+oylJDqcmyarT57Sgavx/nFDHB4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076016606425.565927132875; Wed, 6 May 2026 07:00:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcn9-0003mV-7Y; Wed, 06 May 2026 10:00:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcn5-0003jR-Mu for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:56 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcn3-0000FZ-Rm for qemu-devel@nongnu.org; Wed, 06 May 2026 09:59:55 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-48896199cbaso56985295e9.1 for ; Wed, 06 May 2026 06:59:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e52f5c1cfsm35974615e9.0.2026.05.06.06.59.49 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075991; x=1778680791; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5ef0JMGJzLVkl819dhHRCN59pW8hGuKmoFkI/orJyaE=; b=lRBWTT6DmL8RBwSwHUaYAJpEsirk3ICQmC/+gZy8XYEuoYHeO22LB8igsheUI2VJQp /TK7CdwRc4hxhTF7rZVt8Ms60sdu92ZavQd+8joUqhNuupqKcCSuKKk1CMaGP+0y7q1U Ev6DH950giNJCXKzKyRU6VITnUcKoKr5Rj6ugWeRPStowFY9GSNaU4/J37qWdqaY3t7X lAF9NOrxvP7GwabQ6RE2CpgI2Xn8coi3Ppl2lYaOFXCwDTa4zyC7tIIoWaZuWweChnKS lREbB8cnXgNXpUxum6E3nzGZFcEp36Au1zW4Be+Pv5h7Kti+xxoyD7ZopI/LtMqq5Ap9 68Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075991; x=1778680791; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=5ef0JMGJzLVkl819dhHRCN59pW8hGuKmoFkI/orJyaE=; b=FVcW3ypq0d5I+CUZI0d6mfR9dcN0IDFf9O0t8lQU7+6c556sjjXtqBt1xZNldE0U+Z KInYAmZSnpVCQUD+siL2PnRUdLWI5kCN846mU+SRK8oOyq+BrQBYg2euVA03O0ibX+eF gmgj9tny/yHFrawq3jC2+L45owgKq3dhemxErRZeB0qGddCBKKnDWOhBv8IyTQ89IBdd ednspGdruayWvM5ODRkDFbx8hWAm1X4sB+ZNMcp/JBi7F0N15ApqnXD0Q/eTI8oxq8of 1dgYyEWTNfacTsiOxOBIXz+BSLJiOue0jgy7CtqpXa0hKPxg/gNJZrM2rhFEkgt6MGMT c1Bg== X-Gm-Message-State: AOJu0YyYcxhtT1WpPlE9wIcA7SQNLPgz+YjQHgKVQtMzNbkUtcIGjYVt 5qCMNIehFsGWuOvLotlf9gnfWXOT9tuh2cC8pNTFam2fwSW4HskQOwZKyv/yBxRcafTTqaxheL9 Lzvjrf8c= X-Gm-Gg: AeBDiev9Lv5miqCDQqLuLA4FVFQ1uFVGBiDmrSLIgYMI1mVGVWdAkV88lRGcpG2vkuY jXsD4uxp67+HfVW6ND/JNB2q63feQkxKOIBARWCSCI1RjuxkPlErUOL+l/ib99Btm4tqXu2T75Y M8zRWkk4biRfRzJc3FX6TQaTWQXPRWtRQ8Cx+SJlQpmsQO+DA34CikTixKc2TJ8Y639SDuOD9Iu Lq7GbOB6I1jx2QyGwXwBD1bVQdRj9I+gLEs2QJI/qkBa9U/tIqnoNrTx+vFzkh9XKLt8PWnCPiR u+MBK2lNqQofsscO3jK4m6qlpzmiFZPzXy5SrRgLD30OmXNO0rbnFhU+iEUL6IqrGFmmtTILKiq vlN+eC3upkcjyiOk8Q4T1gIfXDMQS+fNQz8gKG2usrLnP7BSd9htnvnCMLmd72gdmv+hhkEqMad qPWSftNQWopCS2lyLsHVAVFm2W3ip7/aFpX4DuRUhsYFuIYeB6ruwyXl0Nxd0+nSXR1XJD2oKvt GzJpu5NRZE= X-Received: by 2002:a05:600c:c11c:b0:48a:52f2:a0f1 with SMTP id 5b1f17b1804b1-48e51f46d48mr42633685e9.18.1778075991360; Wed, 06 May 2026 06:59:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 035/110] cpus: Remove CPUClass::init_accel_cpu() left-over hook Date: Wed, 6 May 2026 15:54:07 +0200 Message-ID: <20260506135524.20617-36-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1778076018887158500 Commits f50d0f335a6 and a522b04bb9c ("target/riscv,i386: Remove AccelCPUClass::cpu_class_init need") removed the last uses of the CPUClass::init_accel_cpu hook. Remove it as unused. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260412212547.29645-1-philmd@linaro.org> --- include/hw/core/cpu.h | 6 ------ accel/accel-common.c | 13 ------------- 2 files changed, 19 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 207a7a1becb..c9fea797435 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -186,12 +186,6 @@ struct CPUClass { /* when TCG is not available, this pointer is NULL */ const TCGCPUOps *tcg_ops; =20 - /* - * if not NULL, this is called in order for the CPUClass to initialize - * class data that depends on the accelerator, see accel/accel-common.= c. - */ - void (*init_accel_cpu)(struct AccelCPUClass *accel_cpu, CPUClass *cc); - /* * Keep non-pointer data at the end to minimize holes. */ diff --git a/accel/accel-common.c b/accel/accel-common.c index eecb2a292af..9c5b4111c8d 100644 --- a/accel/accel-common.c +++ b/accel/accel-common.c @@ -37,23 +37,10 @@ static void accel_init_cpu_int_aux(ObjectClass *klass, = void *opaque) CPUClass *cc =3D CPU_CLASS(klass); AccelCPUClass *accel_cpu =3D opaque; =20 - /* - * The first callback allows accel-cpu to run initializations - * for the CPU, customizing CPU behavior according to the accelerator. - * - * The second one allows the CPU to customize the accel-cpu - * behavior according to the CPU. - * - * The second is currently only used by TCG, to specialize the - * TCGCPUOps depending on the CPU type. - */ cc->accel_cpu =3D accel_cpu; if (accel_cpu->cpu_class_init) { accel_cpu->cpu_class_init(cc); } - if (cc->init_accel_cpu) { - cc->init_accel_cpu(accel_cpu, cc); - } } =20 /* initialize the arch-specific accel CpuClass interfaces */ --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076071; cv=none; d=zohomail.com; s=zohoarc; b=Szt3qFybnBATkCEw+u5cVxmG6xfImRLTdXZfIhyA+E+RWr3oSoD6AW0t2t0HZLz6fFcRKeP4N0fUD9GiCzWWNud+35uGGv6GMFK3E/hoh3esuSBFwzUjsfXzMWS69W/7twhyVCgRsLEpLPrXnaTNqdzUHNtF6/nDh6xSz67Yqio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076071; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=SQwTsh+iAyv/zCSx0/p3+pxdOCF3BHdT8oB8gjVmgyk=; b=SGYUKUwLqYrRzajoHJLfqfMVSIMV99JBRDfu4ipKIymNvbZoEEesqI49Gb/nx0Mp47cQ9Bipp56g8ZtGuRUGB0O4m6yuK6B8pA+84Qa/lE1FeqKgtmb/gGihuxXZUj50ZiJkEuoXBHJ2HffU/ySPbi0PZVX4uLzn82LXG/t3B6k= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076071179955.6971706886529; Wed, 6 May 2026 07:01:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcnK-000441-89; Wed, 06 May 2026 10:00:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcnD-0003rH-EF for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:03 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcnB-0000Gi-OR for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:03 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488a8ca4aadso68550915e9.3 for ; Wed, 06 May 2026 07:00:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055f249bbsm11330980f8f.36.2026.05.06.06.59.57 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 06:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778075999; x=1778680799; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SQwTsh+iAyv/zCSx0/p3+pxdOCF3BHdT8oB8gjVmgyk=; b=NKTvDZvordaf1wv2rvfhplIh85/edhFtfuf3Qr0uroFoy5quda8iOm2Q5SDqyk7ROz xifqjvarjeTDmSlx2V8U7JmiUvtFuBWvXeyqVI8OXi3GqyB0pn5xoc/6dbRPuMKVTDag U7o2B4L/880Bc7g1tjgAEtwJ8+WFSpXOc97dPuwEjjfBfLThcK0zC4gCGnbRJxCLE+1t Bk+4MpoFXE/h4leJK7oxB9RDr2OItFLzMOEAdtmZhpgAy4hwckPTHocNtqB2LXJm1yN0 pe59KW2LNwdUr2khaIey8hqXZtSXvWm/S3ttajp0mcu4vmItCvEEbxBo+dEQqIa80a7Q +SDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778075999; x=1778680799; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=SQwTsh+iAyv/zCSx0/p3+pxdOCF3BHdT8oB8gjVmgyk=; b=IXBU5bAYILO0JuptJBp+hHj6bHM77mHv5DjfIutixvCcOWBWOkGwh/EiSW3XBxwpdy Gg4YGCzlAF9InR3Ay3wBXZbfd0vxOdpQhNq9Rg9IdiXghT8AqeY4DQRCMKg4YccjIflc szVB1bEliwA1zVdh7BEASYSeu1WIdfOJq8ZE+zxJF1z4nVTmWV6+yBClc6hAWN2cuuej OhLT5B8MhTZSqAMgRKh3OhUQ2Pe++6hWsAzr3bABa0uyUQycBVO3/L1UpquzzRfwh4eY 8NzTJ32DdhRq28Fr6A70/xXhu+BAesuCDVrXT1oQW8g0kYNCkB3Jlp0TR9fm8VtdNHXt wteA== X-Gm-Message-State: AOJu0Yz02N6NsJv/XEInL/FndpGUivxiXNZ9DZDPnstCVz1VxrFWMcfn 4rrXw+LtMStqQ+LQBMk06LUlAWy4SmCmldRLkpXNdY9P7rhNGMBbjue8ldpniwEtx6b9CP22V73 Accf7sXs= X-Gm-Gg: AeBDietBewb9K8uBuzZMZTA9w7awFLDpJxmdlA4yDfCkg6K/Ha18oEVHPElfiRkewkf 9UIeG4T5gSyL6Rjk3tmOacqXCvj2F0vxWPOvRlxy5JRuX79YBpF3U6WSDqG2fNunJYAlbC7Gfhi grs/cY/diZTmS5XYkRO0OtT8El1JnrHOSu+lEhgJ502ZDYz5iB7Wjf953+hZFX/PFeZFLpBPlJl qL5gMDR3kdMvppXR8J/tBdoJe6XX0tmF3ncq9LX4dKzPXTBxbcyQTwhf8Kkv8TlHKhw0COqNKwT 5BybNnTII2ozqy6998A3XXvnj/TF0sJLdPFEWatJI+Y7n2QLAgZVJSEaHRPCyY36erT8Ia9vgcd dBJ3fQsLindNR7x+7rfizebW/y8QDIdrOyafdLHQedXeYtHc9maRtdy2Lk57hiOfRmrq6liYbhZ WRzSuC2TFOC2DDNKQQ8+89ZRIz9fMW1HyvoqQHHZkGoKzzjq1wUI6DNiROLOUJV4zAWf7PEh7Rr mQZdvonGPJUeyouQ482rg== X-Received: by 2002:a05:600c:b8a:b0:48a:5574:3a48 with SMTP id 5b1f17b1804b1-48e51f32bf7mr64002555e9.16.1778075999186; Wed, 06 May 2026 06:59:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 036/110] target/i386: Replace target_ulong -> uint64_t for TARGET_X86_64 Date: Wed, 6 May 2026 15:54:08 +0200 Message-ID: <20260506135524.20617-37-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1778076073526154100 These registers are only available on 64-bit builds, thus always handled as 64-bit. This isn't even a migration break because they are migrated as 64-bit since the beginning (see commit 02536f8b1f9 "x86_64 save/restore"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Anton Johansson Message-Id: <20260315165319.39727-1-philmd@linaro.org> --- target/i386/cpu.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index f57c99e8b4e..a836efd45ee 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2061,10 +2061,10 @@ typedef struct CPUArchState { uint64_t vm_hsave; =20 #ifdef TARGET_X86_64 - target_ulong lstar; - target_ulong cstar; - target_ulong fmask; - target_ulong kernelgsbase; + uint64_t lstar; + uint64_t cstar; + uint64_t fmask; + uint64_t kernelgsbase; =20 /* FRED MSRs */ uint64_t fred_rsp0; --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076039; cv=none; d=zohomail.com; s=zohoarc; b=hl9YlD5/sMIMtb74IROikJLgrNpNtNlMDhGLFO4Zkb+ulk5Ec6C+jZMbcywik81NxDt7UFD4aEilI5UyUgKms5Mu/1v41jN0taZeKBymPHzRWTDF085JDRVijQ7VS7UHhYAxPnVZ5nLcxRXPJ9oy7vv52TWY3omLglFj3vIoEtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076039; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=AProBNNYKZYY1mqtdA3F7DQEDgEilBHZyhUb2mUtV+I=; b=URHrvuYz6671K/kukjsojucKs5IJHPPSagXprMVRm/+KGZvyhmdgol5urZSk8HgY9I65aAliP95NY8hq6ir/pqDSxxy8mLeJ9+N3fOya+51ag4K0kyDO0SZZIskxvYKy6sAt1iFtUwTZKljLqJMqPHWzbo/bkwRx7PvJ9ygwWe8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076039440460.74322944758; Wed, 6 May 2026 07:00:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcnO-0004M8-GW; Wed, 06 May 2026 10:00:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcnM-0004E9-EJ for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:12 -0400 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 1wKcnK-0000U5-DI for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:12 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-488b0046078so57226315e9.1 for ; Wed, 06 May 2026 07:00:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538c4ae1sm47165655e9.12.2026.05.06.07.00.05 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:00:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076008; x=1778680808; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AProBNNYKZYY1mqtdA3F7DQEDgEilBHZyhUb2mUtV+I=; b=RJEc8n572VY1mZXuqUOL9qcVw760QHPqFcYj2d4RL8jIrdsIUmT8Of8QsaJuWW1o99 XtWgX51Xq5M6Wmr32oTNMRtYR0hrg+1Rs2oZfLjjqYPnGMWJB+KGnLWlw6s5m9XWxa0k 9tgTaCLDk0AYLR1qGMMf2O3I6gp7JYmufnVo06u4XjL0mFdySCGZGupcGmuiyKIQjvCh wjjtWHjXMwNtLPPA8Z1xlPSv47vd9VDFuQEFvn1arHVkv8rHQ6MWI9DdeASBjozUPDAG QHYsHrkIdvbvd0ve3Cm/IEwM9Z2WmzWzPtgDDjr6TE39qUMiFrE1IOQy2GxYSpiHdBex xOqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076008; x=1778680808; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=AProBNNYKZYY1mqtdA3F7DQEDgEilBHZyhUb2mUtV+I=; b=GbQ49voTJozWuDV5BvxMoxefI+y7SfCoz8qx4hVdG1/KIIbGs5kvp5tn2p2K7GTYTF pqIlFXL4HlxHTRurl/u4qHmfok/7HHRIYIP7YXgCSXwKdaE9cZMi0aP8Zh+rqUizfGx2 spI/aL63L7pEPL0hHC7QEGaoRYAhpOGA5lNqYvxSzPlKoooUcL3QOiasP5X0Y+MM5ZAR 2sv2XRv8YtM7xBRSQC5kVzjHz0qtez4hLj9rITWw3QfIe3fNQaxmDqqd9XQftA2whfdB CrwkW0KwaSUbPSrjW8a4CSv7UeFUEj2Xv2zJYSxv1Uw41RcPsbathaTXmWDHggkxMQAn ALiA== X-Gm-Message-State: AOJu0Yzoy2xVTTx5207qQGwJ0SF9mi9G+S1FS+JPUc19u3bOIuBrDlrn fMyETP0HAxG76JKmsFeTK4HGqZXWV2FwC784jqXMgnH27IslWwYHnzfMaSzTTLrX3I+4Ra+/zce 9z7GhFqE= X-Gm-Gg: AeBDievM2KFpvZJc7ZAm75Amxc6AjUvzo2kAomP8Q7FN3mK7XQBqo4UgpxNCTQ8kIxU cuC1Fu/wiU4lXtrCNngtDidNkhOoyRuKt9Drmb+Guu2rMh9mnvEAbcJLrlO0W+dzYSOGKu9Qf22 b6XOIczlrGmvMOpt84MZV/59uBWkz0gyj++JOffZ2USQuHIgNiexYOry0SY2o5fI3Jitt2Ne20S Rbw/Cp6TSJjnXzfjIRgdHwBpUB2rbKu3lP9olI+ZGS4PIUziJoQvf0V+Eq3NMeROPE1ergsyZwZ W3eaOsWl3ADmk78MpO4MV2n/L6zF/y/Gg1zwGEUKb/lpf7Q6Iz+onYEzcfVRb6PljljbV+2HSbl hM/c5DTdfcCM6zREvJTaFDPlBPU2vzqvYNUvmKEB1X45+7s7GqgwgSDuDFFBT0VbhAWZbJyu7IO mW+WaslshqJYPgDuFV1WOZDaf0GP1eMy3PYZtuwytAC5nn4dIzo1SbMDx9BddmsqH5S80Itk0fq kLtJZqrSJ8= X-Received: by 2002:a05:600c:3e8d:b0:48a:6268:18a9 with SMTP id 5b1f17b1804b1-48e51f32797mr65250505e9.13.1778076007588; Wed, 06 May 2026 07:00:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 037/110] target/mips: Pass MemOpIdx argument to Load/Store Multiple helpers Date: Wed, 6 May 2026 15:54:09 +0200 Message-ID: <20260506135524.20617-38-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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: 1778076041101154100 In preparation of using the MemOp content in the next commit, pass it as MemOpIdx. Include the access size. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260417035734.32334-2-philmd@linaro.org> --- target/mips/tcg/ldst_helper.c | 16 ++++++++++++---- target/mips/tcg/micromips_translate.c.inc | 16 ++++++++++------ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/target/mips/tcg/ldst_helper.c b/target/mips/tcg/ldst_helper.c index 10319bf03a6..ffe1895706a 100644 --- a/target/mips/tcg/ldst_helper.c +++ b/target/mips/tcg/ldst_helper.c @@ -212,8 +212,10 @@ void helper_sdr(CPUMIPSState *env, target_ulong arg1, = target_ulong arg2, static const int multiple_regs[] =3D { 16, 17, 18, 19, 20, 21, 22, 23, 30 = }; =20 void helper_lwm(CPUMIPSState *env, target_ulong addr, target_ulong reglist, - uint32_t mem_idx) + uint32_t memop_idx) { + MemOpIdx oi =3D memop_idx; + unsigned mem_idx =3D get_mmuidx(oi); target_ulong base_reglist =3D reglist & 0xf; target_ulong do_r31 =3D reglist & 0x10; =20 @@ -234,8 +236,10 @@ void helper_lwm(CPUMIPSState *env, target_ulong addr, = target_ulong reglist, } =20 void helper_swm(CPUMIPSState *env, target_ulong addr, target_ulong reglist, - uint32_t mem_idx) + uint32_t memop_idx) { + MemOpIdx oi =3D memop_idx; + unsigned mem_idx =3D get_mmuidx(oi); target_ulong base_reglist =3D reglist & 0xf; target_ulong do_r31 =3D reglist & 0x10; =20 @@ -256,8 +260,10 @@ void helper_swm(CPUMIPSState *env, target_ulong addr, = target_ulong reglist, =20 #if defined(TARGET_MIPS64) void helper_ldm(CPUMIPSState *env, target_ulong addr, target_ulong reglist, - uint32_t mem_idx) + uint32_t memop_idx) { + MemOpIdx oi =3D memop_idx; + unsigned mem_idx =3D get_mmuidx(oi); target_ulong base_reglist =3D reglist & 0xf; target_ulong do_r31 =3D reglist & 0x10; =20 @@ -278,8 +284,10 @@ void helper_ldm(CPUMIPSState *env, target_ulong addr, = target_ulong reglist, } =20 void helper_sdm(CPUMIPSState *env, target_ulong addr, target_ulong reglist, - uint32_t mem_idx) + uint32_t memop_idx) { + MemOpIdx oi =3D memop_idx; + unsigned mem_idx =3D get_mmuidx(oi); target_ulong base_reglist =3D reglist & 0xf; target_ulong do_r31 =3D reglist & 0x10; =20 diff --git a/target/mips/tcg/micromips_translate.c.inc b/target/mips/tcg/mi= cromips_translate.c.inc index 8fda7c8a214..4dca11b84b4 100644 --- a/target/mips/tcg/micromips_translate.c.inc +++ b/target/mips/tcg/micromips_translate.c.inc @@ -693,7 +693,8 @@ static void gen_ldst_multiple(DisasContext *ctx, uint32= _t opc, int reglist, int base, int16_t offset) { TCGv t0, t1; - TCGv_i32 t2; + MemOp mop =3D MO_UNALN; + MemOpIdx oi; =20 if (ctx->hflags & MIPS_HFLAG_BMASK) { gen_reserved_instruction(ctx); @@ -705,22 +706,25 @@ static void gen_ldst_multiple(DisasContext *ctx, uint= 32_t opc, int reglist, gen_base_offset_addr(ctx, t0, base, offset); =20 t1 =3D tcg_constant_tl(reglist); - t2 =3D tcg_constant_i32(ctx->mem_idx); =20 save_cpu_state(ctx, 1); switch (opc) { case LWM32: - gen_helper_lwm(tcg_env, t0, t1, t2); + oi =3D make_memop_idx(mop | MO_UL, ctx->mem_idx); + gen_helper_lwm(tcg_env, t0, t1, tcg_constant_i32(oi)); break; case SWM32: - gen_helper_swm(tcg_env, t0, t1, t2); + oi =3D make_memop_idx(mop | MO_UL, ctx->mem_idx); + gen_helper_swm(tcg_env, t0, t1, tcg_constant_i32(oi)); break; #ifdef TARGET_MIPS64 case LDM: - gen_helper_ldm(tcg_env, t0, t1, t2); + oi =3D make_memop_idx(mop | MO_UQ, ctx->mem_idx); + gen_helper_ldm(tcg_env, t0, t1, tcg_constant_i32(oi)); break; case SDM: - gen_helper_sdm(tcg_env, t0, t1, t2); + oi =3D make_memop_idx(mop | MO_UQ, ctx->mem_idx); + gen_helper_sdm(tcg_env, t0, t1, tcg_constant_i32(oi)); break; #endif } --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076041; cv=none; d=zohomail.com; s=zohoarc; b=EeiijP38QgaER+CtV9gdu2ZLFwC45146kQO8W4ONEd5xIjtsfUhHy+jcd5I313qfJfv0/ppVK9PJ8lXouYWCcHrVP2emCqlKKNhNruz5o1R4Nzh2Bd5U1nyF58OcRZg8DRDDVjHo1DaaDMBB7PHnKFTDQl74XrUiy3C0FV/1kpg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076041; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=OZc/qj8164mdY6T/5n89bkW8BxCd+kZMWJMjvNjnIUY=; b=lgrBPn4bZCYrJR2cuHKdfmMqPrVrht74KqqltOeklTkuaIFFBIJYqq+0e/7i6LFwtN53OvgBVWRekZl/4gi6K0sr1NdPEKRPnsmGgGCRBx05h7AcoYn+rwDshKcmShmklnzo4irI2pBQbuliDN7QXQSLIq8Yz2GYuUAZ63/K4xs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076041291593.987665877238; Wed, 6 May 2026 07:00:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcni-0004pU-AJ; Wed, 06 May 2026 10:00:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcnW-0004eT-B4 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:23 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcnT-0000WI-3Y for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:21 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-488ad135063so61538535e9.0 for ; Wed, 06 May 2026 07:00:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538acf23sm48307795e9.8.2026.05.06.07.00.13 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076016; x=1778680816; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OZc/qj8164mdY6T/5n89bkW8BxCd+kZMWJMjvNjnIUY=; b=P8XYSN6igs3uwxcuWujUlFeI9jLtsruTzletm6RzMDE0KxJXYrylhW1CjuzCM0KXVt kTBCFiEI23lXOBhdxorVdAOUJfj1S2s4hCiw4K0Ocq5S8FwUsPckJq5UTwJohMcOu30k maPn5g05XQL1TB79Wn9FmyudlNgAGpI4JI+b86U2x0A/WZjr8QWt57eV/Y9E3KZgiuCo cflixI1ofbmLXSut+sZpSz3jqEmp+tb+SjVcfnmfCNuxJ/yUNtpgjL+NBgCi2PLMX11+ 60oSD+JsEHyt08NXD0dd1grD74zzy4p8oeD3P0LO+F/oFPPLecpFO11TgbYm0bvgu9sM vEnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076016; x=1778680816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=OZc/qj8164mdY6T/5n89bkW8BxCd+kZMWJMjvNjnIUY=; b=BOoJ6ZHNuCQmN42ZFgiVWbMNfjUTzZ7jnSIefZxwBTL+5pRzQJLJH2Sevx5M13uViJ YD0bAssUR/vcAcm5FeWvV+zcdrRCaB3FTp28/1kIz4k1Hm/OZHPsn5GVTQSbRLX9+tGz wcOm+vWe7Xu7bAEotMF4AFoBj6rmsiJUbJfpH/geygrRy6wRRaC8hAksyPlUeEsMMrgc c6YxU64NQa6c6aFaZdIEK4XVyr0WuOUg+s26RX+Deem+LQnY+oqk3BfFuFhIyUiD5Eas rs/DWKUaPkC1HdxRgGlgobuspGs7mNM1rR3I1kl4+tIu/ZUL/ZCdbkms3cmxvpH6jrYg L7jA== X-Gm-Message-State: AOJu0YxwDqcSFjBGLPhk+lIyKQ707FPKMKUV0OZJs5mAil1OgjW5rVoT xXz41Xs7q6WEEWF4/PsPTfa9gjMdUBmZu6xAabTcAgN1x3QD6PVJ7dXhwIkk40reOumtuKlaXdu eni6LNVA= X-Gm-Gg: AeBDieuIDTA0u2ckUWpBfedJz9aNWJ/MJyW3u+GjP6Nq8svITXGASim0KZ5gsie05x8 55YJ+fwjM11CW1WpvaKIIdp1SBORvJxOg57zSrzwj8EV6NLPdNIWDR7ONkjwBhGgIIMpfkYJvvz qOl/++2czsTC0JR0oGaYzUwhg0OkIG8+0GXlg9R0C/aJ1ftkmrqpN5+qoxm5+b9fyoBioNVeZ0R L8VoYqDuRyKiCdi0I0aH+BU6ZR5putJ0ClFtnAOX2JuRJkwKMi7cA9eZ7lYzNj7lWtxxFH1T2YZ P/8NRrIW4Q1gXdADQbdyHr0UgE1lkED034IYQdVhJuzTjHPifeECBSPaNHiSHtHcXW6tvjNEAlA PRr1jv2RGJpdVP5zoMOPqMEV9U9Uzg4qqC6Dm+DHEy/rYTq/5pyhxbXP5R5whSwJlF1Iol1Yf21 gDK8mL5OYxJPrEN9h2jSN3BwnchYgGEpUMNAC/dHfR0M7IZTQNm3CPfRtlpaGg4UZenXS7NG4uw s6SQfD5kQA= X-Received: by 2002:a05:600c:15d1:b0:48d:112c:f582 with SMTP id 5b1f17b1804b1-48e51e1e415mr31846455e9.11.1778076015499; Wed, 06 May 2026 07:00:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 038/110] target/mips: Remove unnecessary target_ulong uses in LD/ST Multiple Date: Wed, 6 May 2026 15:54:10 +0200 Message-ID: <20260506135524.20617-39-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1778076042821158500 @do_r31 is a boolean, @base_reglist an unsigned size and @i an unsigned index. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260417035734.32334-3-philmd@linaro.org> --- target/mips/tcg/ldst_helper.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/target/mips/tcg/ldst_helper.c b/target/mips/tcg/ldst_helper.c index ffe1895706a..0def1f296ae 100644 --- a/target/mips/tcg/ldst_helper.c +++ b/target/mips/tcg/ldst_helper.c @@ -216,13 +216,11 @@ void helper_lwm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, { MemOpIdx oi =3D memop_idx; unsigned mem_idx =3D get_mmuidx(oi); - target_ulong base_reglist =3D reglist & 0xf; - target_ulong do_r31 =3D reglist & 0x10; + unsigned base_reglist =3D reglist & 0xf; + bool do_r31 =3D reglist & 0x10; =20 if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { - target_ulong i; - - for (i =3D 0; i < base_reglist; i++) { + for (unsigned i =3D 0; i < base_reglist; i++) { env->active_tc.gpr[multiple_regs[i]] =3D (target_long)cpu_ldl_mmuidx_ra(env, addr, mem_idx, GETPC()= ); addr +=3D 4; @@ -240,13 +238,11 @@ void helper_swm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, { MemOpIdx oi =3D memop_idx; unsigned mem_idx =3D get_mmuidx(oi); - target_ulong base_reglist =3D reglist & 0xf; - target_ulong do_r31 =3D reglist & 0x10; + unsigned base_reglist =3D reglist & 0xf; + bool do_r31 =3D reglist & 0x10; =20 if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { - target_ulong i; - - for (i =3D 0; i < base_reglist; i++) { + for (unsigned i =3D 0; i < base_reglist; i++) { cpu_stl_mmuidx_ra(env, addr, env->active_tc.gpr[multiple_regs[= i]], mem_idx, GETPC()); addr +=3D 4; @@ -264,13 +260,11 @@ void helper_ldm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, { MemOpIdx oi =3D memop_idx; unsigned mem_idx =3D get_mmuidx(oi); - target_ulong base_reglist =3D reglist & 0xf; - target_ulong do_r31 =3D reglist & 0x10; + unsigned base_reglist =3D reglist & 0xf; + bool do_r31 =3D reglist & 0x10; =20 if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { - target_ulong i; - - for (i =3D 0; i < base_reglist; i++) { + for (unsigned i =3D 0; i < base_reglist; i++) { env->active_tc.gpr[multiple_regs[i]] =3D cpu_ldq_mmuidx_ra(env, addr, mem_idx, GETPC()); addr +=3D 8; @@ -288,13 +282,11 @@ void helper_sdm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, { MemOpIdx oi =3D memop_idx; unsigned mem_idx =3D get_mmuidx(oi); - target_ulong base_reglist =3D reglist & 0xf; - target_ulong do_r31 =3D reglist & 0x10; + unsigned base_reglist =3D reglist & 0xf; + bool do_r31 =3D reglist & 0x10; =20 if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { - target_ulong i; - - for (i =3D 0; i < base_reglist; i++) { + for (unsigned i =3D 0; i < base_reglist; i++) { cpu_stq_mmuidx_ra(env, addr, env->active_tc.gpr[multiple_regs[= i]], mem_idx, GETPC()); addr +=3D 8; --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076259; cv=none; d=zohomail.com; s=zohoarc; b=RIj6PLHBAViEqxy1PjY3NM0A9Ruw6n82oyYAArXPXIE0nGTIQoqJAfllGHzMulRgTpoMsYEwKKn4sd1mQWFVjM08lCvDHV9tcrlTAUoJQnjT64yJo8nJ6GzAThWMguV797OGzc7pgP8Yc0zql6W0+BgA22xrCogwpJEhK2VQMS0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076259; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=j73ul5aEd9R7sSndl2WuEnX7dofgQLl6AbC/gXzl4y8=; b=VeGQBn4tpGGXda4+/Ze9FW4B65BJpuPldg60qdBmc346uMe8l//ZBAw4TabiZhHIQ2HA8VUPXXwLuZ/APAajKkYuQLIDDj3dBmXiW1qgnlLCo8OzL+FiFIRi8IwHqMNExjIUXdsVc+FCDF9Ihq3btdoOIHDgj39anss9en3rP/s= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076259111248.16018252534127; Wed, 6 May 2026 07:04:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcnv-00056u-O3; Wed, 06 May 2026 10:00:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcnc-0004ni-Ev for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:29 -0400 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 1wKcna-0000Xs-HA for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:28 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-448528f4e69so3879387f8f.3 for ; Wed, 06 May 2026 07:00:26 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53907a00sm45742865e9.12.2026.05.06.07.00.21 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076024; x=1778680824; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=j73ul5aEd9R7sSndl2WuEnX7dofgQLl6AbC/gXzl4y8=; b=PZbBhOPb4AaiCXGuyBFgXR3MBDlZOcC4tt0tH6jdd2i6s20LK1EAl3NlehtDXwgRE4 p2AwdGLa9NYE9QqOGQ9K7pkphWtopgTT+gSe9xeIFUr9yQYX3EN8YFx6oitHmN3PfZDu 2AxuT1gvc2J2LhQkyAurmY9QbdpvLjbPh5yjkhF8W7KbzSy9qQMtK38b306/0hYxXV+C Pnqbc93wNQUyQOFY7JC4hNM6wn6dvwQKtj5b1PvZYwZZ8X8gGilxkJ+vwPmAxgtPsYVf sYrFSVNRC7vbqm4gHop28rzVhjd6m+HHCiJFTUzKgJJIVo0PLLVMG0kuDURWqdoE7w2g GKEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076024; x=1778680824; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=j73ul5aEd9R7sSndl2WuEnX7dofgQLl6AbC/gXzl4y8=; b=Oo8jB99v4pBaXPvZzBHG1R4YCuwL0Ur4JOTBkdB11go3gupIZDlBPbF2t7zmO7UuET OApcV8/FsoUJK7RU2DiSkdjR2fZXunpOgkO3lnRz2mT0ppTzvTIXFG1aQQAJcTZl0EiC aTV5hoxIWX6SarGpiITyROjpj0SVpOdIoddBSmpZAe5tImnNG1430SY8EQEv8HPnNKzo d5Q3eiIA+KUkB72wdyAb2QawcokD8g6g2L040htuh/Kf1uboRa+0kp7COqEufakZho3O WtW1x7LnGtr9eSCR2CUKo6BfE2DFjJdCWKGkD3XXY66ymUPDY+LtaaVY6lq+oV46DjTF sjbA== X-Gm-Message-State: AOJu0Yws0zQy98MYm6Csyf2XHGUAoEGLtk9rwWQpSXzD5qnVeAF4yIl1 cwIjuCdTWcnnCe68NXGZYbvFwafLu0mNGHvfFKfJhrD6Du51KIKUEvPThGsn5RB2l9eYY9Tf3AO +Zic6bPk= X-Gm-Gg: AeBDieuTRlalIeCjuaoPEsTEZRAT3jGXpKM5/3beCNCh1s3fEHfQl55Ly5P+DESfJB/ tz5M9lF54Xh7TRm+OQonk2zPkNiOOqPV/LGoiNvA6oFefYE3OHMQBaww6kUNWfEJgyT1vRnUfpv 811hodRma7rBm1oNIdTnYapwCbfv4wfwZ43+xtK7S7VciVOzxiRDgMa2UXJwIbKjmGqUziGJbk2 ugtkrurQV9dT0G26XLC3uWO7VzVeV8Cib7NOIOBl4638uunMS6S7T8tyyNqz4e7fe0Arb3SPzPW LW1Nnk9+rHdV+oob/XwpeoVyUtgkP6/Lrxhj907QSeNuYmOGNT00BufAkflDD84Pc9Y1JdNCCrM JHCFjO+5myZztd4V+67STaJjopgGZQEpmA0ieqzJL1IZke0zE58gaLxStfBsQI3movGSRXcbS71 KFsQaWO+puwG0x4iTtgAN2nazB8pSkgMoXCk9yrcZq98usqWh3aT9hzNk3iX0Q0UUqewM118JmQ RnWXQg= X-Received: by 2002:a05:600c:6095:b0:485:39b2:a47c with SMTP id 5b1f17b1804b1-48e51f48352mr61827585e9.25.1778076023404; Wed, 06 May 2026 07:00:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 039/110] target/mips: Inline cpu_ld/st_mmuidx_ra() calls in LD/ST Multiple Date: Wed, 6 May 2026 15:54:11 +0200 Message-ID: <20260506135524.20617-40-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076261168158500 In preparation of removing the cpu_ld*_mmuidx_ra() and cpu_st*_mmuidx_ra() calls, inline them. Expand MO_TE to mo_endian_env(env) in gen_ldst_multiple(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260417035734.32334-4-philmd@linaro.org> --- target/mips/tcg/ldst_helper.c | 34 +++++++++++------------ target/mips/tcg/micromips_translate.c.inc | 2 ++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/target/mips/tcg/ldst_helper.c b/target/mips/tcg/ldst_helper.c index 0def1f296ae..537f3e87bc0 100644 --- a/target/mips/tcg/ldst_helper.c +++ b/target/mips/tcg/ldst_helper.c @@ -215,21 +215,20 @@ void helper_lwm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, uint32_t memop_idx) { MemOpIdx oi =3D memop_idx; - unsigned mem_idx =3D get_mmuidx(oi); unsigned base_reglist =3D reglist & 0xf; bool do_r31 =3D reglist & 0x10; + target_ulong *gpr =3D env->active_tc.gpr; + uintptr_t ra =3D GETPC(); =20 if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { for (unsigned i =3D 0; i < base_reglist; i++) { - env->active_tc.gpr[multiple_regs[i]] =3D - (target_long)cpu_ldl_mmuidx_ra(env, addr, mem_idx, GETPC()= ); + gpr[multiple_regs[i]] =3D (target_long)cpu_ldl_mmu(env, addr, = oi, ra); addr +=3D 4; } } =20 if (do_r31) { - env->active_tc.gpr[31] =3D - (target_long)cpu_ldl_mmuidx_ra(env, addr, mem_idx, GETPC()); + gpr[31] =3D (target_long)cpu_ldl_mmu(env, addr, oi, ra); } } =20 @@ -237,20 +236,20 @@ void helper_swm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, uint32_t memop_idx) { MemOpIdx oi =3D memop_idx; - unsigned mem_idx =3D get_mmuidx(oi); unsigned base_reglist =3D reglist & 0xf; bool do_r31 =3D reglist & 0x10; + target_ulong *gpr =3D env->active_tc.gpr; + uintptr_t ra =3D GETPC(); =20 if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { for (unsigned i =3D 0; i < base_reglist; i++) { - cpu_stl_mmuidx_ra(env, addr, env->active_tc.gpr[multiple_regs[= i]], - mem_idx, GETPC()); + cpu_stl_mmu(env, addr, gpr[multiple_regs[i]], oi, ra); addr +=3D 4; } } =20 if (do_r31) { - cpu_stl_mmuidx_ra(env, addr, env->active_tc.gpr[31], mem_idx, GETP= C()); + cpu_stl_mmu(env, addr, gpr[31], oi, ra); } } =20 @@ -259,21 +258,20 @@ void helper_ldm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, uint32_t memop_idx) { MemOpIdx oi =3D memop_idx; - unsigned mem_idx =3D get_mmuidx(oi); unsigned base_reglist =3D reglist & 0xf; bool do_r31 =3D reglist & 0x10; + target_ulong *gpr =3D env->active_tc.gpr; + uintptr_t ra =3D GETPC(); =20 if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { for (unsigned i =3D 0; i < base_reglist; i++) { - env->active_tc.gpr[multiple_regs[i]] =3D - cpu_ldq_mmuidx_ra(env, addr, mem_idx, GETPC()); + gpr[multiple_regs[i]] =3D cpu_ldq_mmu(env, addr, oi, ra); addr +=3D 8; } } =20 if (do_r31) { - env->active_tc.gpr[31] =3D - cpu_ldq_mmuidx_ra(env, addr, mem_idx, GETPC()); + gpr[31] =3D cpu_ldq_mmu(env, addr, oi, ra); } } =20 @@ -281,20 +279,20 @@ void helper_sdm(CPUMIPSState *env, target_ulong addr,= target_ulong reglist, uint32_t memop_idx) { MemOpIdx oi =3D memop_idx; - unsigned mem_idx =3D get_mmuidx(oi); unsigned base_reglist =3D reglist & 0xf; bool do_r31 =3D reglist & 0x10; + target_ulong *gpr =3D env->active_tc.gpr; + uintptr_t ra =3D GETPC(); =20 if (base_reglist > 0 && base_reglist <=3D ARRAY_SIZE(multiple_regs)) { for (unsigned i =3D 0; i < base_reglist; i++) { - cpu_stq_mmuidx_ra(env, addr, env->active_tc.gpr[multiple_regs[= i]], - mem_idx, GETPC()); + cpu_stq_mmu(env, addr, gpr[multiple_regs[i]], oi, ra); addr +=3D 8; } } =20 if (do_r31) { - cpu_stq_mmuidx_ra(env, addr, env->active_tc.gpr[31], mem_idx, GETP= C()); + cpu_stq_mmu(env, addr, gpr[31], oi, ra); } } =20 diff --git a/target/mips/tcg/micromips_translate.c.inc b/target/mips/tcg/mi= cromips_translate.c.inc index 4dca11b84b4..fb107eb91fe 100644 --- a/target/mips/tcg/micromips_translate.c.inc +++ b/target/mips/tcg/micromips_translate.c.inc @@ -701,6 +701,8 @@ static void gen_ldst_multiple(DisasContext *ctx, uint32= _t opc, int reglist, return; } =20 + mop |=3D mo_endian(ctx); + t0 =3D tcg_temp_new(); =20 gen_base_offset_addr(ctx, t0, base, offset); --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076098; cv=none; d=zohomail.com; s=zohoarc; b=nK2uF9wz+hMl/+NRwzrk7KRwGtM57t8J2w4EfHi4M7bYkjHOOqCTreV7pZTqiKBKQgdb+YllvjRldZOxMWoQWt8RcvxZAiRz3o9VpHx64qcvpE1JkmkEqpoz+iRS6LfNSFfbID065K+sY+Da4EeXDnsWcKzTQLbNMsDCpJEMnzI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076098; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=aiS5VPVZwmKd8FQ7cW6jsheyhp9wBNYj5aSAD9f/3t0=; b=CsmmrGAv1FQPeXjML/op/BbXX1EhA/NXqYwfr2LMxqV/9ebkOMN1oim65gdvIg/Asvq+z3Y8seDD7QSklGQrIDNs0EzboFVd+bNf/wTdDJJEMzsmrmK5AEuJgCV6IGjwYVScZjDfgve2ffs4S0Zf3s2lZINl1ALCrjFfR886B0Q= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076098764482.07799594588926; Wed, 6 May 2026 07:01:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKco7-0005HH-6G; Wed, 06 May 2026 10:00:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcnn-0004yK-Dh for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:41 -0400 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 1wKcnj-0000Z1-04 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:38 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-48d146705b4so25238275e9.3 for ; Wed, 06 May 2026 07:00:34 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5312de76sm17276255e9.21.2026.05.06.07.00.29 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:00:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076032; x=1778680832; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aiS5VPVZwmKd8FQ7cW6jsheyhp9wBNYj5aSAD9f/3t0=; b=dgSO+aILkm66TZ/yfE6hSfuFYRi2W8sdccza8fAguBB2/+bRc1C2QEMMaRSm4mxjZx QWe9Zg6gNibo5AnbXAnYR1qU5p4raSaJ7pu6GT5lp2cbT5JFzcOk82opvI1/7O9nxMxE jmBVyjklhPUCNPKjSXMG1DA2mnH3ekNZ29BhxbQt842kAi65aqw/G/45xbn/FZFZ1P9y u3fBLbR1NMC6B/7HPk6u4NsOM8epQFR2MQLDknvss42kJanGgTKyTComgjunBrgtEWCh GXQp8s77sp4KdKbJHy4EFc4gbX8/GQVBTf4tyt6dAfrUHQiofqLyTMyU148/WD3v8Z/R cV7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076032; x=1778680832; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=aiS5VPVZwmKd8FQ7cW6jsheyhp9wBNYj5aSAD9f/3t0=; b=eH+wSmzEn+x0OmzBzEMDgdZq5Szdsfrb8TY5Tn89wFLS7+rXEqkiZUn5a5laGa767B i9HAJ1+LuCbBVE9ZT6vAEMb7XIXyfq8Th+k5ozPqQEZm7q5YZwiT3Li5rLn/8xDgX/pm u1dqZ1BdjFLHLkHlsDWO93TuwE2Sfk4noYduDxREgVPRuEwW0WiLWPTurPAfnF9os41U OCYKYaBQ8oOQ4K8zEdHt1epPk5dcUqYQLKa03I76AFSVg8nimyWRTzdwrbWqwO1apFB9 2B1k/oz5qJXuyAaIBgNscC+A9IFkqx4ekw29EYbA5K5nDRUKLYwX4e6imFWT5YBBErPs H6ng== X-Gm-Message-State: AOJu0YzeS7jHx9SZHDsyeNvrAKYWdDWVBl9hmx9gHZx05xwxL9Q9T3Ri XaTJydrQbKb6dH18/csSZj/zhGTmP2HwHNcn0/u2HYssuvEolyy+FwLGY0RyLlLGTiSslfYfO4E u+KWW/UY= X-Gm-Gg: AeBDiesrQh58PCZof/9v+8WCCUz/SLG9WMVEUeLnhLjT/Q5ycFuBf5eakD8RjXg/p2l uP043aUKTHtxiWJ7rlyIVHusBosmieVDq+YnttPiSEbei16m2Kjj/Hwpl9utaNopcWnh8bqeL7W 4lL1PypDdZUQXX7hglm9XowOTBYWJQlJDuuShpaDZxIzJJdTz0vVdtCFlAD7hDFgvVoJgeGq6I2 PlLphIx2HQmmH6EIaETIT3CXGvqQ/VgihRMgrIX/OFy0GebDSAhh8ynsvfP6UxtSH+INtxKroAe H9jLkXF7ZKRDRlS3xoyn6l1QNLjuPddy8i2rSGidTB59prS+cykKFBuhvKuXECa/lxyNtLnmNWU BKA7pr6xUWUyouSXzQZqif65E5GNRjbNzdZBloW/sW5WVjF/cocTidNoTO4HhKqRz8gM0yl3jk3 DLt2qNQd6VvhceNRfy4lhB0Xqa46uYNxMnQQM0AZblWTFyS5qKS9WJc3NqA3BMVcIXUrcTsxfUx 51RdYCeUE4= X-Received: by 2002:a05:600c:47d6:b0:489:1cda:bbb7 with SMTP id 5b1f17b1804b1-48e521d750fmr38309865e9.25.1778076031425; Wed, 06 May 2026 07:00:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 040/110] target/mips: Check alignment for microMIPS pre-R6 LD/ST multiple Date: Wed, 6 May 2026 15:54:12 +0200 Message-ID: <20260506135524.20617-41-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076100154154100 Pre-REL6 microMIPS requires alignment while REL6 microMIPS does not. Use @default_tcg_memop_mask in gen_ldst_multiple(), it is set to MO_UNALN for REL6 but MO_ALIGN for pre-REL6. Fixes: 3c824109da0 ("target-mips: microMIPS ASE support") Reported-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260417035734.32334-5-philmd@linaro.org> --- target/mips/tcg/micromips_translate.c.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/mips/tcg/micromips_translate.c.inc b/target/mips/tcg/mi= cromips_translate.c.inc index fb107eb91fe..da2419792eb 100644 --- a/target/mips/tcg/micromips_translate.c.inc +++ b/target/mips/tcg/micromips_translate.c.inc @@ -693,7 +693,7 @@ static void gen_ldst_multiple(DisasContext *ctx, uint32= _t opc, int reglist, int base, int16_t offset) { TCGv t0, t1; - MemOp mop =3D MO_UNALN; + MemOp mop =3D ctx->default_tcg_memop_mask; MemOpIdx oi; =20 if (ctx->hflags & MIPS_HFLAG_BMASK) { --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076276; cv=none; d=zohomail.com; s=zohoarc; b=jfOJ55uyyNwo6ym0OZg/AXKsbsIBgPHxmVOVW6Ij+mkeaL6BfURplPTQJABWwXStBFinl/HqwwdzJvxIb58bVXtoSQIk0QOEeyosxaMEJ7QAEjMfKUZPV+tlDsA3LRjNo1DHxc1FzexXyB2LrJ1/KtY3LjQc6s63EtKWwI7EzGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076276; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=qre66aPGzaHyRW/mep22O0VUOmIb2TridNeuU/H0ZPg=; b=LuTJBKdmLQIiSUnNAdY9I9RxKKs8QlFwuPHMDzks1+8pXxIIJyCCDeuBRjUieVpVRtPwlRtufl+nWNV99I+6jJcPX1HODLb/XHpMMYhCWxSCNY2MmcMXzGbVBv9/x8tQvIuEm6qRQwEcBNjx//1MjSmiaT539nJHuu3xIfbWSqc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076276651473.98166819827725; Wed, 6 May 2026 07:04:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKco1-0005H3-2I; Wed, 06 May 2026 10:00:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcnt-00055o-W5 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:46 -0400 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 1wKcnr-0000aB-Vu for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:45 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-48909558b3aso71280545e9.0 for ; Wed, 06 May 2026 07:00:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4511d8cd160sm8110787f8f.8.2026.05.06.07.00.37 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076040; x=1778680840; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qre66aPGzaHyRW/mep22O0VUOmIb2TridNeuU/H0ZPg=; b=JUYQ5GhaWZQIyXwQObpkvljrCL3llPfrIRSq4chagcP11QXzqW6P+rNelfPFBrYaiM D+RzCnqi+x8AqK55NYoSDXWzAUi9+l3gHBqORuSb6sHJc1e+TsZcsCBtHIs/2WaQ8GJv GqxMXoVTy6BKXLCn4LtB+bjrl2JAZpdVTGRD4NjWK8l4rlsNEE6h/jsmw3bYj2XVb8GO 7S7/fxlnHqIG5i4kGsptb5lAoS/M+n9+FD2omyzf6OdcrNR5Iw9vi4erNZDVinBJywX3 asT9z3+QvnyrRjTFmtduqceCcGpU3q61a+sBHJj3s9XJ9m4s87rNRcwEX62w6cu7RMPP Sj4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076040; x=1778680840; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=qre66aPGzaHyRW/mep22O0VUOmIb2TridNeuU/H0ZPg=; b=flvyFDJ4GgMwLfX7iaz+wElSd5A1q9YnugJsgULmT3zRv8Klo7QjXQvnutBDOojQGR sF7yivzAk/j0UbugY4xY2NqZeCFj7xPsL6pwnT6Bv9mGyRhPyAgbb26gMFHnMrU7N65e 6PzxGH4kmFP/hGaItwdQPil6Am0f1Djgu/vvNLgBkrVbJ0iunZgzMKNBD2Jb5RxQW3JT LFFhvk8rXJN8/Z3dV/G3re2wHT8a3ckhLM9R8bu1fefOUB8XtjzKgYTCq+/zv1hSsWRi 51koyvd11qPxzrxJVIyVCEzhPnpaNJY2HOfcY9kgmE5FduLkeeeYPUytezmDpVKfsN4Q uqsA== X-Gm-Message-State: AOJu0Yxw6DYVt89HHJcAklwyu13jhwTwcm6RiCUqk/DB/0vFieCA7Cw4 vXG/5xY2+5GRNrTlreaWeT61iRZIWu7qDN55GrrFFWrk/shFlYysJ/T7Rd3g7NbNXCwQKU9AeqR FLcemzyk= X-Gm-Gg: AeBDievL+cvMumNNW3I/Swemzczoqay+X2jhjYQJ0zk4BpfMnnFE1okL9l44VrBUDN+ oh37aa5GUGIpzjSR7taXElHGuXR5Tlc55NzMPo3e4M/jGZw3rZ1+9cCgfDYmSrCn2Xi2JsgutL6 qtTW7Vtr6rZavNAxHA8KVaIGVzjUrIs4JCY4IDcu6M1x5ceuxgE6+eAfuSTSc/EyO6cpghONXyM 5Z7REuYmkptB13EnXTTLZtsnI6gAjM5ktuQ2nAC+nkEw16Gb4fDyhTd5Hghh7oXkvYbPEtU0etr 6Fd6Isl3jeNfNoRQGuBRT4UFrdRYTqFWlgq4E0RMwgKefBhZBtQa30G0q1CN6sYqKqSDO4phRmG 9M9TTXdOCtZwc7b5DZwKGmxTvKFmWvkzvGzVE+LczYy43Oqi+sOzGA5KyUhYtzHbqkM1zr3X4Fm 8AVrcekXhlLn31aBmTcWqXtLTXeRVTY77vpnLZEsmkOlS1vPFjPo7wkULuH9fx+6Ile5rYfRHv/ 9lfbN/7hj4= X-Received: by 2002:a05:6000:144a:b0:439:beb9:5a96 with SMTP id ffacd0b85a97d-4515d3dc683mr7111055f8f.31.1778076039480; Wed, 06 May 2026 07:00:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 041/110] stubs: Rename monitor* -> qmp* files Date: Wed, 6 May 2026 15:54:13 +0200 Message-ID: <20260506135524.20617-42-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076277350158500 We use 'HMP' for Human monitor and 'QMP' for 'Machine protocol'. These files aren't about human monitor but QMP, so rename them for clarity using the 'qmp-' prefix instead of 'monitor-'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Eric Farman Message-Id: <20260427080738.77138-6-philmd@linaro.org> --- MAINTAINERS | 6 ++++++ stubs/{monitor-arm-gic.c =3D> qmp-arm-gic.c} | 0 ...nitor-cpu-s390x-kvm.c =3D> qmp-cpu-s390x-kvm.c} | 0 stubs/{monitor-cpu-s390x.c =3D> qmp-cpu-s390x.c} | 0 stubs/{monitor-cpu.c =3D> qmp-cpu.c} | 0 stubs/{monitor-i386-rtc.c =3D> qmp-i386-rtc.c} | 0 stubs/{monitor-i386-sev.c =3D> qmp-i386-sev.c} | 0 stubs/{monitor-i386-sgx.c =3D> qmp-i386-sgx.c} | 0 stubs/{monitor-i386-xen.c =3D> qmp-i386-xen.c} | 0 stubs/meson.build | 16 ++++++++-------- 10 files changed, 14 insertions(+), 8 deletions(-) rename stubs/{monitor-arm-gic.c =3D> qmp-arm-gic.c} (100%) rename stubs/{monitor-cpu-s390x-kvm.c =3D> qmp-cpu-s390x-kvm.c} (100%) rename stubs/{monitor-cpu-s390x.c =3D> qmp-cpu-s390x.c} (100%) rename stubs/{monitor-cpu.c =3D> qmp-cpu.c} (100%) rename stubs/{monitor-i386-rtc.c =3D> qmp-i386-rtc.c} (100%) rename stubs/{monitor-i386-sev.c =3D> qmp-i386-sev.c} (100%) rename stubs/{monitor-i386-sgx.c =3D> qmp-i386-sgx.c} (100%) rename stubs/{monitor-i386-xen.c =3D> qmp-i386-xen.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index ac47299fd83..f560853ea41 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -121,6 +121,7 @@ F: include/hw/s390x/ F: include/hw/watchdog/wdt_diag288.h F: pc-bios/s390-ccw/ F: pc-bios/s390-ccw.img +F: stubs/qmp-cpu-s390x.c F: target/s390x/ F: docs/system/target-s390x.rst F: docs/system/s390x/ @@ -497,6 +498,7 @@ M: Christian Borntraeger R: Eric Farman R: Matthew Rosato S: Supported +F: stubs/qmp-cpu-s390x-kvm.c F: target/s390x/kvm/ F: target/s390x/machine.c F: target/s390x/sigp.c @@ -510,6 +512,8 @@ L: kvm@vger.kernel.org S: Supported F: docs/system/i386/amd-memory-encryption.rst F: docs/system/i386/sgx.rst +F: stubs/qmp-i386-sev.c +F: stubs/qmp-i386-sgx.c F: target/i386/kvm/ F: target/i386/sev* F: scripts/kvm/vmxcap @@ -522,6 +526,7 @@ S: Supported F: include/system/kvm_xen.h F: target/i386/kvm/xen* F: hw/i386/kvm/xen* +F: stubs/qmp-i386-xen.c F: tests/functional/x86_64/test_kvm_xen.py =20 Guest CPU Cores (other accelerators) @@ -797,6 +802,7 @@ F: include/hw/timer/a9gtimer.h F: include/hw/timer/arm_mptimer.h F: include/hw/timer/armv7m_systick.h F: include/hw/misc/armv7m_ras.h +F: stubs/qmp-arm-gic.c F: tests/qtest/test-arm-mptimer.c =20 Bananapi M2U diff --git a/stubs/monitor-arm-gic.c b/stubs/qmp-arm-gic.c similarity index 100% rename from stubs/monitor-arm-gic.c rename to stubs/qmp-arm-gic.c diff --git a/stubs/monitor-cpu-s390x-kvm.c b/stubs/qmp-cpu-s390x-kvm.c similarity index 100% rename from stubs/monitor-cpu-s390x-kvm.c rename to stubs/qmp-cpu-s390x-kvm.c diff --git a/stubs/monitor-cpu-s390x.c b/stubs/qmp-cpu-s390x.c similarity index 100% rename from stubs/monitor-cpu-s390x.c rename to stubs/qmp-cpu-s390x.c diff --git a/stubs/monitor-cpu.c b/stubs/qmp-cpu.c similarity index 100% rename from stubs/monitor-cpu.c rename to stubs/qmp-cpu.c diff --git a/stubs/monitor-i386-rtc.c b/stubs/qmp-i386-rtc.c similarity index 100% rename from stubs/monitor-i386-rtc.c rename to stubs/qmp-i386-rtc.c diff --git a/stubs/monitor-i386-sev.c b/stubs/qmp-i386-sev.c similarity index 100% rename from stubs/monitor-i386-sev.c rename to stubs/qmp-i386-sev.c diff --git a/stubs/monitor-i386-sgx.c b/stubs/qmp-i386-sgx.c similarity index 100% rename from stubs/monitor-i386-sgx.c rename to stubs/qmp-i386-sgx.c diff --git a/stubs/monitor-i386-xen.c b/stubs/qmp-i386-xen.c similarity index 100% rename from stubs/monitor-i386-xen.c rename to stubs/qmp-i386-xen.c diff --git a/stubs/meson.build b/stubs/meson.build index f33b1d2a089..af4051e6c5e 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -79,14 +79,14 @@ if have_system stub_ss.add(files('target-monitor-defs.c')) stub_ss.add(files('win32-kbd-hook.c')) stub_ss.add(files('xen-hw-stub.c')) - stub_ss.add(files('monitor-arm-gic.c')) - stub_ss.add(files('monitor-i386-rtc.c')) - stub_ss.add(files('monitor-i386-sev.c')) - stub_ss.add(files('monitor-i386-sgx.c')) - stub_ss.add(files('monitor-i386-xen.c')) - stub_ss.add(files('monitor-cpu.c')) - stub_ss.add(files('monitor-cpu-s390x.c')) - stub_ss.add(files('monitor-cpu-s390x-kvm.c')) + stub_ss.add(files('qmp-arm-gic.c')) + stub_ss.add(files('qmp-i386-rtc.c')) + stub_ss.add(files('qmp-i386-sev.c')) + stub_ss.add(files('qmp-i386-sgx.c')) + stub_ss.add(files('qmp-i386-xen.c')) + stub_ss.add(files('qmp-cpu.c')) + stub_ss.add(files('qmp-cpu-s390x.c')) + stub_ss.add(files('qmp-cpu-s390x-kvm.c')) endif =20 if have_system or have_user --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076169; cv=none; d=zohomail.com; s=zohoarc; b=ddV2fKyZs8aOeWayH2YdiJRjZwot031Mz+K8AeSUEIzTECgbhOIUS34oFi0PY7b4b9jH7/C1LmmDBUTleVZYQdcSp+REWqooiuFr1RQpTFtWVpBzgAbwEF+aIpRCc7HO0v1DAfuYOzpWuYTy9sVrdoH9CWJ30y/wiA8x4JgDE0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076169; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=T/xOKwF2KGrNc/2lU7g/yWrNS/80ccjkH0et3qNQ7FI=; b=n4JXprEaIZS+UnMh0NQ7stfcC4V1vUYFRgSG8ZNelWInjHeTSzlVNDYYu88naYn2Es4S9v3t1BzHhG83ZnE+I5o2nFo7/tROxjCEAOeQzM+61uGRjnGJfp0PEJ7OytFrD0qEMc3LIcThVP61P2fKLx4iozyMW3vpLsTWVBfvJj0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807616934563.16870165118951; Wed, 6 May 2026 07:02:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcoC-0005X6-5t; Wed, 06 May 2026 10:01:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcnz-0005Iq-Is for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:56 -0400 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 1wKcnx-0000bD-Tl for qemu-devel@nongnu.org; Wed, 06 May 2026 10:00:51 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-488b0046078so57235365e9.1 for ; Wed, 06 May 2026 07:00:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5389da63sm49400835e9.4.2026.05.06.07.00.45 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:00:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076047; x=1778680847; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=T/xOKwF2KGrNc/2lU7g/yWrNS/80ccjkH0et3qNQ7FI=; b=ZGx6r33dqiViKv+6qz1EYPVYuhFlh/Nu26iZnziOjdiM725kvIFh7hkf5Ec6jk9rke QMGHatCtsOCJ9jTDqd5akdY/n8HBWAukHJVZkAVhUk5Sis21Kwl1e5RMqv7DIl+vOcMe sxufMSdiKp6Ywh/phJrF52wkzTmRjbvvr8UxW6PYMaM59Yq1CjrkyVZSp3eI3l1qCqSz pBGKhpuCuItUlvhC3aIelVfvgLYI3JruJLla+dWeJipN0aBzmyHz0EW5qEA+zyr9NNb9 uJVbOiqcq7rY+SSuh5bgvBUzpHZq+EohvFqzIRQbBqGCuvE/DW9X6TN8R6RWjGGoX3IO Gxcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076047; x=1778680847; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=T/xOKwF2KGrNc/2lU7g/yWrNS/80ccjkH0et3qNQ7FI=; b=mhT8KvmVzIu4J2M2GqWuo5+ONjeBiMdqHLxDbmBOqV8grpkwEkN3aHxU5oUV8emC1d fAN2xXtqpksM5YNnkp0oN7VFNP44GxoDbzCDrxRfzk6B/wFdgN/HUh7yZJyuRQBPy1EH Ht7PY0H9V70rGaLm3RGRmg0latJL3hNmdQh1sstDEBxmYzPwytX7iOWbTcOpytmW3DvJ M8IaiTMm1iWUBecelWCjNfF9cWayfO/EFE+W6Aw/QXo3HZzSdY9TjdXsM6Q29nLgv8tq maYAlwjdviW7Cngant0TzejKFWy+Iki9LNOR0YRmw0B0lQ5KJhqWQvP96n++1lJULb2i Qdyw== X-Gm-Message-State: AOJu0Yz6d1KQyVmGeil4bpQWoup86Nsy9Ab2qzjMsKuYL5geDnSSmpGt IXUfQDoZ3lrFWdTomw1pP79ENx6Rvh7Jg8AzSZ2Q8DGFOaR6EIeunIJFEPbErSH46EDOGPJDGwK FgrL2qcA= X-Gm-Gg: AeBDiesqcUQ9cmnGWb7a78lZ4bG+vkEIEw86J0hL/ip2DNhcRa5RNETCJGXOeoPT7Cd YcHwFXhEoxwEzlJ/ScXCoWeFVoELxCKcAUm4t2CjJZH1LVLj6dab/yyEUssGPgoSNTR3nM+sltq 9Hn2e8swuTpWSjt/ftNK4tZEq3bSKjbNol9fWHeW5DSGJeNGDf6r5KhuoEeaQp2JnMFibE8Q0q/ cUkXEXwqTOBdX2xgMuLo0F4n4l7AjijnCRn6u0vQOQehmsNcfvFoDDjxoUFooUDLldL2dp40RK+ VzmcpR0LTU+JLgnTfHrEq+q/4Z26rNoEsfwIY9CjiFg20P3MSXVlBTwjvCZe+/43DDLYjno4k8Y dQH7qZ1o/19t3X+jq0dtnJs/YNKjMNbT5srVvde5qiaJ2UyY1XpgohwWG7qVw4PkvZy+MQpEXmI o85Ddvok5GblaqEh2+iP8vTqPQOdwXRvp6uFUE6p9MWUMWBCM9HddDyYCWAMpQ5NFjD6Q4j1buu Q0A5Z8MZi0= X-Received: by 2002:a05:600c:4512:b0:488:c744:49b with SMTP id 5b1f17b1804b1-48e51f539b0mr59558085e9.7.1778076047024; Wed, 06 May 2026 07:00:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 042/110] monitor/meson: Use SPICE with migration HMP commands Date: Wed, 6 May 2026 15:54:14 +0200 Message-ID: <20260506135524.20617-43-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076171440154100 When moving code around in commit 27be86351ec ("migration: Move the QMP command from monitor/ to migration/") we forgot to update the meson rule about SPICE pkg-config flags. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-7-philmd@linaro.org> --- migration/meson.build | 2 +- monitor/meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/migration/meson.build b/migration/meson.build index c9f0f5f9f21..e583822dec6 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -23,7 +23,6 @@ system_ss.add(files( 'fd.c', 'file.c', 'global_state.c', - 'migration-hmp-cmds.c', 'migration.c', 'multifd.c', 'multifd-device-state.c', @@ -37,6 +36,7 @@ system_ss.add(files( 'socket.c', 'tls.c', ), gnutls, zlib) +system_ss.add([spice_headers, files('migration-hmp-cmds.c'), spice]) =20 if get_option('replication').allowed() system_ss.add(files('colo-failover.c', 'colo.c', 'multifd-colo.c')) diff --git a/monitor/meson.build b/monitor/meson.build index 2647100e04c..585251804e4 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -5,8 +5,8 @@ system_ss.add(files( 'hmp-cmds.c', 'hmp.c', 'qemu-config-qmp.c', + 'qmp-cmds.c', )) -system_ss.add([spice_headers, files('qmp-cmds.c')]) =20 specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', - if_true: [files('hmp-target.c'), spice]) + if_true: [files('hmp-target.c')]) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076258; cv=none; d=zohomail.com; s=zohoarc; b=NnR4ANDls/V6/5akkY/dy7IINephkLeFlY1GZCv+wE0V74J4AebEksW/kNGKR2wPTISfWVlM60t0Gsb3gWqowvWf++rYDY940eCk+TWBLPah69DXZSgibzN/COt6hxFLT7JNsJueLm9EiocDI4stiiRFIUS84Os6uOTu2Pwu8kY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076258; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=rVl4Ot9jNOgGYAeM+5IhhfFZHe3/ocTPrsdtHl9wG98=; b=kkLyTZhqq7TKZ3f7NTfZDXMyepbomz8S1e1cBcHenhSjdw45CR5p+/JNVgqRxB1svhegSbS4ygeCqyPTQEb+MJtxzE/3ZvmfscV8uTG+CdSw1dTXqPDbXqu8rLAv6gToHWYMSu2w6al6Ae+gKNzZ7whtU7XwdmOIMxBHCgns/os= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807625876380.37991745912268; Wed, 6 May 2026 07:04:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcql-0000Ht-Hq; Wed, 06 May 2026 10:03:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcp2-0006lt-9D for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:56 -0400 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcp0-0000qf-NQ for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:56 -0400 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-670ab084a39so4306930a12.3 for ; Wed, 06 May 2026 07:01:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45052a488d8sm12594456f8f.12.2026.05.06.07.00.53 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:00:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076112; x=1778680912; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rVl4Ot9jNOgGYAeM+5IhhfFZHe3/ocTPrsdtHl9wG98=; b=Bh4Fkllzfkuy8u34kQnBYE1JvfX9As23fZVVn7uJK7pqQAtZtRgg/X1WwQS6j8h+SQ jjBbR2jg9ANqW3xr92YG3oxfEUf4zf40whAOE1YUNeruZGSs5pykfhKoH/YWsZ3Bt+MZ ir82VHepO01Qxd+prm8OL1JPcAe1r2zpUojGZfaEfZ8emqFyv4F/DDfHQzimGJfylE/O UB3wmQs62wAdIPn9/CtkbUXRsiZd0uCYXUA9Skrsi8S7rMIcl1a9yC2I17/TbaJqStgD Do/ecrKJF8qGgWwqlGHEorxw3tzSWqyb03VTn0GoIs6MtBQBgvvwMvC5sI9fOw2Ind+h I6Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076112; x=1778680912; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=rVl4Ot9jNOgGYAeM+5IhhfFZHe3/ocTPrsdtHl9wG98=; b=p6byr5u6DMPYr6jmUwumFU9LX+px3ItLGVUcD0V4yIVnsZiqvQcO9G3IreC06ukYpA usJUxhCfw8xdlCSyv0EGZFHK4oQhTyqer3xg/YjwyF9uOERXHq+IXJC2RtknHynkA95E PDU25+f+a4+VNLwXLKBcfo1OChoZmJxpYEFlG5m/kp11waPOpJSBLAtt9eAM3sPnO2pk GAmysDTGkbcFfCVYJevkrDoX7115vbs+fLtaMqb8afaaEbIx+8avtmRrYQcFeh//N/YH DMfcdAzFjOAoakI+VkQ9D7gIK8k3ZPwxDa7MIshZGF0GhNf6METQj1DZgXF7bsvh0myS ngtA== X-Gm-Message-State: AOJu0Yzv6Co+wXjb8Pf9uJWXoxQx8+r/95tT+3VGa1Fh0pkamr3sMZgy KF8xx/1w6mC8DXduDJZzEk9D9pb2Snn3iJ83zkGPCJYmoKsrgAm7bEoV/u2w6n+FXiwspiCC//V UaYw4r8U= X-Gm-Gg: AeBDietsXp3gtRoiqz9lt67qI9YOKvBP+Eq4q9vWMXfz6zQtunvAMStPya2AI5N57Uz yhHzbte0A2B4JiGkFOaCHZuJbXodQWjMNXyM2LDAzzqEl+VO8ZHNzjsIAPBNwCoeg7K3xvgPgb8 kMM5VCqx954NpF0aUL846VGOIRAolrbRHKQBon3K/OHAK8mya5HptnFtNyNc73gquBIKxyOhqAX SI/evwIzvA1hwn1AfIQKBcM2E4KgGK+cZsByUPNr3Xtgu60g6iYLHXxzwZqqb5vDssvdUddVitQ 32OcZO9z2XpRRlGk5ila0QOavdove+yhfxY7i03M6zgx8Yk9NQvYOKFS7aszcZ33ppK+xWSriSK SKrw6BiK1QPPTQzUeHbAeDLm1Q1+1KRioOWKVmxnJGDl8DpnptOaCYR+EWE3IqJ/7fMpulTgBI9 7KzQI1MXXiQaO5sJGlyypyeEdbrGiCh+CGcSnTju5AWoYOVn8CxlcNzdU4/aFgh08hDct6z5L2r Ylb/70nl+g= X-Received: by 2002:a05:6402:3586:b0:67c:7697:1ee8 with SMTP id 4fb4d7f45d1cf-67d63aa0577mr1670002a12.5.1778076055170; Wed, 06 May 2026 07:00:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 043/110] monitor: Restrict monitor_set_cpu() method scope Date: Wed, 6 May 2026 15:54:15 +0200 Message-ID: <20260506135524.20617-44-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=philmd@linaro.org; helo=mail-ed1-x533.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: 1778076261183158500 As mentioned in commit 755f196898e ("qapi: Convert the cpu command") 15 years ago, the monitor_set_cpu() method is a temporary bridge between QMP -> HMP and shouldn't be used elsewhere. Make its scope internal to monitor/. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-8-philmd@linaro.org> --- include/monitor/monitor.h | 1 - monitor/monitor-internal.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 296690e1f1c..55649a86641 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -37,7 +37,6 @@ int monitor_vprintf(Monitor *mon, const char *fmt, va_lis= t ap) int monitor_printf(Monitor *mon, const char *fmt, ...) G_GNUC_PRINTF(2, 3); void monitor_printc(Monitor *mon, int ch); void monitor_flush(Monitor *mon); -int monitor_set_cpu(Monitor *mon, int cpu_index); int monitor_get_cpu_index(Monitor *mon); =20 int monitor_puts_locked(Monitor *mon, const char *str); diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index feca111ae31..80b4a8150bf 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -175,6 +175,7 @@ void monitor_data_destroy(Monitor *mon); int monitor_can_read(void *opaque); void monitor_list_append(Monitor *mon); void monitor_fdsets_cleanup(void); +int monitor_set_cpu(Monitor *mon, int cpu_index); =20 void qmp_send_response(MonitorQMP *mon, const QDict *rsp); void monitor_data_destroy_qmp(MonitorQMP *mon); --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076302; cv=none; d=zohomail.com; s=zohoarc; b=WqZopSmOv+Sct+N5LbF/W8uXXiJHaMLgta0n0ay98ko5U9sv9nfXRRSeeTzsSwzDVWoeHFtjCbK1fjSpIGPjc9wsuEnMnT0g3hv/rx5Gkv+3Wka24L3/K1TY/IA6MlkOEM8hb2PwnH2neFU4rhhMFPdHCGP/TmZ4QuiAm1H5Qwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076302; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=TIc9UfgUwKaCrlx/OZB1YgMDt8qDxahOFd4p2608LcQ=; b=IADOJfySBSauca/n/gUgcOzeHFsPwBIPxMszwcpibR147YKymz95YdGOCLWV9vIstkdDb3isBrZIVDB3dP8ec0ZQqEOU2MilmR3hVVOF6sa9ZVy+kgl0o4cAlOZ94YHMmjxaCnr+cvy2cL3QYfFQRAzjAoyqbiNu1ZbRej2IabM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076302273498.62695902135897; Wed, 6 May 2026 07:05:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcoK-00060M-HS; Wed, 06 May 2026 10:01:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcoG-0005pD-9a for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:08 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcoE-0000hY-HL for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:07 -0400 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-b93698bb57aso160381066b.0 for ; Wed, 06 May 2026 07:01:06 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960fd6sm13483447f8f.31.2026.05.06.07.01.01 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:01:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076064; x=1778680864; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TIc9UfgUwKaCrlx/OZB1YgMDt8qDxahOFd4p2608LcQ=; b=iJ5ipC81os5P9rvwF7RMsSirENFm6Xmx/dJ/QvdLskWpkoV+G86GdIkpV0lhwG7+B2 7QlE5Yjc67uz2a4cMRy/GUCQcGdACHSu9NcG6pgtLPS0/LQQTBAIx+36uz32ZYm8iNsl 2wK/alUxYn4kKE9gwiUzqkOq2bCBSQEploCn1cv42k25l2u2V21STEthEhbbkLn5FYy5 JijEyuEXb0X80/waARX8uuNEY3zojRtrUTjLQdLRJs2M0+4yFdL/1uYKoU3T4KkZNkOx f3nS/eLqVE4fYUn7UU4uq0+5fvd0FX9EpeZSlKzZArdweBFZpR5T+9DHqN0smIRB8eJf 7djw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076064; x=1778680864; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=TIc9UfgUwKaCrlx/OZB1YgMDt8qDxahOFd4p2608LcQ=; b=ksNaa9VuezrH6/lfb1jvgPG/D57UvRb4qFQU7j+nUl+hwd0i1U3O5aJis8wmDaMptT X6j9StcmddmtHJKrV0UNQ+FDWNUQsT6B5x8uV1mgL25xiwcrQPLJk+vM+IiSUgcXeEjA Fog7t4uAHUvJfWfshuG2dthEjWcBzS5pmNN3uhqkp1U0pNvwIEHxRNR9GH1AZ2b9IJjP jyCVCngYGhH1W5BNvfxvRJFTSCn+rMeqj6n0imXb0eURaxd3G+egjDfqg/X0/hD86ttn x3QbGhZ3SFy917NwmQMeZzPywBvtUYaj7Y04R0y9SRvHr4YwHU5PIPQA6qjUR6TqtA60 n+Kw== X-Gm-Message-State: AOJu0YxI5t5QZSUEfGcZ3/bAKPBHt820x3QYYu8kb4vTWnyTLzYss7J5 16xhoeUroB0Wyl+jXxmF8f89OFwzjO33e3EfbnjDUDYSEFMaIl4o04oXQEHXRiemMJTNukmegNw HH14M+dQ= X-Gm-Gg: AeBDiete7nbVhqY47iGmrRoFRytVTfvtSxNdofbi5zklHC7WaYZAReQfTEhsRHKYj9B goTwhzI9QC7vM+/2U7F/myM7mGdVBBcF8hNZIygeHRrkcWwDAQqa5t8IrbnQSJSIDRP+IjTdeTr UjOduVDDLbveX3Bbahb5xWm1AnT2Wu5WO5rbx55/uYAoT2YqXj0o+dKKN17RKgxyfhAD3CrUXkU vSt+9/OE5oTfzz2zcqwaXHbyfPQy9vcPZ7+1HA5sZDZT8XtDReN53QAegFOWmZMFeuwXa6XjoSC kge+mUhlxxJ/6HBwWLO3l14LiMuYVAbwu2pJhPLByM29cxEbALopkWVqB4lTwygRIKmII++3Pe2 eCrmeopU8/S23ivaNGnORzDK2gplDkjdLJISt2RgQ6gYAY4OYM0cVTYTPJfpZP20TLmu2W/iEB8 uZ2sxzWOcRjqFkCtnvjtxaN2QADA3K41RTsPIYHuo3Y5upMz8qnQKPak4vUDIfvIMHufB5CiqrS 3N4O+wh/JE= X-Received: by 2002:a17:907:7244:b0:bc3:a0aa:1a04 with SMTP id a640c23a62f3a-bc3cfd336camr485447966b.13.1778076063232; Wed, 06 May 2026 07:01:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 044/110] monitor: Make 'info via' a generic command Date: Wed, 6 May 2026 15:54:16 +0200 Message-ID: <20260506135524.20617-45-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=philmd@linaro.org; helo=mail-ej1-x630.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: 1778076303565158500 In order to build hmp-commands-info.hx once we need to stop using device target-specific check. Use the generic pattern to make the command available on all targets, providing a stub with kind error message when the device is not available. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-9-philmd@linaro.org> --- MAINTAINERS | 2 +- hw/misc/mos6522-stub.c | 16 ++++++++++++++++ hmp-commands-info.hx | 2 -- hw/misc/meson.build | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 hw/misc/mos6522-stub.c diff --git a/MAINTAINERS b/MAINTAINERS index f560853ea41..b05e4d2097e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1566,7 +1566,7 @@ F: hw/ppc/mac_newworld.c F: hw/pci-host/uninorth.c F: hw/pci-bridge/dec.[hc] F: hw/misc/macio/ -F: hw/misc/mos6522.c +F: hw/misc/mos6522*.c F: hw/nvram/mac_nvram.c F: hw/ppc/fw_cfg.c F: hw/input/adb* diff --git a/hw/misc/mos6522-stub.c b/hw/misc/mos6522-stub.c new file mode 100644 index 00000000000..85eb0ee36ee --- /dev/null +++ b/hw/misc/mos6522-stub.c @@ -0,0 +1,16 @@ +/* + * QEMU MOS6522 VIA stubs + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/monitor.h" +#include "monitor/hmp.h" + +void hmp_info_via(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "MOS6522 VIA is not available in this QEMU\n"); +} diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 964eed004c0..0138c7ec4e7 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -878,7 +878,6 @@ SRST Show intel SGX information. ERST =20 -#if defined(CONFIG_MOS6522) { .name =3D "via", .args_type =3D "", @@ -886,7 +885,6 @@ ERST .help =3D "show guest mos6522 VIA devices", .cmd =3D hmp_info_via, }, -#endif =20 SRST ``info via`` diff --git a/hw/misc/meson.build b/hw/misc/meson.build index cd084a19363..fa6a961ac9a 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -20,6 +20,7 @@ system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('arm= v7m_ras.c')) =20 # Mac devices system_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c')) +stub_ss.add(files('mos6522-stub.c')) system_ss.add(when: 'CONFIG_DJMEMC', if_true: files('djmemc.c')) system_ss.add(when: 'CONFIG_IOSB', if_true: files('iosb.c')) =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076742; cv=none; d=zohomail.com; s=zohoarc; b=MBAzKdM9CMEL8TwiPhIKqC1GIYQKLQUFuu0tTVsbCnAEkwkU73v6qpc8TNc1UYqIZ+Q8N0b2XM42aY3BCCtdXFhCpJRj76tTIuAtFi/c0S89V44qmxHT0jQfqUR7opYEd6s+acMVgsQSauldy8trgdNcoMpNlBQn5rZBkKxNb9c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076742; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=tiYO+phtoKsyzGu/jE8yoJf/zh/ppWFtTlS0H3YUZnQ=; b=auxBo8HwNW1sZladKd6vr63V/GGGE9CUu7ujHxhGRSuYpsyy2M8jHT6Ivah2dSIfYeBemVxHKaxd9imEr8IS9eiJoPDnnSWCB8PsVPZL4biJgrOkyDKeDO03i8XARXiuUonJDFf8d1F49pm9EDWCySsg/D08ZuQgWBa28lJz2zM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076742533621.4774097981517; Wed, 6 May 2026 07:12:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcrI-0000yc-TK; Wed, 06 May 2026 10:04:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcoN-0006G4-ON for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:17 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcoL-0000lH-QZ for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:15 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-48374014a77so76932775e9.3 for ; Wed, 06 May 2026 07:01:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e530d8691sm41423315e9.2.2026.05.06.07.01.09 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:01:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076071; x=1778680871; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tiYO+phtoKsyzGu/jE8yoJf/zh/ppWFtTlS0H3YUZnQ=; b=WFVxhlj3qcPAFe47c+CRG4Exe53p2mUBnKR5YsYB2HC1ov9EYJjENJOuOO8WRbfwdy MjvoLyt9iR/N1ciA+/F1m8Zv5sC0EoXI2KXZa63heN21ElQTUD8FSm8PqGecjpF1AWBS 4g2dfoHswHVYBpw0D8SyHfRwMqMpBdwWa5lEwdGFB2v9k7QyYp4Q+bOTVWnh3ZLK1Wew EAxMuz8ZJduTgHJ+5EF2K7KETrBtU/DEvwWnBA10gvYESRRey/WO9da0AHrPqO1syANC 7vuzGZ3KoBDXK1tQiA1iM8Vev4F82F6qQyWIXg21VYE8hrj9T44FSJ0tbdPpb0m7p9qM 3dJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076071; x=1778680871; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=tiYO+phtoKsyzGu/jE8yoJf/zh/ppWFtTlS0H3YUZnQ=; b=gMXIdFjXivdUMxy/7+JcYUUx3uplfra4bIfNxI1he9j+g+plO5IfFyLXU+AzpIYOAT O3cJvU9ywhsNYER4n0sYZwlIxm/y6t1Eoe3FTWzibCGpoWZDmeaq2O2Sk/DLht9N5FKM WU1wUnGvLHkvJD6J4VbdXZUGSIz9LEot30JFOo5uo43WFXK+2puoeNcC7q5RMo2uz5Bi GnkiYWgHzkXjC64sh/DLPoT2XNxMjT3vWlagrAvdXTMqsojmV2pw1r3SyE4rmf6n/Ayy Zvz6xZQRnEw0NFqMnfDbHNrImdwGKD1aqVt6m6op242Mgfbr+MVIW2c8cgcE/ZHlnE/e skrA== X-Gm-Message-State: AOJu0YwPhLhyyPedLtroR5qOoffSwVb5/KXloSkJWgfO+1uVvkuFnKOx n8osKCxY3q4PA8USQK2G4xTc3onlbIEHukXeqqD/1pD2hnU3qiMnRLDFfKAIWU4STC3uVYXYw9P DRfRUIEI= X-Gm-Gg: AeBDiesAbMgFij9cx0z7UsvKQ7chEHmaVaNUcJ/S7/GBD8LGDpnYaKTe0q5xeI1gvCw 5lkgql1howEG1UAnucMDmdsPsQd1kAricQ0osoztmGtgemK75sql8XKcXAZa4NFtNNb33cHYRCl QOa/iJaxxyloG1w8dhyjKxCrZjHcxIfttFMbYHVelJzUJlboSNVeo1H6loB/vdEXVb80aKDZBz8 czwGQaT3T7n6GwX6kqhqmis4n5eQ3TBknGec7EFQDKcsWn1bgtEuP0CuP8jHXdJifJWiU8xprL4 g52k8kFFhcH5h8KqWPiILP7J93mHE9gF82HAzvAgHuRxFugz64o3xCeYjEHcLZtC+VWsfebX822 Pxa0Tng6W5ziqNFVEPugmow9hm3lDLYNPPgD02/Yihe51Khv7JjbCTYOXJG9WuXzxnZh+nIXgNf FJMSvPBizrrg2OgUVwe5n+W5ZssP/IH9xeMD3YrWa+bcvd9SYXKrX6JGyVG0OC/z7swnwMmjjqO 1YWzDDA5dQ+Ar8RfPWP7g== X-Received: by 2002:a05:600c:1d18:b0:48a:5574:3a5b with SMTP id 5b1f17b1804b1-48e51f45c84mr62938635e9.27.1778076070890; Wed, 06 May 2026 07:01:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 045/110] monitor: Make Xen emulation commands generic ones Date: Wed, 6 May 2026 15:54:17 +0200 Message-ID: <20260506135524.20617-46-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1778076742925158500 In order to build hmp-commands.hx once we need to stop using device target-specific check. Use the generic pattern to make the command available on all targets, providing a stub with kind error message when the feature is not available. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Woodhouse Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-10-philmd@linaro.org> --- hw/i386/kvm/xen-stubs.c | 12 ++++++++++++ hmp-commands.hx | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/i386/kvm/xen-stubs.c b/hw/i386/kvm/xen-stubs.c index ce73119ee7a..bf6ac28bef4 100644 --- a/hw/i386/kvm/xen-stubs.c +++ b/hw/i386/kvm/xen-stubs.c @@ -12,6 +12,8 @@ #include "qemu/osdep.h" =20 #include "qapi/error.h" +#include "monitor/monitor.h" +#include "monitor/hmp.h" =20 #include "xen_evtchn.h" #include "xen_primary_console.h" @@ -37,3 +39,13 @@ void xen_primary_console_create(void) void xen_primary_console_set_be_port(uint16_t port) { } + +void hmp_xen_event_list(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "XEN emulation is not available in this QEMU\n"); +} + +void hmp_xen_event_inject(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "XEN emulation is not available in this QEMU\n"); +} diff --git a/hmp-commands.hx b/hmp-commands.hx index b806ec5635c..dd6243bf2da 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1843,7 +1843,6 @@ SRST ERST #endif =20 -#if defined(CONFIG_XEN_EMU) { .name =3D "xen-event-inject", .args_type =3D "port:i", @@ -1870,7 +1869,6 @@ SRST ``xen-event-list`` List event channels in the guest ERST -#endif =20 HXCOMM *** MUST BE LAST ENTRY ** { --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076181; cv=none; d=zohomail.com; s=zohoarc; b=fAeAXssx7sArqtSEXMX7FfeTnEXHkjjXLukVsODhVNDPQzjJaP0Z1/dsIYPnmgyCDK9YHuCOnj12cFVypNVrlQl56OfM3Nr5vsrCxVs/gaC5nxed5C63GuY/h4BGum//Hm8kvdASmFRxyzKk1SEmM3/9m5GFEDHhZG0plViiipk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076181; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=b9z/R1UZ+seu1cNfJAMd4B4iA/6hNLkGQbEviHCyG7c=; b=DCgqD5TKv2Rg0KZoQPFOqlAOXMTO75gSW7Ag1Y2hHXMiAEL6D1+67xo4r7R9U5VuvOXBclMySjlqmXVV0btX0LbfYhu9fi0qbSYvvSLlYjatRGwO9JoP1WaNiTxvf05bc5huFgGede6zGLDWWwRCavf2zAtiN6R8AQXv9uTpENg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076181406834.089047830662; Wed, 6 May 2026 07:03:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcpQ-00077J-SK; Wed, 06 May 2026 10:02:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcoX-0006Sm-Ga for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:31 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcoV-0000nT-PD for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:25 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-48909558b3aso71289185e9.0 for ; Wed, 06 May 2026 07:01:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538a50d0sm83503015e9.5.2026.05.06.07.01.16 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:01:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076081; x=1778680881; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=b9z/R1UZ+seu1cNfJAMd4B4iA/6hNLkGQbEviHCyG7c=; b=d3G+L/YA/IGYBBDoIezhr3YmGUkV/A6rfTBFgAVFGhaPARrJHwiBaIgtfEb2Z28FnN 5ta97iW19/D0vgHdfhn8AMbuxxfUxdgpBM+snNlidk3+TlVl1pnLw54AS2nrn5uuHFci xdIpi8v6Cg+pfiy0VJsUOc50TcNvKsNYsiS+EjrK8zAKJ4zDG0DRAOVGO1iHj/ldHx01 P6quLugHZppWOpRmM6UECgyOKB4Iwmk5PeDUhIBcjD++QQcPndG7a6Kw93Z9d1bk59rl 4gyKkPG5Ms1FBJU+YgCg3EME5qmVuk73UU1KSA9fZRvgms8OEr+PTCoN8KdM1rInoeZw +BXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076081; x=1778680881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=b9z/R1UZ+seu1cNfJAMd4B4iA/6hNLkGQbEviHCyG7c=; b=WWGEY+i1480/+oKyzmdmGISFLCWsrO0gl3INL4BmU9vDd/r7LvqrOu/73Bn5C0lO5A cmj+oseGx/eNFg22Fv0JuhcenYmb+7sfQsIiTe1nMzk8lsa4hAJJqPaH85eIfctbaDvJ g+s9fV6/vWrT4N2YwhwyWUIIgvegzVKAzkmj3M/BNZBBkmTKuaOWrk0GSB9ngXU/sx01 r6bSargHhHV9m6eMuJGqfQ9nWCa0Wc18L+upv2mu6dGiTw+vVn1kOmoc1e2GNClgun8k z8fYLDq8BgCptu3eFUXBWkrWs8BdWRJu6Ucoow/I0ukheu1MxEy5VI6T7VoKR5l0g5DC W2XQ== X-Gm-Message-State: AOJu0YwjqZY3jtSskaaTj1T9feCRIAGdOGEtWOQkFZFAg8CXr1wQxgH9 kHhd+NT9z4rz08MHPH8+9TQUFDekeNk58JEE85ItmX3nXV+AC4raLnrs/FHRnTrAPegQtu3yzJx XHIKGQ4c= X-Gm-Gg: AeBDiesZxqbq2x5yVwhgvEZ/oGzZf4kpKs0Fd++Nf16DULHBdzQRAm9W/nabj/Fcrni pSVF6h+fxor3d3DobgNaWP/OA5YGdwcGAxutaCFoDFvew5NZPukVDw0SsfIR40RAFPaoANSXmg5 cXIwVE9P9krisPx+FVtCBtCLs4bywQdfIcML08FOBODeW6x0bFOrPbbLBoHNZ0pKKT0BklDfMqG 2tfTK3EDQTIzkw2sGrxmPTwiFCg+vHZ7tDeMgMfXagU4f7HuMeZ4Qge+YejUmSyD4C/p8+bPEUf EQCzBV4KF/nMEVeUo13qfNLUtqgZkb+Sk09FpffXYUVtWGkCTmqw64uq8Y1FkPiq5GuCoxZLnBH nczc/KGvAQuze9a3B53kp3M0hwJJT9JzI6BibzuZZXW8DGMKlSBSLjUxHUmFvcppFVEwFgT0bj7 q+t/Uxnwas3/z3nFRA7zBGtoMNF+LFaVNWmsUkZWNE9QqxurYRWd5acy0PByf8A1WCGOlpapSiZ MPIwUwSuiU= X-Received: by 2002:a05:600c:c094:b0:487:5c0:671f with SMTP id 5b1f17b1804b1-48e51e1a7c4mr45904155e9.9.1778076079482; Wed, 06 May 2026 07:01:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 046/110] system: Expose 'arch_init.h' as 'qemu/base-arch-defs.h' Date: Wed, 6 May 2026 15:54:18 +0200 Message-ID: <20260506135524.20617-47-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1778076183670154100 We already have a file unit outside of the local system' folder which include "system/arch_init.h". We want more files to use it, so make it official it is a generic header by moving it under include. Rename as "qemu/base-arch-defs.h" which is more descriptive. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-11-philmd@linaro.org> --- system/arch_init.h =3D> include/qemu/base-arch-defs.h | 10 ++++++++-- hw/pci/pci.c | 2 +- system/arch_init.c | 2 +- system/qdev-monitor.c | 2 +- system/vl.c | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) rename system/arch_init.h =3D> include/qemu/base-arch-defs.h (92%) diff --git a/system/arch_init.h b/include/qemu/base-arch-defs.h similarity index 92% rename from system/arch_init.h rename to include/qemu/base-arch-defs.h index 0c2b1f3a5d0..f33465738c9 100644 --- a/system/arch_init.h +++ b/include/qemu/base-arch-defs.h @@ -1,5 +1,11 @@ -#ifndef QEMU_ARCH_INIT_H -#define QEMU_ARCH_INIT_H +/* + * QEMU base architecture bit definitions + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef QEMU_BASE_ARCH_DEFS_H +#define QEMU_BASE_ARCH_DEFS_H =20 #include "qapi/qapi-types-machine.h" =20 diff --git a/hw/pci/pci.c b/hw/pci/pci.c index a0dbb81fd90..4298adf5a0a 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -36,7 +36,7 @@ #include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "net/net.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "system/numa.h" #include "system/runstate.h" #include "system/system.h" diff --git a/system/arch_init.c b/system/arch_init.c index 604d5909ed0..1ad2f3d6f78 100644 --- a/system/arch_init.c +++ b/system/arch_init.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "qemu/bitops.h" #include "qemu/target-info-qapi.h" =20 diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index e90eb6247ea..e5b55e3004c 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -23,7 +23,7 @@ #include "monitor/hmp-completion.h" #include "monitor/monitor.h" #include "monitor/qdev.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "system/runstate.h" #include "qapi/error.h" #include "qapi/qapi-commands-qdev.h" diff --git a/system/vl.c b/system/vl.c index 516ed7890b4..705f0d3a4a9 100644 --- a/system/vl.c +++ b/system/vl.c @@ -112,7 +112,7 @@ #include "trace/control.h" #include "qemu/plugin.h" #include "qemu/queue.h" -#include "system/arch_init.h" +#include "qemu/base-arch-defs.h" #include "system/confidential-guest-support.h" =20 #include "ui/qemu-spice.h" --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076307; cv=none; d=zohomail.com; s=zohoarc; b=TvBluLtTMmA/avA3JvaQfEQFDVJRdnVnljwaoxFS5+cNXc5s9H+t6yfDjd4v5xeLHS7yVF5t+Dbq9/+rnA0ssu89NmDTs69bNDRt8EspNKRGK9MMeko0I8jgwqHWm7Y+FEcPU+btEIE5tdlTcqE7PVfc5it8CyweQLNR6bkI3LE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076307; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=FHDbajhituef8JDq8mnAuwhyeEDKI5Fzp0m93s4KOg8=; b=XIMQJJcfmc8MKlVnD4i05jgE4tiImCg2JJqCXvZKS6rop+2QE74QfbrFeB/bcJ2u2ojh+NWDxP1cXEr1jnxdStoXm2DcHGQbFOraShOv3YVq/5VQcBuLN/m+5R+hpKs3RMs3xDuhpdlDWp5DvnoyfzIETzcCigDNRjNAZt/AGJc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076307972765.3942695071056; Wed, 6 May 2026 07:05:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcq5-0007bd-FX; Wed, 06 May 2026 10:03:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcoe-0006VQ-VS for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:35 -0400 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 1wKcod-0000oF-Cm for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:32 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4893940bb5eso36263065e9.3 for ; Wed, 06 May 2026 07:01:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538fb19csm46938855e9.11.2026.05.06.07.01.25 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:01:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076088; x=1778680888; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FHDbajhituef8JDq8mnAuwhyeEDKI5Fzp0m93s4KOg8=; b=sChIyPzCqdfal/ux5P73obcet1rPAY9WygrMzpKjHLFFomxiJxUaoOmBS2VSatx3iB YfWSO5MpMZ2x2j26CLDzosQoSGtk60HmYApTQhIFurZcLCQBXU1QER3fKU6VZsjX5UmX tfYbz2sihXO6Gt5yLdLtwnEsM7x/g5L0slAWimcvc+e3QVVrDCkrbkuk6BZPjJdXwEC8 GabWT5iHTPKJXM2kDadvLPrHJx3WoZXuHARvUghTm7dc/a9Lp+NbOQmXJJzZfbFBpphu DssqAv4R14A4VjsGrut+aaSGoRp7aw1plFX/JykKiM7ujhdrhlJNElpklqpIAgVGkskf RLRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076088; x=1778680888; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=FHDbajhituef8JDq8mnAuwhyeEDKI5Fzp0m93s4KOg8=; b=iR7y4pLbSbziOHXLTNivaM5xxj+YfR8K1apzM2GYcIbTTa0EYbc4ac1MQWfTCV/9BR BXg3CWiTbtuTcSyEpj0eco1RLx+w0bm4sCGBYZqmFq3cJKAmqVQ9Wk2h5qG+PZUKHUEU uYSzJe6IcckXbYJc0DddaB98j0HBNJyMc8twsnjiHtxZVX0khLixx3aR9xA/M5tIhHAD a6nehtsc8pjtcVFyKq+kLN8bv+B3C3iZqRdIFCxscpPZQi9WKAx6T/K4Cuv/F5MAbuiD 6l3F/Z5M6uqHovop8bnwqDQ3QJWO+3Fe/T+MiuOhoDMdSNyIfkHTXmfEpj5ZLE+KpX+X t+qw== X-Gm-Message-State: AOJu0YwkpcMq98X5DI+cWmtwl0P2MqisosFNym/wVvXUe58JphbgcG1k MAZ9kae3PbheRVRwwW7lD+Yy+UUsSnao9fWJjzrlBaiAKBvHIroBMaOiJd0pC3aKwv9ctZJ8Pnm ckJMoi+Q= X-Gm-Gg: AeBDies53WaJ3Li26kQ/1xRLaJXEbQT67p0lV+U8Jk868kYYrdtw0zHQ0RceiR/sPQ0 Nj0kY2i/7YBbgL8LsWuo6IFfC3PwH27JZ6sM08v7N7a88Ktova0Oh3F97pPRqCzNHtPY1ErORwO XEJty/0MvXEQtmUdrkk7rg7/v2q8HLM+vKNs91LPX/W7e+XEcSLIVP3qDYGwXTtXmWd02SiLtyi SfTdsAJd/dSQXRH2fhfF3KRv51Bz6Gg+18NrnYV0yAfFE6DSHmegBDlyzj36+Q31DMRo8ajpTN0 4+oBQMEUvVGmHNvYpwmv+wtLeTS7SylHPF0ZzYpjBFzHE4cWS9N3jrtKEpOMDW3uahBMWDQ7xX5 Bt8tZZ/HnsWvcXlDCOVfLCeLO4cn1n+Rr4c4hm3iq6IxG4Nr/vD139g0YVuDggMcA30HjhVN8Pw /ow3QMIn8kwnUisHB+I+hevD7Epv0f7xX8DQGRZRH4MKBQGWH43K/VGyjNu8mddZqqA4/GkMAL/ ir14vSvLjs= X-Received: by 2002:a05:600c:4448:b0:48e:526e:1040 with SMTP id 5b1f17b1804b1-48e526e1226mr56998455e9.23.1778076087895; Wed, 06 May 2026 07:01:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 047/110] monitor: Introduce HMPCommand::arch_bitmask field Date: Wed, 6 May 2026 15:54:19 +0200 Message-ID: <20260506135524.20617-48-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076309652158500 Add the @arch_bitmask field to the HMPCommand structure, allowing to restrict a command to a set of target architectures (represented by the QEMU_ARCH_* enum constants). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-12-philmd@linaro.org> --- monitor/monitor-internal.h | 11 ++++++++++- monitor/hmp-target.c | 1 + monitor/hmp.c | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index 80b4a8150bf..eaf9a607783 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -82,7 +82,6 @@ typedef struct HMPCommand { * the formatted text. */ HumanReadableText *(*cmd_info_hrt)(Error **errp); - bool coroutine; /* * @sub_table is a list of 2nd level of commands. If it does not exist, * cmd should be used. If it exists, sub_table[?].cmd should be @@ -90,6 +89,16 @@ typedef struct HMPCommand { */ struct HMPCommand *sub_table; void (*command_completion)(ReadLineState *rs, int nb_args, const char = *str); + + /* Keep non-pointer data at the end to minimize holes. */ + + /** + * @arch_bitmask: bitmask of QEMU_ARCH_* constants + * Allow to restrict the command for a particular set of + * target architectures. + */ + uint32_t arch_bitmask; + bool coroutine; } HMPCommand; =20 struct Monitor { diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index da7dd7f31f2..f6dce326cf5 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/base-arch-defs.h" #include "monitor-internal.h" #include "monitor/qdev.h" #include "net/slirp.h" diff --git a/monitor/hmp.c b/monitor/hmp.c index 0e5913fabb1..e881c26c305 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -36,6 +36,7 @@ #include "qemu/cutils.h" #include "qemu/log.h" #include "qemu/option.h" +#include "qemu/base-arch-defs.h" #include "qemu/target-info.h" #include "qemu/units.h" #include "exec/gdbstub.h" @@ -219,6 +220,9 @@ static bool cmd_can_preconfig(const HMPCommand *cmd) =20 static bool cmd_available(const HMPCommand *cmd) { + if (cmd->arch_bitmask && !qemu_arch_available(cmd->arch_bitmask)) { + return false; + } return phase_check(PHASE_MACHINE_READY) || cmd_can_preconfig(cmd); } =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076194; cv=none; d=zohomail.com; s=zohoarc; b=JiA7PkmNl3waOmsLzMQj1F0uqS0hodSVt+ad5Vu2OobQQnXYs0+obKEoFGXt/3SPAipYaRYHmMKXR0bXIHAzh/XGxnAUueESC6AShHueFUutovASGgvqCeHe1udglmr49X/kA5KZjldmBNRdQ4rtC5MVWqhffYDsU1BCr4Lqguw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076194; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=cUjSLdSoIrDBQplroB02h7z26WmhahkmttyxJ4BZ4Qw=; b=KdBTGibQ5UrlXVwD9DPYAdHdYqgLD16SWSt6n8BBXmCbfrZX8Xa03qRJc1dUnYhVLxCpBAaOMF7t4wUnVjH1CYeSL8/lZuQPrrrhHze5glwG/8W1xY4Df3Lt6dKGaaGoJp2F8pS/VwhKWalgoJOsJOm24L5S6VptuwrwcTNBEc0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076194560770.851943063351; Wed, 6 May 2026 07:03:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcp2-0006jx-IA; Wed, 06 May 2026 10:01:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcom-0006Zg-Tg for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:45 -0400 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 1wKcol-0000on-AH for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:40 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4891f625344so10810725e9.0 for ; Wed, 06 May 2026 07:01:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53142ce6sm17602855e9.28.2026.05.06.07.01.34 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:01:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076097; x=1778680897; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cUjSLdSoIrDBQplroB02h7z26WmhahkmttyxJ4BZ4Qw=; b=DlhHE48H8fosb68RSn4io2pvYNux0JbY0fi4RUt3GM9j01sZLb4D7mAyrn9G6ezpm7 rumIcQP4An970gnFVC9A8Pq5JbC021A5OujpNfG8FRAlCCfKiq9aFprletATMPOi42e+ DBs0SHZXKuNRXkdqJUwmPALahA5BS+68yC8n850UmwVMS08CYv9o+nNu2eoer3Biy2iu PVFZkgNbLHyBxkq+3LC1p7M2OIqrzGvQh9eWbrDMpldplSQqKpzucYkcYbUcSUCpdDws PI/gQZjzhDc2hlOYLAMGvJxGifzuyC9DdKMeu4LGG+HbueZ2O5d20BmSgOPZw+N54BHi p4KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076097; x=1778680897; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=cUjSLdSoIrDBQplroB02h7z26WmhahkmttyxJ4BZ4Qw=; b=kK8zV0Y/xBpqE+miQcDJSiTPOeGTXza4MaWFNigGdl16Am1ut4QxtOK2QslX87FbKt zXCTd4xRbad7l67UG2ClB3v7453x+7gJv53/1do5yeFIE2ju6eGrEOI0GJZkpLYEQZ01 h7GdWZlpbzYZqRy5XoQTgR0laQsmy3UESMm0S+dWAD4V6JT7utXW1MDxu4Nu5Nk9wjqL X3W/DwsjwkUpZvCfYMkWcXEuFDTMNWeMDjrREVdjaS1FztiH6ErXuTTjJI7/acGoUwpy /lfuCD9aIOe6WOhsD0K32AHiVaAGTeiLGhgGAdp6wk2bX8eYSI0vZWx+2fozr0+IKwTQ 0UwQ== X-Gm-Message-State: AOJu0YyDHuSOjVCxJE2dPOaAj5JRUstkPdb1FiNeGcrTLpR/Vl2LiylW jM+uNJPKy+SKDVacl64g5G9NgHYhD8hFvF/zI2lrWlYaKHrbFb5z+9nDBDvZ19167SPjbw/kcmI ZnbrPdbk= X-Gm-Gg: AeBDietUpOo1/CM6uay1evCr+q7Sij901YYg7AbMU9fDWn7qjxS/6RCGID1iYrmgzNf 1zgyE136LyzkvCTl9f/kbAMWEiWLQq0kzPcGf/654tfCegiQR7SbvcEXflbSlS+bKcBOkmXHgEo 4mW5vIegwf3cNqG0vutMnA5XvpMRPK+zn19XFC80vDuQwZohpgziNKyQSDhXNJAuv4L7jqlf95Z 2hVXGJd66gHGVTj5pr3I9YgwQzO4f3GszVUm+Ur9Efi5wipEP730YH1VORiTneXaVmNKzSHW2s+ G483gDwoQbqtruyDHMdx0HQJB2Vp1HIJFJJjdUcaQ6q846RKQpXA/mv+P8ir3F1K5hhl2zXCC3b zysEBSpJLJFcYzit7izYGVcfyf6aUQmWzkTVwvJ5Wgc3Eq3COPj3onDQICndEUccnEf3FQcFgBK ppNpeT9XlTnyF0ExahSxtpYJeHoJNB43lGwz7Fm/nVsinUex2kBt27KRebfqdO5J6VU0T9ZB7We wIFYQL+wZ0= X-Received: by 2002:a05:600c:821a:b0:48a:79d8:a8d6 with SMTP id 5b1f17b1804b1-48e52286b5dmr49524805e9.7.1778076096465; Wed, 06 May 2026 07:01:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 048/110] hw/s390x: Reduce 'monitor/monitor.h' inclusions Date: Wed, 6 May 2026 15:54:20 +0200 Message-ID: <20260506135524.20617-49-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076196662158500 We want to make the HMP commands available for all targets, move the declarations to "monitor/hmp.h" where all other are, and only include the monitor headers in the source files. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Cornelia Huck Reviewed-by: Eric Farman Message-Id: <20260427080738.77138-13-philmd@linaro.org> --- include/hw/s390x/storage-attributes.h | 4 ---- include/hw/s390x/storage-keys.h | 3 --- include/monitor/hmp.h | 5 +++++ hw/s390x/s390-skeys.c | 2 ++ hw/s390x/s390-stattrib.c | 2 ++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/hw/s390x/storage-attributes.h b/include/hw/s390x/stora= ge-attributes.h index 66716a97c05..0305873b019 100644 --- a/include/hw/s390x/storage-attributes.h +++ b/include/hw/s390x/storage-attributes.h @@ -13,7 +13,6 @@ #define S390_STORAGE_ATTRIBUTES_H =20 #include "hw/core/qdev.h" -#include "monitor/monitor.h" #include "qom/object.h" =20 #define TYPE_S390_STATTRIB "s390-storage_attributes" @@ -72,7 +71,4 @@ static inline Object *kvm_s390_stattrib_create(void) } #endif =20 -void hmp_info_cmma(Monitor *mon, const QDict *qdict); -void hmp_migrationmode(Monitor *mon, const QDict *qdict); - #endif /* S390_STORAGE_ATTRIBUTES_H */ diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-key= s.h index 2d02936c31c..666c05e2996 100644 --- a/include/hw/s390x/storage-keys.h +++ b/include/hw/s390x/storage-keys.h @@ -13,7 +13,6 @@ #define S390_STORAGE_KEYS_H =20 #include "hw/core/qdev.h" -#include "monitor/monitor.h" #include "qom/object.h" =20 #define TYPE_S390_SKEYS "s390-skeys" @@ -123,8 +122,6 @@ int s390_skeys_set(S390SKeysState *ks, uint64_t start_g= fn, S390SKeysState *s390_get_skeys_device(void); =20 void s390_qmp_dump_skeys(const char *filename, Error **errp); -void hmp_dump_skeys(Monitor *mon, const QDict *qdict); -void hmp_info_skeys(Monitor *mon, const QDict *qdict); =20 #define TYPE_DUMP_SKEYS_INTERFACE "dump-skeys-interface" =20 diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 27ce1c303f4..3ba17008255 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -174,4 +174,9 @@ void hmp_gva2gpa(Monitor *mon, const QDict *qdict); void hmp_gpa2hva(Monitor *mon, const QDict *qdict); void hmp_gpa2hpa(Monitor *mon, const QDict *qdict); =20 +void hmp_dump_skeys(Monitor *mon, const QDict *qdict); +void hmp_info_skeys(Monitor *mon, const QDict *qdict); +void hmp_info_cmma(Monitor *mon, const QDict *qdict); +void hmp_migrationmode(Monitor *mon, const QDict *qdict); + #endif diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index d974d97b5e7..7dca67d6618 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -24,6 +24,8 @@ #include "system/kvm.h" #include "migration/qemu-file-types.h" #include "migration/register.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" #include "trace.h" =20 #define S390_SKEYS_BUFFER_SIZE (128 * KiB) /* Room for 128k storage keys = */ diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index 2e83aa211cd..74b23b0a995 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -15,6 +15,8 @@ #include "system/ram_addr.h" #include "migration/qemu-file.h" #include "migration/register.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" #include "hw/core/qdev-properties.h" #include "hw/s390x/storage-attributes.h" #include "qemu/error-report.h" --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076310; cv=none; d=zohomail.com; s=zohoarc; b=caFKAV4yOlxDYSNwrg+Ld6ztF0xqNjEkrnpMBpMohSapVkBnT9eT9skcCjkI0EjIIv4p2O+adjV82U6qGWXL2KwBOxDQmR3cUKX/aDTl7d4xoqp5GHuNrUTNDqpCCqkX2x+Dn3JabKOArZ7WZCN46yjv0ed9K57yJoxbqjtk/pE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076310; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Sl8U+jIyL1fkwOEzNfG5NMotGUs+7jdu5vaCYnmkv1o=; b=koU0V2NHWsNdTnbN7mhu1GZJ8PKcgD9SFpzdW8BFeKggJXlDPzHMVlPiFpNv9lLryjv0k2Tnsf2RRaZG4ZfdkyCCen9IocpelG4UUSn4jhY9zIA0Tf5Ssbb187W+yx0ZA7He2foKDf/3AIMf/SvFSo5pOIbB4BT/JIGkbOsrz0Q= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076310528223.87399676478617; Wed, 6 May 2026 07:05:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcqZ-0008EF-O9; Wed, 06 May 2026 10:03:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcov-0006f7-J3 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:51 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcot-0000px-MB for qemu-devel@nongnu.org; Wed, 06 May 2026 10:01:49 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-44a5174670eso2915567f8f.1 for ; Wed, 06 May 2026 07:01:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960aa2sm12316026f8f.29.2026.05.06.07.01.42 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:01:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076105; x=1778680905; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Sl8U+jIyL1fkwOEzNfG5NMotGUs+7jdu5vaCYnmkv1o=; b=sKs/wZ8DCJMLpS+qUJhHJULZWT8QV9rsEbgAK99llILB7qTvtInGfb2R0PO1G1ML3N Ysj+j/SIC8wiH0+J7QNTMoTpbJIYNzile1AhLRqJ8sclKc8CVAS6tDiK6nWFfBGHBb1b /PUVY9ahn3R+kW/hhJczFSJQa4mMkkkbxlAkBuA4WeRKZdVHp9TDyz44aydPaa8NHcy3 zBjrPwzYNY+GZKw8juhk3WtNpo+vzxSIlm4PONF+6fdLOP6eM/p8xf0FIKx68KlZDzpf T7uwVt3O5I0ipEwrrU9NlAFtF4je6iKm9oN0hxZM9f8Aao5YSxR6SzTG6dOZvf1Lgy0b 3aVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076105; x=1778680905; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Sl8U+jIyL1fkwOEzNfG5NMotGUs+7jdu5vaCYnmkv1o=; b=bdqV694m5n9hUeHfdGJFSDQUIFJI7SKXrGJaua5hEAdwCbdf7ah6qyDwup9Sk3cljY hrx61T3DWSqENbRo7Gt2sUR+duhOIsVRXqTSG3ALg/jxPEnzlA2oDhLDWN7VoHwWe93m LpGjFZ5BxuRL03elXktwQzdg41WLsVwPpjJ1xRAJXuGOAut3HDZYkSWlpAOAV6EVHfor BX+N5OMYVCxDDWFB/LlvkTKA6vFoxtUwlQFY/Pjrpy9PMYKrye5XufWXtJUGopb1MWk5 U534rIN+ldAC3WUwBcxs33l3w+QvBIsOJcDR9qkxFtOeP6x/IBISVN5jYwFtKQIqUNC0 P2sw== X-Gm-Message-State: AOJu0YxqKoZvRL19KNbnvZrRBO2fXDVRkF47GGnHqC5Cmi+hj2zsF6mb /OQiyaauOLS/aNzyUxovaj34WpP91hnucMO8ZBg7dGxUCrQjxe4Ok/D4MLyRCYOIPKemD7hChge mHx+7GHc= X-Gm-Gg: AeBDietdJ8iOg4QJAG0MqrK9jK6Gle5GpgxSZ3jh9T9o4qh+J1/hHjzYk4r74AhfnsA 9ebn7M8/I7CJPL/K8r5bFWMtr6DCnlERoz+SfM8k4c2K+8lVpvIfKynix7PEAFB4TVyb9Nqq8i8 tToO1B+NSY+zjeZID+/AIqPrAmFai//OPbq0HWfnXWvxrY28wIInuM6Gj2Ao7Y0deAfwri4ynrY WB3IKlW6LSVKd3ESSxaQpwWioH6pN+e46ckSCl3EdjRv3zy0jocnIqt23PJQVSPvLFFxPM6X99b tiypN6z2VUMXJ2qIqKolHkC1NDnQmK6qa6YvjXhgfAsmShZ8Ufki8rm7TH7NKdNfBV3MdD1AYCV BT1STHU02ERKV1SOKxXdABnirtfqL/MQlEYKNTGeQ5F/9gKE2MnqmmJEiLDE/FA92hms80tMYQK cW1ZL4E03MewFoNbSgyKXY3qhS16N6Xo52FmgBU9KzWbrVw/jxwqLzJshzajuj5PDaR8NmIgm6d unaE53OTH0= X-Received: by 2002:a05:6000:2c05:b0:44a:a729:9f51 with SMTP id ffacd0b85a97d-4515b056af4mr6001485f8f.3.1778076104405; Wed, 06 May 2026 07:01:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 049/110] monitor: Do not check TARGET_S390X to build s390x commands Date: Wed, 6 May 2026 15:54:21 +0200 Message-ID: <20260506135524.20617-50-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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: 1778076311991154100 These commands are filtered at build-time for s390x binary. By using the recently introduced HMPCommand::arch_bitmask flag we can filter them at runtime, making it possible to compile hmp-commands[-info].hx files once. Since the methods are used inconditionally within hw/s390x/, define them in the same stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Cornelia Huck Reviewed-by: Eric Farman Message-Id: <20260427080738.77138-14-philmd@linaro.org> --- MAINTAINERS | 1 + include/monitor/hmp.h | 7 +++++++ monitor/hmp-target.c | 5 ----- stubs/hmp-cmds-hw-s390x.c | 15 +++++++++++++++ hmp-commands-info.hx | 6 ++---- hmp-commands.hx | 6 ++---- stubs/meson.build | 1 + 7 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 stubs/hmp-cmds-hw-s390x.c diff --git a/MAINTAINERS b/MAINTAINERS index b05e4d2097e..c57a01131c4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -122,6 +122,7 @@ F: include/hw/watchdog/wdt_diag288.h F: pc-bios/s390-ccw/ F: pc-bios/s390-ccw.img F: stubs/qmp-cpu-s390x.c +F: stubs/hmp-cmds-hw-s390x.c F: target/s390x/ F: docs/system/target-s390x.rst F: docs/system/s390x/ diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 3ba17008255..930ffa31aba 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -16,6 +16,13 @@ =20 #include "qemu/readline.h" #include "qapi/qapi-types-common.h" +#include "monitor/monitor.h" + +#define HMP_STUB(cmd) \ + void hmp_##cmd(Monitor *mon, const QDict *qdict) \ + { \ + g_assert_not_reached(); \ + } =20 bool hmp_handle_error(Monitor *mon, Error *err); void hmp_help_cmd(Monitor *mon, const char *name); diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index f6dce326cf5..a222fd4c96a 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -36,11 +36,6 @@ #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-machine.h" =20 -#if defined(TARGET_S390X) -#include "hw/s390x/storage-keys.h" -#include "hw/s390x/storage-attributes.h" -#endif - /* Make devices configuration available for use in hmp-commands*.hx templa= tes */ #include CONFIG_DEVICES =20 diff --git a/stubs/hmp-cmds-hw-s390x.c b/stubs/hmp-cmds-hw-s390x.c new file mode 100644 index 00000000000..2b4f4cac79f --- /dev/null +++ b/stubs/hmp-cmds-hw-s390x.c @@ -0,0 +1,15 @@ +/* + * Human Monitor hw/s390x stubs + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" + +HMP_STUB(dump_skeys) +HMP_STUB(info_cmma) +HMP_STUB(info_skeys) +HMP_STUB(migrationmode) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 0138c7ec4e7..b1e2bf3c059 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -710,30 +710,28 @@ SRST Show rocker OF-DPA groups. ERST =20 -#if defined(TARGET_S390X) { .name =3D "skeys", .args_type =3D "addr:l", .params =3D "address", .help =3D "Display the value of a storage key", .cmd =3D hmp_info_skeys, + .arch_bitmask =3D QEMU_ARCH_S390X, }, -#endif =20 SRST ``info skeys`` *address* Display the value of a storage key (s390 only) ERST =20 -#if defined(TARGET_S390X) { .name =3D "cmma", .args_type =3D "addr:l,count:l?", .params =3D "address [count]", .help =3D "Display the values of the CMMA storage attributes= for a range of pages", .cmd =3D hmp_info_cmma, + .arch_bitmask =3D QEMU_ARCH_S390X, }, -#endif =20 SRST ``info cmma`` *address* diff --git a/hmp-commands.hx b/hmp-commands.hx index dd6243bf2da..b41f44f5ad4 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1139,30 +1139,28 @@ SRST =20 ERST =20 -#if defined(TARGET_S390X) { .name =3D "dump-skeys", .args_type =3D "filename:F", .params =3D "", .help =3D "Save guest storage keys into file 'filename'.\n", .cmd =3D hmp_dump_skeys, + .arch_bitmask =3D QEMU_ARCH_S390X, }, -#endif =20 SRST ``dump-skeys`` *filename* Save guest storage keys to a file. ERST =20 -#if defined(TARGET_S390X) { .name =3D "migration_mode", .args_type =3D "mode:i", .params =3D "mode", .help =3D "Enables or disables migration mode\n", .cmd =3D hmp_migrationmode, + .arch_bitmask =3D QEMU_ARCH_S390X, }, -#endif =20 SRST ``migration_mode`` *mode* diff --git a/stubs/meson.build b/stubs/meson.build index af4051e6c5e..99a89c00066 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -87,6 +87,7 @@ if have_system stub_ss.add(files('qmp-cpu.c')) stub_ss.add(files('qmp-cpu-s390x.c')) stub_ss.add(files('qmp-cpu-s390x-kvm.c')) + stub_ss.add(files('hmp-cmds-hw-s390x.c')) endif =20 if have_system or have_user --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076491; cv=none; d=zohomail.com; s=zohoarc; b=ZlwiUBL8OUFv8G9p4/hWzBwWpwo8nVZ5FGxFwnDp1A3B72xTG/1dYh3qvjJlGHXZetArW7/WlgLzBeGbhJbZt8LcUcSxmcfpLp1zMWAqdcNgeFQ7Izj7+N9Fx7yLRpn4+6TYsXlfGiKxudK5j34dangNHK7nQaYhUNqJ22uRzCU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076491; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=7fgSwGJ7wTlpU7DVYblOuyxY/0XBFQuA41SqLkoPpK4=; b=IUF4GK9h2obwYxbmKdxuHlNJV/8WMVFZPcSiFPNC6mManrbL3xHMCGBrBpz1Jccpiwow7VBrelKKZz1ljoVE1fdBtnOB9noOV2DaxczuUmmUlLYXY14uDAgimwjF9RxWaboBJUKa/1JEIKt1jKmUZLL0zfOgvTFq7l5GPO7JBBQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076491155737.1403708309743; Wed, 6 May 2026 07:08:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcph-0007JE-VM; Wed, 06 May 2026 10:02:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcp6-0006sr-Kz for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:02 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcp4-0000rL-Tl for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:00 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-bc177ebda91so661750366b.3 for ; Wed, 06 May 2026 07:01:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45054b02f76sm12361742f8f.23.2026.05.06.07.01.50 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:01:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076116; x=1778680916; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7fgSwGJ7wTlpU7DVYblOuyxY/0XBFQuA41SqLkoPpK4=; b=yIPuOX/JmD0EXBnZSshvr3ED9EHyyOb15iJDvqIPOp3MZr4N0rBIHZaYvQ0tE5F+nS +8oDR60ILZDP/X7lMY0Q2TronFRn2dvb/rvCs3kpM+dE3GItL7oz1n1004S0Pz3K9qYL bcDcyGtTNYab9cdKnbamVBh2UAbrvcK+F9XskGDgruM6DP6xCA+Tf1D6cT97pr8VCviQ B7RnPzUJ+AFvT/CDSBGIXnuPIpupGeIQT7jHGm1Z2PHJE59qwbyecj++FLnWbNFuP8EI dMWIwB7fDfzCcOR6MPRQVtSxqIdTQN62fKwzQC14K4ednn2bCLYYJIcJ+Ff8n2RzBeta USVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076116; x=1778680916; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=7fgSwGJ7wTlpU7DVYblOuyxY/0XBFQuA41SqLkoPpK4=; b=pYlInoy6FDOUGUidwMhd7nwyXvN7iv07zgBmC4pAxWnMY3vh2UODwMHo/BQKF8Qr/L z+mXsM9BcvS5kt2hc6qNlhAyRjxSnngEDpZg2EuxapTBMLAZrwLLECd543Dl6kaGIB6q Sh0Ie70o9FYB3uDsdMAssGj9vprQzRCDNokqLKCxe50H3bsz2yOmMcoecYLNgyPD3Lwh e0cRU2lfONifymFbFqTudqLg7CSj0xwNsl/sBofioxaTy+NX0UAQNeXVGRteR79Lt1+p IiVe9bP1MHyIhEe5vfzqTGD+sepMyqF2+zXUbs/dS762cD7kRZpzi5GNUoq+KS2RwaS2 u9Xg== X-Gm-Message-State: AOJu0Yz49Jha+cIXPSACXHbyQT/8BP08LjBqbbym11afE68hzUVreJ0t ahZ0VTvsUdk/AIF0JVr0MmfM580IXRQsPXJCwQhEImL+ytFiKvSNV1tvQXFXuHh6Ocsf3a7uGCi 9Deql7so= X-Gm-Gg: AeBDiev9eBWt94sWnm6vzDrflGzUUU0Z4qC8lq6zkUM5Z5VvtG9qByi+xnxpTwZhqTQ SB8pegP82QqdvU2sqTXKv85l37TwrVlEuZ/8eElcxfrloXTTx3WD9AWkZv/eCDurxWsXNabZV/X pTpkjSFEESUA44BfmF2oO9OHkuuCUPuNnIx1ISZEU7E2qmJG5VRNqGp4vfXDO3DQD6mCljPf7Fu 40IGh9XGhzgew7L4cShy4qKEOzqpmhgrCle4lyB6IidK1f+tQKpEf7oJz+lIiNpNEUbst5E6g00 LPj6GwhAWeyalu/akJR/iy6DjTPqBCRd5Fb7iVR8YT0A2yhmdRavHw++Bl1WDF4/m3HmiKgRgNH UqiLdej0wMUbUV8ozNXx3zwO+nOXGooUyylIA4LILl14AlWmQWg4WZm+4gtDsnk5Bvb6oc8RGJ7 tsvMulR1C/V8C7dFVARej4XgVU7u05HDnE8RL+dG7mPkrk/cvH7Pleo83koJlXGlkXnOuzfEGic z1WHZk0caU= X-Received: by 2002:a17:907:ea7:b0:ba6:8f34:b419 with SMTP id a640c23a62f3a-bc56ae27aa7mr178090266b.13.1778076112686; Wed, 06 May 2026 07:01:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 050/110] monitor: Do not check TARGET_I386 to build target/i386/ commands Date: Wed, 6 May 2026 15:54:22 +0200 Message-ID: <20260506135524.20617-51-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.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: 1778076492939154100 These commands are filtered at build-time for i386/x86_64 binaries. By using the recently introduced HMPCommand::arch_bitmask flag we can filter them at runtime, making it possible to compile hmp-commands[-info].hx files once. Since these methods are used inconditionally within target/i386/, define them in the same stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-15-philmd@linaro.org> --- MAINTAINERS | 1 + stubs/hmp-cmds-target-i386.c | 13 +++++++++++++ hmp-commands-info.hx | 4 +--- hmp-commands.hx | 5 +---- stubs/meson.build | 1 + 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 stubs/hmp-cmds-target-i386.c diff --git a/MAINTAINERS b/MAINTAINERS index c57a01131c4..d022070a74c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -149,6 +149,7 @@ F: configs/targets/i386-softmmu.mak F: configs/targets/x86_64-softmmu.mak F: docs/system/i386/ F: docs/system/target-i386* +F: stubs/hmp-cmds-target-i386.c F: target/i386/*.[ch] F: target/i386/Kconfig F: target/i386/meson.build diff --git a/stubs/hmp-cmds-target-i386.c b/stubs/hmp-cmds-target-i386.c new file mode 100644 index 00000000000..43a167056d5 --- /dev/null +++ b/stubs/hmp-cmds-target-i386.c @@ -0,0 +1,13 @@ +/* + * Human Monitor x86 stubs + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" + +HMP_STUB(info_local_apic) +HMP_STUB(mce) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index b1e2bf3c059..65af86278b4 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -106,16 +106,14 @@ SRST Show the cpu registers. ERST =20 -#if defined(TARGET_I386) { .name =3D "lapic", .args_type =3D "apic-id:i?", .params =3D "[apic-id]", .help =3D "show local apic state (apic-id: local apic to rea= d, default is which of current CPU)", - .cmd =3D hmp_info_local_apic, + .arch_bitmask =3D QEMU_ARCH_I386, }, -#endif =20 SRST ``info lapic`` diff --git a/hmp-commands.hx b/hmp-commands.hx index b41f44f5ad4..c3a1a95c5fb 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1502,18 +1502,15 @@ SRST Stop the QEMU embedded NBD server. ERST =20 - -#if defined(TARGET_I386) - { .name =3D "mce", .args_type =3D "broadcast:-b,cpu_index:i,bank:i,status:l,mcg_stat= us:l,addr:l,misc:l", .params =3D "[-b] cpu bank status mcgstatus addr misc", .help =3D "inject a MCE on the given CPU [and broadcast to o= ther CPUs with -b option]", .cmd =3D hmp_mce, + .arch_bitmask =3D QEMU_ARCH_I386, }, =20 -#endif SRST ``mce`` *cpu* *bank* *status* *mcgstatus* *addr* *misc* Inject an MCE on the given CPU (x86 only). diff --git a/stubs/meson.build b/stubs/meson.build index 99a89c00066..6142e0f4d9d 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -88,6 +88,7 @@ if have_system stub_ss.add(files('qmp-cpu-s390x.c')) stub_ss.add(files('qmp-cpu-s390x-kvm.c')) stub_ss.add(files('hmp-cmds-hw-s390x.c')) + stub_ss.add(files('hmp-cmds-target-i386.c')) endif =20 if have_system or have_user --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076268; cv=none; d=zohomail.com; s=zohoarc; b=No9TMdtOGCNz7KYBE5Zh74j0G8AVTiHZFKDTkLBBbJSlIQ+9s7nso0VUgdlhB57s/ZSNycO6msN81xGyGXB29Aj4jRCkEUPuDpXmsrqfnDJp7ODzy+8rwX+j5KVxqXKOZgCHM6XlVqT2DIpJ4uv+mHNOxjNkFaBW/1bAm6YZNzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076268; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=G4zI5ovDvmRWdupFowupRxfgjLmaPfxDAhIri/4i3pw=; b=da4k+VyPAF+wYFZAvFdUcLHn/nYAAmcqd7bAlEECYf4ZOrRtNXlVnCwgUeMG8vbKjYOA5Zqjb/p+gPRa8Khnh3f52b2dND7jpgm4WaWp6jY4GLtJ9dTbGxsOjw+7lmi10s0G7a39SndjlbJCl/56VP4XmZp2MxX4UcAFsGmTYi8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076268272915.5643337344615; Wed, 6 May 2026 07:04:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcr3-0000On-Da; Wed, 06 May 2026 10:04:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcpC-00073E-WE for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:12 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcpB-0000rz-7S for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:06 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-67179ed133dso7331412a12.2 for ; Wed, 06 May 2026 07:02:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45052a48f63sm12472535f8f.16.2026.05.06.07.01.59 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:01:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076122; x=1778680922; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=G4zI5ovDvmRWdupFowupRxfgjLmaPfxDAhIri/4i3pw=; b=yLVhpQNZkPlYysoiqeqePjBiuY0maedPZ96awyno0Nx/XeabJjg2r4nUxYtgCg57If 7KHpqEFB9ubUMGqmANTjoQTYBYMd0z+U84pvlg9g2z6hVewEvNf3UDAxb7+1aQiGPpwE 02ro8DuiBbvausfz8KOcj4nGYWnsbk1tHxjCAqfrCEKk0cpDbCRNuzWMotQiyxxRKzvl 3Mq5byBV9g+bpsymuzOk4V3BaSMdzw7mZaa2K37Nizvo5NZtXxIbnvljkHe/Kp7jJq6G qhRHvmb3YYGlEXoAgbCI1E0t8HXkkXO+wyU0KL1pljTgCpDYFu56PwSZPS1MegkLEX2c nZqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076122; x=1778680922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=G4zI5ovDvmRWdupFowupRxfgjLmaPfxDAhIri/4i3pw=; b=psXUWJsnnSD8WNZKWiu/OQxJjMCadounBAwJ3uu/3siJKwgtLdgGvhOfxsOoJsNZsL mXiU12VMs7ERJIes+gNc1B17eDT+M+WzVd1Q2etR5q+rqkNvESQRNOvludfzJAas7jOJ CsxkoEQiOSvy/EsHOnEYQdSVMMFbYxzrY/G88g+A0sQ/06s85KQCGQZqo9iOScQEUhIe 9oAXQ0g83Z9fk3QsizXqexLT2qgkPr5GuvNu9DeMD+XqM2ryu9K9DikrV6B3WSvoXdDL Lu3ysq4ust+d5oc/kPyIqGYeaLZ6gol6mUcAWpLhS1CwPoaHqaZ1QCvkFOMr23gS8hZJ N3gw== X-Gm-Message-State: AOJu0YyiHmonPyihpEET5WptOy1AWHY3mbqhWZIT2woz8I0i0mi6uMX4 t0GPapMOJdi11yAAyCC3Co/9z+K7PDoC06QleqXHj/O3dGtPjk/3d3H0yOYkX8VT6QbUNpZg49I FzB3gcWw= X-Gm-Gg: AeBDietR02Vxa3z2z+ZxL9CA34sHU7Wb7ZVht5P7nMGDJFeIPG+K0xRW53XbwvedYT4 P1geDwbiU4NNzw97jmE78PR86ewXyfnHP0FJngJTs/0rB82gNNDyiyqsppFo4EmSSCXL4WTZVzG 5sLaeFbzZVqEdckrxnmrfg28Qg3V1GCMUErxXTklRki2rUxIiirjVR00y1uM1m/NEB1dg24kxKn ajYO0WsP7XFSWMB5ppdXJMI62zoX7xEkWljALq0aqRny/wsXHEPiCGtKEWZAhfl/DpfI9+/hiGA SYCKI/XYTGNslOIBRZtPSLtAG6nVyvYxGHFADSlnzWK/eY65a6KMwJk1QmsLRXjw2kLJkgFak54 eI0CU6okM9v1SsrzY71MRF/gknBMmSKf1N7CPk6V2OGnHVkviFTDMrhpWlx6Yd6vbbnn/pAClXH tGqCNags4gFBKiltyDRKTLBQugj1D7MVrjDo3sYEoP4Y9yAOBub3v+ZT26tXR+5Gn7Sr8b+FSah sFtlKai0No= X-Received: by 2002:a05:6402:380f:b0:671:dffb:f450 with SMTP id 4fb4d7f45d1cf-67d63d9843cmr1693929a12.11.1778076121719; Wed, 06 May 2026 07:02:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 051/110] monitor: Do not check TARGET_I386 to build 'info sgx' command Date: Wed, 6 May 2026 15:54:23 +0200 Message-ID: <20260506135524.20617-52-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=philmd@linaro.org; helo=mail-ed1-x52c.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: 1778076269142154100 This command is filtered at build-time for i386/x86_64 binaries. By using the recently introduced HMPCommand::arch_bitmask flag we can filter it at runtime, making it possible to compile hmp-commands-info.hx once. Since the method depends on the CONFIG_SGX definition, define it in its own stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-16-philmd@linaro.org> --- MAINTAINERS | 1 + hw/i386/sgx-hmp-stub.c | 16 ++++++++++++++++ hw/i386/sgx-stub.c | 5 ----- hmp-commands-info.hx | 3 +-- hw/i386/meson.build | 1 + 5 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 hw/i386/sgx-hmp-stub.c diff --git a/MAINTAINERS b/MAINTAINERS index d022070a74c..7515025e09b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -514,6 +514,7 @@ L: kvm@vger.kernel.org S: Supported F: docs/system/i386/amd-memory-encryption.rst F: docs/system/i386/sgx.rst +F: hw/i386/sgx* F: stubs/qmp-i386-sev.c F: stubs/qmp-i386-sgx.c F: target/i386/kvm/ diff --git a/hw/i386/sgx-hmp-stub.c b/hw/i386/sgx-hmp-stub.c new file mode 100644 index 00000000000..cf1d9a6344b --- /dev/null +++ b/hw/i386/sgx-hmp-stub.c @@ -0,0 +1,16 @@ +/* + * Human Monitor 'info sgx' stub (CONFIG_SGX) + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" + +void hmp_info_sgx(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "SGX is not available in this QEMU\n"); +} diff --git a/hw/i386/sgx-stub.c b/hw/i386/sgx-stub.c index 1dd8d9afbfa..2b083c77bc1 100644 --- a/hw/i386/sgx-stub.c +++ b/hw/i386/sgx-stub.c @@ -23,11 +23,6 @@ SgxInfo *qmp_query_sgx_capabilities(Error **errp) return NULL; } =20 -void hmp_info_sgx(Monitor *mon, const QDict *qdict) -{ - monitor_printf(mon, "SGX is not available in this QEMU\n"); -} - void pc_machine_init_sgx_epc(PCMachineState *pcms) { memset(&pcms->sgx_epc, 0, sizeof(SGXEPCState)); diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 65af86278b4..576adbbf5a6 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -859,15 +859,14 @@ SRST Display the vcpu dirty page limit information. ERST =20 -#if defined(TARGET_I386) { .name =3D "sgx", .args_type =3D "", .params =3D "", .help =3D "show intel SGX information", .cmd =3D hmp_info_sgx, + .arch_bitmask =3D QEMU_ARCH_I386, }, -#endif =20 SRST ``info sgx`` diff --git a/hw/i386/meson.build b/hw/i386/meson.build index 63ae57baa51..b611fbb5a7f 100644 --- a/hw/i386/meson.build +++ b/hw/i386/meson.build @@ -24,6 +24,7 @@ i386_ss.add(when: 'CONFIG_VTD', if_true: files('intel_iom= mu.c')) i386_ss.add(when: 'CONFIG_VTD_ACCEL', if_true: files('intel_iommu_accel.c'= )) i386_ss.add(when: 'CONFIG_SGX', if_true: files('sgx-epc.c','sgx.c'), if_false: files('sgx-stub.c')) +stub_ss.add(files('sgx-hmp-stub.c')) =20 i386_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-common.c')) i386_ss.add(when: 'CONFIG_PC', if_true: files( --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076439; cv=none; d=zohomail.com; s=zohoarc; b=BFuyRadxVkao3a75IGVRaXUQmr+dqJF+g4pg4WEEQA/vjdwjKs3cG9Upe+6psgVk4dBPznAmLeXtXC+ZTYVZycE+Ldf3ApBzVS7P15nU7TGb4CCUc7L5F67pn4m3EXq0tEeBUVZhN+2//mKvdlSF4nQ4ebnOHlcdj8RFkC9ArcI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076439; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=rqzyk5r26PUHXn/obZCfF5gHTJGmPpfm5BDUQeQj+1I=; b=ZXjFTnlSLLbTkofb1dTVpU0uVO8HZdhKGhqiXnEWNj6Nyg39/JZyqtbNEoHXVzfNPMo9w++z6Ryf0n34iMRAo3pcpDBMHLdlRHDRkdRropJIaiv7nbWdImeZgamSuopC+sdBc3HUi7SNmuvpf0oCg10TubHwkNUDE7/hBPXTIPI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076439273514.2200589820095; Wed, 6 May 2026 07:07:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcrJ-00014p-CD; Wed, 06 May 2026 10:04:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcpK-00075T-SF for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:17 -0400 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 1wKcpI-0000se-DK for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:13 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso62695875e9.2 for ; Wed, 06 May 2026 07:02:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5312df8dsm17412135e9.18.2026.05.06.07.02.07 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076130; x=1778680930; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rqzyk5r26PUHXn/obZCfF5gHTJGmPpfm5BDUQeQj+1I=; b=AlkLT9/YcbPsCSLF9FX3mP8ZMZtvon6/WHkLvf3JdPnbvB3mSQF7Oabn6/Oy1qtpQX 3V1vSi7ty8sppt3Vd3WXPkF7ESzHfq1gFvoFDCljkcG7g8t/V1XZBcZw4vnR8pfmCSMx A7k6kWhGdjtOKFySYoufF37wQ3MvfMTebM+J+WnTTgEKLNyETN91zgOj8Nloijchsawh bXQm/B0OLl+FOIvHeZFlz2fhqy8HIIDqekA2RRlqj2oPBSO2TQN5ZXrmlmpKooh0m9cJ IwU8mDz3KkcVfLXEwPSMriq3V906D+U1DP6eYINuycWleFBn0fm2zUmdIS277DoOcLSe sDGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076130; x=1778680930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=rqzyk5r26PUHXn/obZCfF5gHTJGmPpfm5BDUQeQj+1I=; b=in6C0jvOlF0Nc+SU2JZPoujjTWB0FOb9nWQsKehETDdRivQ1LTHl5WMVgcw8nXy5UO TP1uNt+pdVd6dbV0c3eh1TNs+zgETSbEdflxoRXcjQj0NNkNmm77r9S1eIo6bz523rN4 RhzKHUrRB+1XHtBClRxU1qJeUou8w7uy7+pjUZlg0CgN9tMQaXo0nuHfa1NDaCTibGp/ irOIR3GjEg9hIQ7fQzXMqwSQqALfDHF05qXZu2778UlobBYRJ7N422GDuystU0CZnsGd SnKVS8dNBa4qFNLk5dyvtCdDQKOeURhnIfAeYZ/TAjMOBqfmu2v5z069NEbTHbGA880j EWew== X-Gm-Message-State: AOJu0Yx5UBAKdWY5lfnHuMKqWv5j6XT0ZogYk0QHKFKRpmODkR8pjQ9s SzEVKbc3n+mZv6wUWf/M8FT65Ykhyaq89tX+3Qz9YlElVuSF/KQZO3xMZe1JMT1vlTS+113pbRS 04Dp4ul4= X-Gm-Gg: AeBDievdc1Uc9SfuJ/c+kgQ/4+Ucwh8xSfWYkx1tt85KBc1125F3JWzWzOFIW9+Ohnm PcFzr6wMGAkvzD+PbLt4mDRRSMvxCxvumaoH20sRG4nHjnm0gonLd0zGvF5CAMuj9mqL5OxDemB t3A0fXg7J251XM8fZzinMc3h67CluYmyf930r5i60nT4fzB05x7vjUa0KwdVQuQVv4MdYISt+/g aJduFWE1RzSeyQPWE4CGo33A7w792TbsL64Q8ftdne2e3cy1wcdwhgPIivqUZZHODO9cDDWA2SU FgKlxg7/oHovd9pOV06bvTKO/zqWrGJWmgmuyvRMnQ77HL9tT7XqX/Lef9hTwe3NLF3bNFielOD asEqWweNDn2aGd8YIR3g/GYeRLTjJZ278OpLk3l59hUNj/Sr7j8YmbG+RRnqbJ41duAWeUrQwjV pSZafq8pfhUURsfwTUoOD88ngbPnhv7WkqKoEsBv0FoaP5D2GBID+XT+44gPi+9tWwZWDVjgOTz x5ivNFtA00= X-Received: by 2002:a05:600c:4e0c:b0:48a:55d8:7882 with SMTP id 5b1f17b1804b1-48e51e16e58mr68269965e9.9.1778076129315; Wed, 06 May 2026 07:02:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 052/110] monitor: Do not check TARGET_I386 to build 'info sev' command Date: Wed, 6 May 2026 15:54:24 +0200 Message-ID: <20260506135524.20617-53-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076442140154100 This command is filtered at build-time for i386/x86_64 binaries. By using the recently introduced HMPCommand::arch_bitmask flag we can filter it at runtime, making it possible to compile hmp-commands-info.hx once. Since the method depends on the CONFIG_SEV definition, define it in its own stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-17-philmd@linaro.org> --- MAINTAINERS | 1 + stubs/hmp-cmd-info_sev.c | 16 ++++++++++++++++ target/i386/sev-system-stub.c | 5 ----- hmp-commands-info.hx | 3 +-- stubs/meson.build | 1 + 5 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 stubs/hmp-cmd-info_sev.c diff --git a/MAINTAINERS b/MAINTAINERS index 7515025e09b..1eb7903268b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -515,6 +515,7 @@ S: Supported F: docs/system/i386/amd-memory-encryption.rst F: docs/system/i386/sgx.rst F: hw/i386/sgx* +F: stubs/hmp-cmd-info_sev.c F: stubs/qmp-i386-sev.c F: stubs/qmp-i386-sgx.c F: target/i386/kvm/ diff --git a/stubs/hmp-cmd-info_sev.c b/stubs/hmp-cmd-info_sev.c new file mode 100644 index 00000000000..f3624423a33 --- /dev/null +++ b/stubs/hmp-cmd-info_sev.c @@ -0,0 +1,16 @@ +/* + * Human Monitor 'info sev' stub (CONFIG_SEV) + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" + +void hmp_info_sev(Monitor *mon, const QDict *qdict) +{ + monitor_printf(mon, "SEV is not available in this QEMU\n"); +} diff --git a/target/i386/sev-system-stub.c b/target/i386/sev-system-stub.c index fb84aee94d2..2ea85597cf9 100644 --- a/target/i386/sev-system-stub.c +++ b/target/i386/sev-system-stub.c @@ -32,11 +32,6 @@ int sev_es_save_reset_vector(void *flash_ptr, uint64_t f= lash_size) g_assert_not_reached(); } =20 -void hmp_info_sev(Monitor *mon, const QDict *qdict) -{ - monitor_printf(mon, "SEV is not available in this QEMU\n"); -} - void pc_system_parse_sev_metadata(uint8_t *flash_ptr, size_t flash_size) { } diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 576adbbf5a6..480a5a79ecb 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -805,15 +805,14 @@ SRST enabled) memory in bytes. ERST =20 -#if defined(TARGET_I386) { .name =3D "sev", .args_type =3D "", .params =3D "", .help =3D "show SEV information", .cmd =3D hmp_info_sev, + .arch_bitmask =3D QEMU_ARCH_I386, }, -#endif =20 SRST ``info sev`` diff --git a/stubs/meson.build b/stubs/meson.build index 6142e0f4d9d..f086521cde4 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -87,6 +87,7 @@ if have_system stub_ss.add(files('qmp-cpu.c')) stub_ss.add(files('qmp-cpu-s390x.c')) stub_ss.add(files('qmp-cpu-s390x-kvm.c')) + stub_ss.add(files('hmp-cmd-info_sev.c')) stub_ss.add(files('hmp-cmds-hw-s390x.c')) stub_ss.add(files('hmp-cmds-target-i386.c')) endif --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076223; cv=none; d=zohomail.com; s=zohoarc; b=a5DuMSdUAFfgZRlJdzR/qkCRD/5AWidgQycBc0Quscszy2eR2kcNKwXgVsh/zYKEXRqhA9hB4UgJp5jgLnsrkd9XldMFIlQVkWewkNDBe2zkjtl8q/7OWknfTuLMTmd+bge5RGJSy2VIjXztXST+HSdm0ruKF9ex0ezJcs+t/cQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076223; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=7kXWCWGQPYwwqBv/UVwNdK1EbhrE/SU047Bh0KrJsqI=; b=PFG4p1W/LGlEBDXQFj91FuZzHUO1xTmq2AVJkosX4XWKy82+Nt5/EUZfPjcISN6HJj2hw/8vAnh3u9bn6NNZN/qg79m9j5Tk/HNgDa5anKlYwiYr1BlP/+ZzrxNrBLtnYKiZg0HhyFSl9lTj+3a2kVQJPmvbj9LhiRNnWUlTXHk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076222905736.9307659254696; Wed, 6 May 2026 07:03:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcqb-0008KC-Vj; Wed, 06 May 2026 10:03:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcpT-0007EV-80 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:28 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcpQ-0000tY-5M for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:21 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-488ad135063so61567775e9.0 for ; Wed, 06 May 2026 07:02:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538a8159sm56606785e9.6.2026.05.06.07.02.15 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:02:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076138; x=1778680938; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7kXWCWGQPYwwqBv/UVwNdK1EbhrE/SU047Bh0KrJsqI=; b=XLsMGXiJS/zya3q+YUsNQ4U33NmQUF177lINVfejrblzV/WOv78Le/Vs6Isydh4Mr8 loiExrGWcwODCHRB0gLhSWntAKeeJwWirDAfkeUTWzNkja5NwQ80ao26kAuAzJvXAgJP CmGFu7/Hmf3QuRqEH9xqQKhsnOwJUM58jMBKnwQ4xrjuI7w85mlM9ctruwpqmznzhLh5 rNBilD1hgLueI5HRUwbDpyV9KfH6rXMgBhfGOWUczJ/2a2kcvbyj+RczEvQnUDQXwcMe FMsp10Sh39dq6NhV7/Wnh/0q4XZWSOsyO/WWNy+2qfsCd3uuBgTcnTAIzZIcRYtz/8K3 dB9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076138; x=1778680938; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=7kXWCWGQPYwwqBv/UVwNdK1EbhrE/SU047Bh0KrJsqI=; b=UJjobjtNWIyFpQBtxP1Noap6z6ZPZZtq7fZ8/GEWB96GK7TkImbr6PTSkJxCl88xYO kAOAiLTmxFzhBzSaZD7yoAYEYcFItm57ItkEI0Is9BhYxAxFXHoIh4zcMSr+5GqfdC3n BE0Ad4NLuywtbhNVyU4X5Ws0C9OT5Y3PaI43nwzddGVpqvNCcxWzmY/e4qWQdywsqmh4 kl6uxzX7vip22qFtU1JLiyIQPV5YXLzD0guMopdzUqozax+X6ccNRHIDVh89V/C4+c/U d82414OrOhvESxzpe8ks5lS8e6thg2OXzRUguMrsA7xA8gY9gJhy/hcvi6s6TMf2oHSO WwJA== X-Gm-Message-State: AOJu0YztQEERe+wW8BRgqIekMZLBcc+/Fq52N3QIbbc1RoFuXx4enaws QPXQy0av0hV2Utnr1q1+NRkx1ebs2z7kQAY1J792Y3Dp2C4mpMFkd7BajzeYFNOxvHKfcOy0Xa+ jT+KE/oQ= X-Gm-Gg: AeBDieuHme79homwM8kNzbQxQhD6fACDYmB6LLCH4cpF4j3QNfMkjyHTyJnRH1qYgtg h1iNI5gtaVDwAENYw3476vPRmCp+4i/F8q/Yz2MOV1/jfZzzaPB4qSfduaYCu+AexF4JS06z72H hMjS5LkcGTc+baYD5CtMZbbVKR/qaPc4OXBQ6RzlhB4rrrAQObw3drJdjXbWhnVN6HNnGzexl1A 3OZ80iecRhfqEYHdC+5t9xBXC+GOcLKgI1NcEkVrJtuOPmMmtpnBJAlRltyXFmSMmC5l2y9G/16 AEAtY1EEJK1dH+aaNX7/awg8X4XLBZSU+FLoYC7i0yxP2i8j2spaXsP+ScAn4jtg5mpAXENS/09 4BEL8BFQwUUsQQx6nrquii6kN5NYwArKdfB5c8YPYpXiF0z6lo1spDVcnMv7qrDh5bqyUZpDBdN pCuTQf/qPClK+D4qTKIck836lcZ+bihVadx8jT+ccrU43Fa4Xf88p8ZSFrZL44xPEeduHX3D2mW H4RQkMLpGc= X-Received: by 2002:a05:600c:33a9:b0:487:2439:b7c8 with SMTP id 5b1f17b1804b1-48e51e0bb9amr39512935e9.1.1778076137397; Wed, 06 May 2026 07:02:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 053/110] monitor: Do not check TARGET_I386/RISCV to build 'info mem' command Date: Wed, 6 May 2026 15:54:25 +0200 Message-ID: <20260506135524.20617-54-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1778076224864158500 This command is filtered at build-time for i386/x86_64 and riscv32/riscv64 binaries. By using the recently introduced HMPCommand::arch_bitmask flag we can filter it at runtime, making it possible to compile hmp-commands-info.hx once. Since the method depends on a pair of distinct targets, define it in its own stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Alistair Francis Message-Id: <20260427080738.77138-18-philmd@linaro.org> --- stubs/hmp-cmd-info_mem.c | 12 ++++++++++++ hmp-commands-info.hx | 3 +-- stubs/meson.build | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 stubs/hmp-cmd-info_mem.c diff --git a/stubs/hmp-cmd-info_mem.c b/stubs/hmp-cmd-info_mem.c new file mode 100644 index 00000000000..8a53e367a9f --- /dev/null +++ b/stubs/hmp-cmd-info_mem.c @@ -0,0 +1,12 @@ +/* + * Human Monitor 'info mem' stub + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" + +HMP_STUB(info_mem) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 480a5a79ecb..c93c049daea 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -202,15 +202,14 @@ SRST Show virtual to physical memory mappings. ERST =20 -#if defined(TARGET_I386) || defined(TARGET_RISCV) { .name =3D "mem", .args_type =3D "", .params =3D "", .help =3D "show the active virtual memory mappings", .cmd =3D hmp_info_mem, + .arch_bitmask =3D QEMU_ARCH_I386 | QEMU_ARCH_RISCV, }, -#endif =20 SRST ``info mem`` diff --git a/stubs/meson.build b/stubs/meson.build index f086521cde4..33053d932c8 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -87,6 +87,7 @@ if have_system stub_ss.add(files('qmp-cpu.c')) stub_ss.add(files('qmp-cpu-s390x.c')) stub_ss.add(files('qmp-cpu-s390x-kvm.c')) + stub_ss.add(files('hmp-cmd-info_mem.c')) stub_ss.add(files('hmp-cmd-info_sev.c')) stub_ss.add(files('hmp-cmds-hw-s390x.c')) stub_ss.add(files('hmp-cmds-target-i386.c')) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076474; cv=none; d=zohomail.com; s=zohoarc; b=hq9fO2lk5cKjjdtbjpERbS2x8xYcrnEwk5igTOs2zQ8QxkN0SG2IvpkqdX/dCaRZOaWzr2gNbp6c2lANu7V+FfYUZpP2ghgSIu3SEgfeWowitk7p8P2WH16EgDs6VOAMxJ5qlpr7ed180zO4sZLrf/gXKVdbgCg+623hKjsNtwU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076474; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=yewvYs6cPTD2dj7nT/r4N5XxtqUaMU8rpJtQZi2DobU=; b=X8qxt8OVoDyhsoIkpglGoxWEg97uERbZ4OMMsL5dHn6s/Zvs5NR18jKb7d1b37Uv1uqmtMAlE9GzYvKf93bHBWPHRBoODgm6NcsbmzhSg5YlFxY/fzgt9WGQ8b2enJHgLAfRhw+Bxs4rJutO+BUqOgT/4IkWXQCh0XbgIpQjGlc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076474189346.68543409426627; Wed, 6 May 2026 07:07:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcrW-0001VN-2S; Wed, 06 May 2026 10:04:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcpc-0007Iv-Tu for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:33 -0400 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 1wKcpa-0000vB-8E for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:32 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-43fe62837baso3603803f8f.3 for ; Wed, 06 May 2026 07:02:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45054b02c5asm12726418f8f.19.2026.05.06.07.02.23 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076146; x=1778680946; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yewvYs6cPTD2dj7nT/r4N5XxtqUaMU8rpJtQZi2DobU=; b=txdubUxzhGFf6nrPvz9WrunCTWPOUe3uLV/48icEbdm1cM9p8lqdNq5E+p9kbYTMA9 mgeKLcxZcWETKPCyK9ZnsNPSEXpCe7nVfeTztEjPl0p/IRgX0rS0pd2sc7amHWte5UiW lenUABlpHN0DnSaRinCZT0jtqneIfupjGgA2cKRn1LjvRWbjo3TIjbr1ZI7kXD743ZIX Yp//PwfgWdLc7qXlNfOX/nxdtOlRQm2jtm1S27P+Ib1YthRNMxAEppRH4rp577RZOAOb cm0xEWVBvYZnNgqFFbwIFa6nagLmnqMqugamsZi+TeFfVlKVE6Yops0peUG0ibjXmRCs S1Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076146; x=1778680946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=yewvYs6cPTD2dj7nT/r4N5XxtqUaMU8rpJtQZi2DobU=; b=l9UNjO5urYORn/YhwNSsHg5IlzIp/2TofXXiIqtzbnxMiFJUDw3mZ0bCcl27n2txC4 yvjFPwjin7jJ6fa0C+rGi02dAHYv1W/Xo0LaVFArDhO58ptyjflQMUo9ixfqNFVm24g1 ITHzh+2vsUuKBsjTfP3pOQy/Gp1QyZTP+6BtOvNKZPwg/ebkfk6qel5KlwltEcEvvZFI HfSCfXJhJpvwQIZOGIoCULTLp62EHo9xMC4l4bxps6xKbMmUGyR3OyZXlVGFDCg5QsU0 /hQgbchqgvZYjGUlLxP+Mxr2h1WXY75UdcLmI9fgzGkg3bvYdp3bJc277DuQ+U9lBIZ+ rwZg== X-Gm-Message-State: AOJu0YzUz0uIrDTdfAvLI4dZPYVnI+4/XaUvB1e7Q7bJL2tLEF6jDveS QWrmSFlGySAN1spv1eue2vN2ijj3ndP6SyBnPMcVtaU9TrbYacMTNYZF9Spt06VA/mnZVUy6TgD nZerkj1M= X-Gm-Gg: AeBDiesLznX7RYdwAOkQMawSxRWZKRirEQB1IFVLeMBqR1q0Kt9au+hG2P2GldRPNL6 qxCYvEktHENxkLNwhTLCWKaADlbidKgpW6gsJDR7fLU1b0K/JZr2JBp1jn3sM54iXlbq1VxvOte 2F31DGSkCToMNJyiyPOVZrkpjOdvS9LMVYQRGuUCWZm47pXG0oFRNt29/az823jzptx8972/U6j b76N3c0bblpK9i+qGPpengY+ruYylPGSU83QWysP1g1rD3WwmChYFYikwUJTtUCqSwQwYkLUR+D ndbCB7gt+0tMhf6Wo1VO0raW2H1Z7qMFj79iETNGrvYjp8iYXf3L96VaaNOfQNWtSS00mqLa3dz t2yxq1tVbw+7Y6cCNQjJ2ynSU6VlKmon6Ix2Mqe+bBwlVD+oWTJhs64gCgzQgjdWglJIjzzOJA7 ciaMktaXnlt1eJql42AIpDYw4DeFVR2ZBCt9I26OqpBJ9cR18GgbgLdbJKoRFHrEskHF97HgjFI sIaZT0Qm+M= X-Received: by 2002:a05:6000:3110:b0:449:acdb:3009 with SMTP id ffacd0b85a97d-4515b057246mr6053359f8f.6.1778076146321; Wed, 06 May 2026 07:02:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 054/110] monitor: Do not check multiple TARGET_* to build 'info tlb' command Date: Wed, 6 May 2026 15:54:26 +0200 Message-ID: <20260506135524.20617-55-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076474978158500 This command is filtered at build-time for a selection of binaries. By using the recently introduced HMPCommand::arch_bitmask flag we can filter them at runtime, making it possible to compile hmp-commands-info.hx once. Since the method depends on a pair of distinct targets, define it in its own stub file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-19-philmd@linaro.org> --- stubs/hmp-cmd-info_tlb.c | 12 ++++++++++++ hmp-commands-info.hx | 5 ++--- stubs/meson.build | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 stubs/hmp-cmd-info_tlb.c diff --git a/stubs/hmp-cmd-info_tlb.c b/stubs/hmp-cmd-info_tlb.c new file mode 100644 index 00000000000..a144e68c1c7 --- /dev/null +++ b/stubs/hmp-cmd-info_tlb.c @@ -0,0 +1,12 @@ +/* + * Human Monitor 'info tlb' stub + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" + +HMP_STUB(info_tlb) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index c93c049daea..82134eb6c21 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -186,16 +186,15 @@ SRST Show PCI information. ERST =20 -#if defined(TARGET_I386) || defined(TARGET_SH4) || defined(TARGET_SPARC) |= | \ - defined(TARGET_PPC) || defined(TARGET_XTENSA) || defined(TARGET_M68K) { .name =3D "tlb", .args_type =3D "", .params =3D "", .help =3D "show virtual to physical memory mappings", .cmd =3D hmp_info_tlb, + .arch_bitmask =3D QEMU_ARCH_I386 | QEMU_ARCH_SH4 | QEMU_ARCH_SPARC= \ + | QEMU_ARCH_PPC | QEMU_ARCH_XTENSA | QEMU_ARCH_M68= K, }, -#endif =20 SRST ``info tlb`` diff --git a/stubs/meson.build b/stubs/meson.build index 33053d932c8..2f4e1ab4300 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -89,6 +89,7 @@ if have_system stub_ss.add(files('qmp-cpu-s390x-kvm.c')) stub_ss.add(files('hmp-cmd-info_mem.c')) stub_ss.add(files('hmp-cmd-info_sev.c')) + stub_ss.add(files('hmp-cmd-info_tlb.c')) stub_ss.add(files('hmp-cmds-hw-s390x.c')) stub_ss.add(files('hmp-cmds-target-i386.c')) endif --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076259; cv=none; d=zohomail.com; s=zohoarc; b=UK7v/QdjfDYfQXK6isY7t5yCWzKGiwkZWdoCquNQAagFNRgf/nCsWk5sOIV4I1bzUtsMGA2qF8+rDVg/T+g598i055Ll8901EPH0K6+L4Shaqb9fiXHWy3hFcXOPPa+AGbzU1ju92mFDwDZS4n8etD1GwNWuVQJB5gWlFNqNYpE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076259; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=MBVFo7jkXJxLoZf3PgcZx8GVnDIMsyILjmfxQ7o/Kys=; b=nqeLfWVtPC54vjkaVA1GxZ0A5c1UQnbTFppz93fezseOkGu5RceaSwrE6lEzMQciM5RuCJKIDd1O9hiO/NBDYpy2fjLWiLCkcwRh/d9e9McppueE/B5/lsAg24Y4ms6ycOBt7ZscBTDmpqI3yqBdyysaF6uWkbRtX+Q8zovOOFc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076259306248.20382856064316; Wed, 6 May 2026 07:04:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcqR-0007uU-F7; Wed, 06 May 2026 10:03:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcpi-0007MQ-AY for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:41 -0400 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 1wKcpg-0000wD-PW for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:38 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-488b150559bso44918985e9.1 for ; Wed, 06 May 2026 07:02:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e530b2947sm17331115e9.4.2026.05.06.07.02.32 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076154; x=1778680954; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MBVFo7jkXJxLoZf3PgcZx8GVnDIMsyILjmfxQ7o/Kys=; b=Ufpzko/lpir4WN1qEi3ji6HBISh6tLjefgjCCM0otYQgzLZSh6/P/gC+yENSsiWxc5 AxKyWn72cx0cYHlVxnx7kvJxkSvfaWqVt/a3EPng2/fSWQnlVhv7t31NAS7QFoRpXsu7 yz2UBVgHqZINH6Ox0lrqOIHgcUmYKpcWO3I930Ond/yTcBgHVQ04ZFPYs85OIzTx5ykf 8I2CBGuQmfg3w9eg27gP1/mgPDD4fN9mQLxSXoTPEIR8U8X1fPL4iufwep8qZ3PYhJT6 BIdCUqEglJ8IFdEUxbGONwykagY9pZK2zI8VBgKrSD8KgwBtVoPraeJmQlfxloCKvGgQ o3fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076154; x=1778680954; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=MBVFo7jkXJxLoZf3PgcZx8GVnDIMsyILjmfxQ7o/Kys=; b=e67rcaQbP6RDAg7kNzAXUk9uXwEvaR73ZRQ9fFFiMk43YsGLu3Kn67qdOetXwuRKj1 zw7BnJfjGez2zTAM40ULNQqu6uNkB+eVgIq7CKPEhB8VhS8qBMSrMGO3u8eI4AjxkxJn D6DrVW7QG7kNA1Wg/QPdncZx8iJQiJyp68WhAfeyBtbVZ/5BRs3PjtorZdZoHqhaq5v1 s0kiNUGLQacvDVvoJlj9QGr2ScM3HTarf5kRmDBVy5GBMJyvpmUkPT8WpwqV/iK5LWzt oq2q33jNMquEAT/KZqDdFz9Pa8UtaiSLY5K5b2yJ+4NIUY+TpwmCNgr2RG1iG04JGggM ExaA== X-Gm-Message-State: AOJu0YzzRnX8y6c4QkblyIO2FdELdcS4FwUI60NMXrO53orF8D81w+ZX rFwXgE0yVIAD/kGL4W4dEFVxAnZWLBLPlEP78aqaHv/auOqkVmPv2S19/rLdj8ZbOS8UK8HjhQT c1EgVKPE= X-Gm-Gg: AeBDieucrMfhUdP+03vWBHn3//ehMOMOCp+CvExlbQig81g0ysMfxOme6GuC4Z0eCkT TUu/d9fqvVZcnWNWQ7wK8wp4s759qeUdvbvZldr2SzOJxxjnaYmQUcqaMiCftedtxvqc6eEvh6V 2/otIBsHpB4kiKjqIhrcMoi35Ha6Cgz5/eZKUdTTgZz637Q3noKNhUr0ccn5Jfxw8ToS8RvyotV UV95iFmsaWO1HEX3mtJZXSs2E6rgfmNlxQGOKhxzPNXca6NARa6+Fhuv7ggmwAfSgk93LISs5XF hM3kajlMmTs3uYCS47LHB7IKBefKTs1fqafXPPMPIoetucgak20ThTvgWstkxOGsP1kKCSeHhoE c+TWoi/ayZnFRVOe6fMsFKaudLWKxIABqPpWThxaWS+5IYh+GURwV5G8WPXwoc9DSz7OghSe/c6 oV6Dof/Cy4QWgV5QlHtrvNcl8yAm3mkFikeJOkAHfL5nV7SsTNheyFbzBG+LeCKT8GSf1hyo+hE j1JSnKhhzQ= X-Received: by 2002:a05:600c:c494:b0:489:e126:b757 with SMTP id 5b1f17b1804b1-48e51f41be6mr57650895e9.25.1778076154101; Wed, 06 May 2026 07:02:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 055/110] cpus: Introduce SysemuCPUOps::monitor_get_register() hook Date: Wed, 6 May 2026 15:54:27 +0200 Message-ID: <20260506135524.20617-56-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076260922154100 Allow targets to register their legacy target_get_monitor_def() in SysemuCPUOps; check it first in get_monitor_def() otherwise fall back to previous per-target helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-20-philmd@linaro.org> --- include/hw/core/sysemu-cpu-ops.h | 8 ++++++++ monitor/hmp-target.c | 11 ++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/hw/core/sysemu-cpu-ops.h b/include/hw/core/sysemu-cpu-= ops.h index 7b2d2d2610f..5b831393cf4 100644 --- a/include/hw/core/sysemu-cpu-ops.h +++ b/include/hw/core/sysemu-cpu-ops.h @@ -85,6 +85,14 @@ typedef struct SysemuCPUOps { */ bool (*internal_is_big_endian)(CPUState *cpu); =20 + /** + * @monitor_get_register: Callback to fill @pval with register @name v= alue. + * This field is legacy, use @gdb_core_xml_file + * to dump registers instead. + * Returns: 0 on success or negative errno on failure. + */ + int (*monitor_get_register)(CPUState *cs, const char *name, int64_t *p= val); + /** * @legacy_vmsd: Legacy state for migration. * Do not use in new targets, use #DeviceClass::vmsd ins= tead. diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index a222fd4c96a..46ccbd14aec 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -35,6 +35,7 @@ #include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-machine.h" +#include "hw/core/sysemu-cpu-ops.h" =20 /* Make devices configuration available for use in hmp-commands*.hx templa= tes */ #include CONFIG_DEVICES @@ -85,9 +86,13 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const c= har *name) } } =20 - ret =3D target_get_monitor_def(cs, name, &tmp); - if (!ret) { - *pval =3D (target_long) tmp; + if (cs->cc->sysemu_ops->monitor_get_register) { + ret =3D cs->cc->sysemu_ops->monitor_get_register(cs, name, pval); + } else { + ret =3D target_get_monitor_def(cs, name, &tmp); + if (!ret) { + *pval =3D (target_long) tmp; + } } =20 return ret; --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076307; cv=none; d=zohomail.com; s=zohoarc; b=ebZJDDSwrVcpNaI2qVGNNZVhN023A4PiBox8DNOgrAEObFBn4QdaUNSa119jsElW8WqoPJN3KhSWKndgCJyQ8VIKqk57/zFH3BjygBu6y8/LyEdJeSrbGXIFpd6Rr6RHSnjeyCPROpwwFSsrQRqUdR8W16y0qt9F8g+/TS9YA7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076307; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=wnUhPBvByi3xklzN4tpBvRpQo8+T/x7M5oAr/ykzJl8=; b=k8yU+BCLh5qFtg/25yzVTXe1q8b8jW9nvfgJLGruFHEPTmEjR6brYVVl+2PdcvQfcm48BpDyxM2CynrboyVencHEQhRcm3zaVTIboQhVY/einPZrfyegXNps9PcGz0i/r1P9XeN9NdyouOxRNsOILxExRrddxJKtuW8pggoxoJY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076307687600.6214078442615; Wed, 6 May 2026 07:05:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcrT-0001KK-O7; Wed, 06 May 2026 10:04:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcpq-0007RD-Rv for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:50 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcpp-0000xM-96 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:46 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-44b052142e1so2792068f8f.1 for ; Wed, 06 May 2026 07:02:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4504f4857ffsm12380903f8f.0.2026.05.06.07.02.39 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:02:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076162; x=1778680962; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wnUhPBvByi3xklzN4tpBvRpQo8+T/x7M5oAr/ykzJl8=; b=SrcT0UjSGOPSrytkcG8EYbLB9eu0IGqZEDKS/gwL8zG+FGa9MiG/UzKfYEjXxtsKSc 5qg4424Me4BMHecZQP7Sn2knNOzZwdEqpQnc7ZpjQ+5f/A4Og3MctJom65vs7UQDfV5h sYvc/mOVLPzeaTZ1Ubz47nFCYJMAjhZpPPcin0cLGX9cafmsbtyUMh46sDq0Jd4gLnGB OBvaKmJttl59saHgeoLpGk05btMFCgXXSHt8ATZRIBsEh2YeT26w07h2Jf/EpG2lUZ30 0TyPNnX15eKKPi/iye91+IBtGuiOr+OQat054n8V6TrUOV/igVdXUrkKUu7bWhXSUfC+ px2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076162; x=1778680962; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=wnUhPBvByi3xklzN4tpBvRpQo8+T/x7M5oAr/ykzJl8=; b=jYCjfsvoymlfoB+Ag1S80lvjm2NBfZwKQWjgB0Okgvgdvz/UsUgg2RrnK/nRhC9U9u 47mpkQXkX+/jyvYVv2/2V5QcH+Ll8yZo/aplXyjgAe8VJSrJhM1KwNrhpH9Fg9oCwh/7 dh9uahGDaMfrIA0C9UXPoWuyVhYi/v4NuDfQPEmbvAFae19ZvZ0M8yD6Iy6A2bTXXD/y d3s2s4sUVAm5dIWz7NE7DC1dz2tNzOT/kalgUBhgHqZ0Zs7eFlugzWV6xMOIwrXyGs7x qHXxQaqsW7bpy4h5IyjQnrTSTTQPBViIm9Q4v7ymLUe3YerbO01QpiUbge43z8D2hGx0 1qTQ== X-Gm-Message-State: AOJu0YzJAyJbgjuQXVmuG6ywBSodmiVROaOL6vbsv6TEIxH2vRK0t3aj z9rfQqkQ4PRtQY1EOn3CVoUXrhE+4CP5okp5o0x/Cljjc7nOhic+WgUI2poOZZmltBU2QW38M52 ESHbLEDY= X-Gm-Gg: AeBDieuAf2ilmLWfNEcBJP47le/gTTJI9/Adl0jOEEWzmi6QD4UENgPIXQ3GOyqRx+Y BBBrZ4Jl0AThwOejwXmYB8/J7PXFxs+Mvqzl7kkj0UbRRmFSGRUeQ0Yh52Ns6TBbi7s05F6ThCf h4cPn7rb/ihAiYPr4QMJXBGgrh2CUXkC340bQ9MXvzGAUZ/GgnWBkfwCL4AzfxGYtsmBXNlK8Wg KqH6XnBaW5AHBTPEZIULYo8+XYNhJe1FrJW+0Q15v5w8UbgldRPa8tI9P6lALTpd8PnSBD8PUg5 cayhF1bvqGgBcaQLJmgTHE7/A16wc7M6SBK2icwwgaDwZSQmrM9h9bIRB3BupIS20FX25OMIUth lJ6Foc8axPD+WjeVI4J6iB72SANtKqDt0YgozeiP1PpRyxpXXKjfHVG9PaAWH5nKjiS4WsGb1JO D0GWTDmqvAfGG+b2b135L4b6GHWblc/7xCnYb1s0A9QT2FrtxohImsOyTiq3VxASEa8MeZFPFIt zGxr/eo+j6QcuZT7bOrrQ== X-Received: by 2002:a5d:584e:0:b0:44b:8fb6:9a2e with SMTP id ffacd0b85a97d-4515ce1ca99mr5598797f8f.20.1778076161604; Wed, 06 May 2026 07:02:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 056/110] target/riscv: Register target_get_monitor_def in SysemuCPUOps Date: Wed, 6 May 2026 15:54:28 +0200 Message-ID: <20260506135524.20617-57-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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: 1778076309650158500 Rename target_get_monitor_def() as riscv_monitor_get_register_legacy() and register it as SysemuCPUOps::monitor_get_register() handler. Take care to sign-extend values for 32-bit HARTs. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Alistair Francis Message-Id: <20260427080738.77138-21-philmd@linaro.org> --- target/riscv/internals.h | 3 +++ target/riscv/cpu.c | 1 + target/riscv/monitor.c | 11 +++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/target/riscv/internals.h b/target/riscv/internals.h index bac6c8032a2..8c24af0d855 100644 --- a/target/riscv/internals.h +++ b/target/riscv/internals.h @@ -250,4 +250,7 @@ static inline int insn_len(uint16_t first_word) return (first_word & 3) =3D=3D 3 ? 4 : 2; } =20 +int riscv_monitor_get_register_legacy(CPUState *cs, const char *name, + int64_t *pval); + #endif diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index ce15a17c37d..a13727c0d4b 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -2733,6 +2733,7 @@ static const struct SysemuCPUOps riscv_sysemu_ops =3D= { .get_phys_page_debug =3D riscv_cpu_get_phys_page_debug, .write_elf64_note =3D riscv_cpu_write_elf64_note, .write_elf32_note =3D riscv_cpu_write_elf32_note, + .monitor_get_register =3D riscv_monitor_get_register_legacy, .legacy_vmsd =3D &vmstate_riscv_cpu, }; #endif diff --git a/target/riscv/monitor.c b/target/riscv/monitor.c index bca04a7580c..3898595a3cb 100644 --- a/target/riscv/monitor.c +++ b/target/riscv/monitor.c @@ -27,6 +27,7 @@ #include "monitor/hmp.h" #include "monitor/hmp-target.h" #include "system/memory.h" +#include "internals.h" =20 #ifdef TARGET_RISCV64 #define PTE_HEADER_FIELDS "vaddr paddr "\ @@ -311,16 +312,18 @@ static bool reg_is_vreg(const char *name) return false; } =20 -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval) +int riscv_monitor_get_register_legacy(CPUState *cs, const char *name, + int64_t *pval) { - CPURISCVState *env =3D &RISCV_CPU(cs)->env; + RISCVCPU *hart =3D RISCV_CPU(cs); + CPURISCVState *env =3D cpu_env(cs); target_ulong val =3D 0; uint64_t val64 =3D 0; int i; =20 if (reg_is_ulong_integer(env, name, &val, false) || reg_is_ulong_integer(env, name, &val, true)) { - *pval =3D val; + *pval =3D riscv_cpu_is_32bit(hart) ? (int32_t)val : val; return 0; } =20 @@ -369,7 +372,7 @@ int target_get_monitor_def(CPUState *cs, const char *na= me, uint64_t *pval) * to do the filtering of the registers that are present. */ if (res =3D=3D RISCV_EXCP_NONE) { - *pval =3D val; + *pval =3D riscv_cpu_is_32bit(hart) ? (int32_t)val : val; return 0; } } --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076713; cv=none; d=zohomail.com; s=zohoarc; b=Xa9Fh4AKElVijTqNf3B5wuDmS9rZlbcS8KpkHi1o4MF5y8BqYaMjUO+WsbV0JF0FxWuPTyrtLes1ZfI4LYx2SPSLBSRxjDkTN+xufevKbJVPkLlYGKW3Ah9rNn5zTy5tGRCuZDlKyUCW8JbtQ+t+dB732ihWdz6sDGav8VQzMqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076713; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=saeNhd6CtyK007geaZog+ztTZEhGq2PWC7iHo/mMXE0=; b=HczDJ5VQB99ww8y+sRllpqKwqzYFjBPC2DAt3aW7KUX2JW3dWNFVxd0hKdyM3EFrQFcull0G4q6KLVBqQ4uy8Prd7N+eOoPeekHivgCqJqg42EKBEYctDltNOAOP+iTmfM39vncR7jue2Q5nHl75vbAcnmvBed9XxCPZ6tLmYpo= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076713102822.1233802823681; Wed, 6 May 2026 07:11:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcra-0001gU-Rx; Wed, 06 May 2026 10:04:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcpy-0007bb-N0 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:58 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcpw-0000xw-OM for qemu-devel@nongnu.org; Wed, 06 May 2026 10:02:54 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-48a563e4ef7so62758095e9.0 for ; Wed, 06 May 2026 07:02:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538a517bsm52904675e9.4.2026.05.06.07.02.47 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:02:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076170; x=1778680970; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=saeNhd6CtyK007geaZog+ztTZEhGq2PWC7iHo/mMXE0=; b=DKDNr26rXhrRUD+1bq2ivGAQfYbptPhi63p8hi/7Ra7syopIjsvhxYKS7aD/uqP+QA 12+IL2dNYFL4c2kgX9vCV193nrtbUz4f9LaGYisMvTP4ORIYWzC2K0wbSZSdUL3U55Qj WtC/gKQf06LQNUfRaftSb7LadZX1nOJhtumGVwllntNnFzJ4cyUETxqsCdp3wwDaViiO uMpI/RKV07WAcfVkfiv9b3bjx0Egg1e35gags4PSTmzGDgob5MUgXGL72C0lJCUhvnOE Ymjsv3yJflcVENK06McfSNkswb8ALdDe0mIEiLXaAwm63xBzZ9QN5CNeOylvWCBuvZZB Hn7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076170; x=1778680970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=saeNhd6CtyK007geaZog+ztTZEhGq2PWC7iHo/mMXE0=; b=Lah+MqMekC/qVslrQSy6XAH+hzkSD6uT7s2pcEqet8cc4tMVFcb/hZXp4WKAfza9Na 6D0FoMmyPWktlUgBzbBvkjFu0AwW5MrdL4mhIIzkwEjE9IwzhtgN3gV0odHBFKcE6H2T 92XAs0MuXD5dEgZO4FbdlY39UmTXKFkjV7acZuHwGwa2DztT1dQoa6VYbQkMPfQNBEl0 RDC9XCxSbG2Pog2tQJi91JJeDKtMB3XmD32GOxkJi2UfVbXXVAok6GIouQUVE0HuYshP NYEAZy3+LCXaC6hUQbAcL3m7hEauVH957/pOFP9cluhBU6Ib2VAca2PDjqHFDYf43bk+ zkDw== X-Gm-Message-State: AOJu0YyA9WVY+RH3OSQtVieYSNWnkS2dqioVgvZF/0qyrpQhEtki++uQ UC8ytP3VW+JDV6urFMyUZejs0lqMZV7LLMHzUih/uCA03pJa9m2nHSqixSUgsKAjHbYbosrSw+6 R9oh26q8= X-Gm-Gg: AeBDieuXV+k3vhChsmn5u/2qxyhD3O9IKQtfLc1I5w77wDcslHSgKVH+uZJNHvToQ9p 9G/ZUtaXiyDhqkszt5hBb2x+XB2C68F6nziDdGSKtRawGoiDVsN2Q/ddNXwSBC1APSNa/UPjEgl DXdyyUjNsNO79hzcwsAaxqfxpYd5aJaxwtuPzmfsh0nQ3gQ+Tuik/i1cx11KAqQtowgrEYa2sNJ BUGU2jqc8ptKDYEfV4hljdG8S3YrLaVkdEZyNyvXpm8fqa/stmRpFruusazpCbM81kSD9FTpKPs 0lDQHF4X4jw3NrTgHabOcoFarQ+MrmHAEU4JC7oleiEd/DZT9g0adfneBawzTVZI8I8FoCb3048 GKGLfD8semiGl4USe6had2jD7bWJAaCfwwEmzQb1OmrwsbqHzJhBjRkPxhe+037x8ucKz4MSUeX 8giryeA78ipCGD1I+jdEizWaDWPIRgsJzB2uu+dWnRaMT6dNiBqZdsXWslSwRdCWSpZpeRVcFuF QxUpDLYtpm9ZOJAEWpyjQ== X-Received: by 2002:a05:600c:a111:b0:480:1c69:9d36 with SMTP id 5b1f17b1804b1-48e51f2f83dmr48314645e9.17.1778076169792; Wed, 06 May 2026 07:02:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 057/110] monitor: Remove target_get_monitor_def() Date: Wed, 6 May 2026 15:54:29 +0200 Message-ID: <20260506135524.20617-58-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1778076714650158500 target_get_monitor_def() is now only a dead stub. Remove as pointless. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-22-philmd@linaro.org> --- include/monitor/hmp-target.h | 1 - monitor/hmp-target.c | 14 +++----------- stubs/target-get-monitor-def.c | 29 ----------------------------- stubs/meson.build | 1 - 4 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 stubs/target-get-monitor-def.c diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index ce0bb1983cc..008c1a6570c 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -38,7 +38,6 @@ struct MonitorDef { #endif =20 const MonitorDef *target_monitor_defs(void); -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); =20 CPUArchState *mon_get_cpu_env(Monitor *mon); CPUState *mon_get_cpu(Monitor *mon); diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index 46ccbd14aec..c2ddcd67e51 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -66,8 +66,6 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const ch= ar *name) const MonitorDef *md =3D target_monitor_defs(); CPUState *cs =3D mon_get_cpu(mon); void *ptr; - uint64_t tmp =3D 0; - int ret; =20 if (cs =3D=3D NULL || md =3D=3D NULL) { return -1; @@ -86,16 +84,10 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const = char *name) } } =20 - if (cs->cc->sysemu_ops->monitor_get_register) { - ret =3D cs->cc->sysemu_ops->monitor_get_register(cs, name, pval); - } else { - ret =3D target_get_monitor_def(cs, name, &tmp); - if (!ret) { - *pval =3D (target_long) tmp; - } + if (!cs->cc->sysemu_ops->monitor_get_register) { + return -1; } - - return ret; + return cs->cc->sysemu_ops->monitor_get_register(cs, name, pval); } =20 static int diff --git a/stubs/target-get-monitor-def.c b/stubs/target-get-monitor-def.c deleted file mode 100644 index 394e0f9a7d2..00000000000 --- a/stubs/target-get-monitor-def.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Stub for target_get_monitor_def. - * - * Copyright IBM Corp., 2015 - * - * Author: Alexey Kardashevskiy - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, - * or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#include "qemu/osdep.h" - -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); - -int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval) -{ - return -1; -} diff --git a/stubs/meson.build b/stubs/meson.build index 2f4e1ab4300..3489b1f20dd 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -75,7 +75,6 @@ if have_system stub_ss.add(files('igvm.c')) endif stub_ss.add(files('kvm.c')) - stub_ss.add(files('target-get-monitor-def.c')) stub_ss.add(files('target-monitor-defs.c')) stub_ss.add(files('win32-kbd-hook.c')) stub_ss.add(files('xen-hw-stub.c')) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076259; cv=none; d=zohomail.com; s=zohoarc; b=dwtAM9VeJIkwcRwXI/HNNhaviyY8VExmepv2eTkPdDLreDf5571GT5BlEiFttjYI1Vlfiy0Z5dHdDAZQoUoE6rJa0lgfepghr1jpalPYVYMHmtJ7J1HBgQbBCTGePaYwHXraRrS2INyzUgT4g7IMY5rHJ/68aE0fZ4APXwTVko4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076259; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=M8r5iA01i1XHEti0t8TY7QQtNNhBKRygBi+/ersf6DI=; b=EGd9wuNqjLSHa+S/uuoK6HsY6EELcnSm9KBfkzNqhlWSgjrmyC3ERf5KkdOX7+7QHaZsr4kDUaRynYsOqiBYYYqBCURBnAdiwls4z7h9KUf2fQo1Z5vaDAo+6o8Ms+0r0aKWlVN4Eg8bskb/zqeoRDpwdOQ2czfK/HpFp+IqH90= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076259047122.63479110508126; Wed, 6 May 2026 07:04:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcqg-0008UX-Vh; Wed, 06 May 2026 10:03:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcq7-0007kO-1x for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:09 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcq5-0000z5-7t for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:02 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-bc56c52a0d1so120731766b.1 for ; Wed, 06 May 2026 07:03:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960973sm12666305f8f.30.2026.05.06.07.02.55 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:02:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076178; x=1778680978; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=M8r5iA01i1XHEti0t8TY7QQtNNhBKRygBi+/ersf6DI=; b=JydtjFOmhTv2ZYBqlbm80S6DO5VRT+DDVgbQTf4RiawtzhdFwCD5/1SEWxZFKtq0v0 t9XFgo2lkF6/8xs1RmH0Wg+oXMhbiNF1VfkaK963ekGqjasKWliYBn7HZLn+dPCIMfAN cKEqKuupXnTBw9biVyyQZj2rW9prTOVlahNwLSdgF7U219iEQYsPoc7x4b7KWyRMIE1m a5n1fHcRfDumUPqURikJuhEIFHEfAJNM5JYITdwt+a8kopvtCgErEuPJnpRUW5/aHRaP QK+t6mVLyPcBb3VP+DZLc/NIkaRS06Phti9rdbqe4aXG1gk4Tj5iFxjq34dVsMGbIi68 yKeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076178; x=1778680978; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=M8r5iA01i1XHEti0t8TY7QQtNNhBKRygBi+/ersf6DI=; b=RonwALBDW59b4mD1JkC0ybxnRuFvKqJLofxcYO3tblm/+uVWjHXgkDMdmL7luJUixo umOLwTM0jt+tEJJL7LCgbOfslEwk5xTiGxI7+hjVg8SXyc4QIkhYhG5t2HJHDHzlP21d cbW55JX/WnsnE6WC6Pc6SzfuSO+8tx0Zrd7b83HJhXvsR1hlACdwE3SbYLE9dM1jw9LJ uulQyGVLP7NiN/h67V1aEXISZ1GveAQEH+jiX6wMwE9jJ1UoiM3rXtZclGrrDOihx6fG 4hM1QF+uyKAvbBlzewS8TjZaQ6LEtLw2d+x7lP9KXSRLJFaBmrD3WcEe9rRCDYNUjIEf Jjow== X-Gm-Message-State: AOJu0Yxct/cuCpPsQsHj8ZAEvvHdLhsPpDBiAUPhvhiaJJmYN+TtS5xf 776iSzgqu+lWF6vV+QX2xVbYRGmA4bv8jcXGJirN+zwhNfkvqmSum0f4Xfjod+/MqwB3DblDUIp lktWhMM8= X-Gm-Gg: AeBDietBJtOw32i1I83CWz+SpCT5wMXZ5QmhQUYRDWEkvlreZbm+09rBmLgwAYBGvyI POBnMwdRpsLGgqB5/dvskDojMwVdcfi8l6YBvSqX83qaJW0rpjxz94XPoMm/IVt3E/BHIQNV5Db WwR2ccErhDYNqGrbzp5ZwExDhDG6PpR9fQ0tJpzXqkr9+zh63vwK18LQwUtRG/SiftwtkZYzqx2 Lh3UQLrAp8FGWW528IU4awANGGxqqx5+BvLuLHze+UJXSUmjZSQCDCtiHln7ZvCabENfsT4jRmG Hl0ZUUBS0bj3R8SvCj8jYsE9DT3kg63wjovrrgdDMeULROJ7aUcOZPf0UAtp5DrPPty7sZ6qH4T XkfD60dYamFhc6UZcP49MN7XJAgMbgQMDu/prYQd+Q4zCLp2XmYKYDmvwKWidIZvXoVhTE8FEwo z9erlyu4lzyk4JwdYWQJpxoiumSwIzJRi3YIwBTAfPzwXr7/nKWDtonQklPiYGnQy/RnU0wiRbE jdPdIKjwxYi3KcmlLZuSg== X-Received: by 2002:a17:907:c817:b0:bae:456f:fbb2 with SMTP id a640c23a62f3a-bc56cd3b1ccmr205961466b.23.1778076178001; Wed, 06 May 2026 07:02:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 058/110] monitor: Have MonitorDef::get_value() always return int64_t type Date: Wed, 6 May 2026 15:54:30 +0200 Message-ID: <20260506135524.20617-59-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.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: 1778076261182158500 Simplify MonitorDef::get_value() handler by having it always return a int64_t type. Let the single caller (x86 targets) sign-extend the returned value, directly handling 64-bit CPUs in 32-bit or 16-bit mode. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20260427080738.77138-23-philmd@linaro.org> --- include/monitor/hmp-target.h | 6 +----- target/i386/monitor.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index 008c1a6570c..ae34ca65ded 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -27,15 +27,11 @@ =20 typedef struct MonitorDef MonitorDef; =20 -#ifdef COMPILING_PER_TARGET -#include "exec/target_long.h" struct MonitorDef { const char *name; int offset; - target_long (*get_value)(Monitor *mon, const struct MonitorDef *md, - int val); + int64_t (*get_value)(Monitor *mon, const MonitorDef *md, int offset); }; -#endif =20 const MonitorDef *target_monitor_defs(void); =20 diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 977f65fe16c..98df5c7fd12 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -593,11 +593,16 @@ void hmp_mce(Monitor *mon, const QDict *qdict) } } =20 -static target_long monitor_get_pc(Monitor *mon, const struct MonitorDef *m= d, - int val) +static int64_t monitor_get_pc(Monitor *mon, const struct MonitorDef *md, + int offset) { CPUArchState *env =3D mon_get_cpu_env(mon); - return env->eip + env->segs[R_CS].base; + int64_t ret =3D env->eip + env->segs[R_CS].base; + + if (!(env->hflags & HF_CS64_MASK)) { + ret =3D (int32_t)ret; + } + return ret; } =20 const MonitorDef monitor_defs[] =3D { --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076276; cv=none; d=zohomail.com; s=zohoarc; b=XEgj8uXFuxn+UB0W4vJMXe1yVi6KJbDRmAxz6A2JyrtNi1eZV51+k6wEytA7Qf7XBIuZQwNeEWvYW9zSe589ec9wVn0hM2/EV9GWdTtP7dcyMlHJUjbKVEvdEI+Mv0U5CoGo7MzPkk/YGQwmY4jBmwCQ4UyE0ebXQoG81MYEQvA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076276; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=z1Lz3snRDZps6xEPaL3FOpR5bACe7einw41sePh+gEE=; b=Bkgfc/7plAfRSuuhn7T31OpuhH26u6Q9Ek4Py/YuKB2j6FVVH613JRORk6m5KHXjTuERbeiC47HwDvOUcTDRqSMUULpmQQSG6KTo8ku5hai2eA08sZpAOUkR3Akyjf/nRD74iMdF+fpscKSD5kIcAn2mNKHGUJW2Wgx3ynvOwak= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076276319409.4794509049224; Wed, 6 May 2026 07:04:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcrE-0000ZS-NF; Wed, 06 May 2026 10:04:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcqF-0007rF-Jt for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:13 -0400 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 1wKcqC-0000zw-PU for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:10 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4891c00e7aeso55422855e9.2 for ; Wed, 06 May 2026 07:03:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e530c1e84sm18231685e9.10.2026.05.06.07.03.04 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076186; x=1778680986; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=z1Lz3snRDZps6xEPaL3FOpR5bACe7einw41sePh+gEE=; b=bKwMqzSvp5PDWRB/DoCqBkRo9AAkD2q6d2nLicfqVEz1LRkVewPZdU2vd+bqbvhE8X SUo8IFRMr681ZS6t1wl0iWM9aV3LWI79/ZbQEVn1JQoL3z/6o51WZ181wyTc5pQwXLWS l92RGG3uq73PSTDpWiLTKOVU7fFhq2mFLQUnil1yi0HsGeDeIT4v113DiOEk9vXon87w NuAmt6ua9fvgxKqt1yTlbvRFPefDp6F9Y4U1V5bD1vxa+sPlawdCfJ926Bk4iPPa7Q5F HPD6NqOlNAr4sXogwHT+ZTyA9XCilT5HE/R5+uPNo12XAedTilgjYs8v9F2Mt+Pj5vDn ukqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076186; x=1778680986; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=z1Lz3snRDZps6xEPaL3FOpR5bACe7einw41sePh+gEE=; b=pEmUBu0LCPgd8H5qFMtHMI7GPFAtZi4H12fIp4EaQQYfLMqdaBoudFg1hf6CeXafNG jkdmkUccB7X0JRbAgKF3MvBXMGpjKalRd44HNyIt9nXhLYFJF5IW6DqvR5hqmfmcqafq O9HpwjpvNtDrTiP7Fwt1hVy+YguTsI1nLEQhP+ZXpGjERwp9h42PtnGPlXA9NHCofSJ2 Kc5+4rLrZLC4svUsKadx8r69wiEAQ6EzCk8H+llpNaTqaGGiZMlTgF3PTx76W7ATG72T dWuMRzUH1/rD/zZ8DyVjVFH4NlcwrQJm+cNCZLwdw1V1rHc/dzkWPIgg0COlChrOgwks CDHA== X-Gm-Message-State: AOJu0YxsjND9hbnHJjoezG4ZNGGURJrX8W6C818FvWQ5tfl6ZKfzGBKw 2qAom1R6mIsf4EdouTyVU0CVM0In5N/wAbliPME+P2KCFX5hcy+/XohE+EAO0YoSnfw3DP5hHjT zfIqdtlA= X-Gm-Gg: AeBDiesIrUrRqIexeOlUfym5HNU3m+EzRBk94FTZwe2K1wPsTaTFs9K8t109Xw88umW Nrxfkgt64iTjAcRXhm8aJM7vwzWtEc5roBSlLuHypqzNz/f11nYxe96dRl/m8Jtmtw2eFYNkpWo 9qne1fqt8/OBKrqQVGoRBuCBnAM+M0Vv8BfzLjHpHBKQtiNEcrf5xn4xgXUMjZ6RLJENbFBZ7sQ XVme4ZY3Rv7P94iwC+O3FE1vRq9U2Xde8bs02PghhtE5icpBYMQDf+BlrV7AercxNdOIwUsQ0Fr 5iRSRlW9DwkUaYWxZKpvF4oCU4yKe2TuJ+J4YVCa6IdOFwQKFzjYFkbp19R9wGLuybgldkqqO8F L3os4NCmKQh52AyYrebY9dVl0EyoMkDIfJVgdoZJIsTxxTT3MRAgbDul9dgnFRfAs4Ck56p85tt FjxFxO9nir0CFGZS0RJwyYweiFtb7CkJU8QcCwn8D618t/vVDqiVF5brdFdHoTuqP6V4TDCyiqo ZYRZ31qTS8= X-Received: by 2002:a05:600c:8485:b0:489:ecee:c4ef with SMTP id 5b1f17b1804b1-48e51f2f874mr66555805e9.13.1778076185935; Wed, 06 May 2026 07:03:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 059/110] monitor: Reduce target-specific methods further Date: Wed, 6 May 2026 15:54:31 +0200 Message-ID: <20260506135524.20617-60-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076277340158500 get_monitor_def() doesn't use any target-specific declaration anymore, move it to hmp.c to compile it once. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20260427080738.77138-24-philmd@linaro.org> --- monitor/monitor-internal.h | 1 - monitor/hmp-target.c | 33 --------------------------------- monitor/hmp.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h index eaf9a607783..a5c4aba306e 100644 --- a/monitor/monitor-internal.h +++ b/monitor/monitor-internal.h @@ -191,7 +191,6 @@ void monitor_data_destroy_qmp(MonitorQMP *mon); void coroutine_fn monitor_qmp_dispatcher_co(void *data); void qmp_dispatcher_co_wake(void); =20 -int get_monitor_def(Monitor *mon, int64_t *pval, const char *name); void handle_hmp_command(MonitorHMP *mon, const char *cmdline); int hmp_compare_cmd(const char *name, const char *list); =20 diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index c2ddcd67e51..550a7178052 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -57,39 +57,6 @@ HMPCommand *hmp_cmds_for_target(bool info_command) return info_command ? hmp_info_cmds : hmp_cmds; } =20 -/* - * Set @pval to the value in the register identified by @name. - * return 0 if OK, -1 if not found - */ -int get_monitor_def(Monitor *mon, int64_t *pval, const char *name) -{ - const MonitorDef *md =3D target_monitor_defs(); - CPUState *cs =3D mon_get_cpu(mon); - void *ptr; - - if (cs =3D=3D NULL || md =3D=3D NULL) { - return -1; - } - - for(; md->name !=3D NULL; md++) { - if (hmp_compare_cmd(name, md->name)) { - if (md->get_value) { - *pval =3D md->get_value(mon, md, md->offset); - } else { - CPUArchState *env =3D mon_get_cpu_env(mon); - ptr =3D (uint8_t *)env + md->offset; - *pval =3D *(int32_t *)ptr; - } - return 0; - } - } - - if (!cs->cc->sysemu_ops->monitor_get_register) { - return -1; - } - return cs->cc->sysemu_ops->monitor_get_register(cs, name, pval); -} - static int compare_mon_cmd(const void *a, const void *b) { diff --git a/monitor/hmp.c b/monitor/hmp.c index e881c26c305..fe2f5560013 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include #include "hw/core/qdev.h" +#include "hw/core/sysemu-cpu-ops.h" #include "monitor-internal.h" #include "monitor/hmp.h" #include "monitor/hmp-target.h" @@ -359,6 +360,8 @@ static bool gdb_get_register(Monitor *mon, int64_t *pva= l, const char *name) static const char *pch; static sigjmp_buf expr_env; =20 +static int get_monitor_def(Monitor *mon, int64_t *pval, const char *name); + static G_NORETURN G_GNUC_PRINTF(2, 3) void expr_error(Monitor *mon, const char *fmt, ...) { @@ -1599,3 +1602,36 @@ void monitor_register_hmp_info_hrt(const char *name, } g_assert_not_reached(); } + +/* + * Set @pval to the value in the register identified by @name. + * return 0 if OK, -1 if not found + */ +static int get_monitor_def(Monitor *mon, int64_t *pval, const char *name) +{ + const MonitorDef *md =3D target_monitor_defs(); + CPUState *cs =3D mon_get_cpu(mon); + void *ptr; + + if (cs =3D=3D NULL || md =3D=3D NULL) { + return -1; + } + + for (; md->name !=3D NULL; md++) { + if (hmp_compare_cmd(name, md->name)) { + if (md->get_value) { + *pval =3D md->get_value(mon, md, md->offset); + } else { + CPUArchState *env =3D mon_get_cpu_env(mon); + ptr =3D (uint8_t *)env + md->offset; + *pval =3D *(int32_t *)ptr; + } + return 0; + } + } + + if (!cs->cc->sysemu_ops->monitor_get_register) { + return -1; + } + return cs->cc->sysemu_ops->monitor_get_register(cs, name, pval); +} --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076307; cv=none; d=zohomail.com; s=zohoarc; b=YnHDabNAeVjQP5PBpppRGCVunQBDhfcwTtZZ85Rk7uN2AJlIbIlFuuVgCg/Hj51uG8mzdbDdgmFs8F+cxJp9L7jxHjYYfnyhlIOcuO1xv0podedN3fD3tR9ZInLNam5UJ70njsB2KTrz9DO4woUk/b0P/4VWpuqrYC3bwvKaBBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076307; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=1MUF+JGVoH0IQ7xVChxpoSkYG7Gzm4cBynDqRT/Hre4=; b=n7vsbeUKyW3Uz8KVHaxcI7BrOStyB+aQ/PbSyhaJHIPsdj8NC3U+mKQnTQmytfjcqzpPLpjwGpbub7EH7Q3lRLgwYxLB5J+JWei0H8GtKHenmNOwpR2MDqigU0cxadOwfLuwucsncmgE+uUVHbCaIO+K2lkXfYtmm1ifPSYpH8Y= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076307075646.5954688460994; Wed, 6 May 2026 07:05:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcrF-0000fb-EY; Wed, 06 May 2026 10:04:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcqR-00088R-As for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:27 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcqL-00010d-8n for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:22 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-48d102471a4so32530405e9.2 for ; Wed, 06 May 2026 07:03:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53141f0dsm18026445e9.25.2026.05.06.07.03.11 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:03:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076194; x=1778680994; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1MUF+JGVoH0IQ7xVChxpoSkYG7Gzm4cBynDqRT/Hre4=; b=ahjIl7kYi5b0P/5MRJW58Ei6yCBNYpB2d8YpjIQwxqPOwx/E0cjmi3ua4w5ZFsNQAg y2imukNoI5GCei3omWG0drvpFQyZYd+X2rGp2sAvlgmNtu66VUOo+KT/4ywY0fT6mMk/ rv8GK1DEK4JTgYTABuyu2scLiSq02nUg0nttX0pMPEs39XNy/BI+CC+9Kxvcdy43unAI JsZv9qkbx8EYMxOjGLU2WlpPGtZkN7aXB5Ca0HQrc8N9FaGkWanPlF0k6rC6O5Obmxf6 quBhG6YH4LRtcc5OiI3uCLfbPFtbnO+t0Hoj1Mty30YrNzvxXHMqZRIboghfZwtRYv5P VBdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076194; x=1778680994; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=1MUF+JGVoH0IQ7xVChxpoSkYG7Gzm4cBynDqRT/Hre4=; b=Qc4oxomY61kwVZW3+RiQ8cNQXPNSyxA0K3zMLUMxnku+QYIAIVxoHaZZAjZvQ0BJWC 9FI7RioXtw7Zeqx6AwLDZY37XgVBuHVKC8QInAs4Sl1RtUDLfGndb4GfRVTS7cfCCYEZ rVqAknlg6SC2gLuKerOs/y3BXlaHKd4udbLoknQ1x1AlxkZKesy0Soei09Cl+fD9bjLl YmGvta14Z39D7BuIEpE/sOnbPUCx+aMLxknkRGVN0o0XFtkUA+vdMK3SIb2SyS14vyZP 3Nphxh+zJwvqr4o38/cwK2wP+gCj5s55XQoycT05vcuWwF1VX5bj5HVKpG1ASJNXCU8u Pblg== X-Gm-Message-State: AOJu0YxaZu7Smn6YLc1EGDaQQtoZ2yrjY0qou6gHtvKnOYyMzpYjuH/m u6EIi+DEdvx1UmuS6oqbmeE6L6nFLaol4Q+kXzL5OsEJqFWfKmg15HEwPY3Uhau2JMf72EPLAPb +dfkJuok= X-Gm-Gg: AeBDieupuH5Jikg4sR+xCqEzSFha60yZkqdEqlAe2sIbOd4emRBfzfZb5TVEHN9RJwf HmRDHIEIoBPbcHm9lnXAn+uthFWQ9iugucZYH2ekvwOgP7yRAOLphZ/rdeL243oqAArmdcdRjDs vo60mZes1XSj8vIuZvzLQZX62/K2tdbKwHBLFJR3XE1O8lE+o8PsStROFwy2V0V2M1LOAdvk0Cm 1mSzdMvx/29NbPe0FFReAdfMg05HTKgxzeaFGZRgkhJEzjIBW9FbvY7xFDhs5WWL8kKyqZYfa2a ffACMsxvE2UaSM1jEUXyTkQtpnp32SjbnevX6hCBsGfBUy/YwRma7S4JV9Rtt6ZQY/MjWjux/of JENsDB3L5ptkV5gXB0tDPXGDwX6q+beiIdpdTUQKv85JpWQVGN9yutXzt1gaXTmLRRiEMJxJUs8 3aX649BdSWMdN3m3a4y/vELPcXWWPwXLLJhcf48Z9QDV72TaIYGUrnUFr1xrlbk1PHhZW2ZhBac lTnXYHyBBg= X-Received: by 2002:a05:600c:3b17:b0:48a:5970:2003 with SMTP id 5b1f17b1804b1-48e51f18594mr61951915e9.3.1778076193558; Wed, 06 May 2026 07:03:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 060/110] monitor: Remove 'monitor/hmp-target.h' header Date: Wed, 6 May 2026 15:54:32 +0200 Message-ID: <20260506135524.20617-61-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1778076307756158500 The "monitor/hmp-target.h" header doesn't contain any target-specific declarations anymore. Merge it with "monitor/hmp.h", its target-agnostic counterpart. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20260427080738.77138-25-philmd@linaro.org> --- MAINTAINERS | 1 - include/monitor/hmp-target.h | 41 ----------------------------------- include/monitor/hmp.h | 11 ++++++++++ hw/i386/sgx-stub.c | 1 - hw/i386/sgx.c | 1 - monitor/hmp-cmds.c | 1 - monitor/hmp-target.c | 1 - monitor/hmp.c | 1 - stubs/target-monitor-defs.c | 2 +- target/i386/cpu-apic.c | 1 - target/i386/monitor.c | 1 - target/i386/sev-system-stub.c | 1 - target/i386/sev.c | 1 - target/m68k/monitor.c | 1 - target/ppc/monitor.c | 2 -- target/riscv/monitor.c | 1 - target/sh4/monitor.c | 1 - target/sparc/monitor.c | 1 - target/xtensa/monitor.c | 1 - 19 files changed, 12 insertions(+), 59 deletions(-) delete mode 100644 include/monitor/hmp-target.h diff --git a/MAINTAINERS b/MAINTAINERS index 1eb7903268b..c4f78ac07f7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3415,7 +3415,6 @@ F: hmp.h F: hmp-commands*.hx F: include/monitor/hmp.h F: include/monitor/hmp-completion.h -F: include/monitor/hmp-target.h F: tests/qtest/test-hmp.c F: include/qemu/qemu-print.h F: util/qemu-print.c diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h deleted file mode 100644 index ae34ca65ded..00000000000 --- a/include/monitor/hmp-target.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * QEMU monitor - * - * Copyright (c) 2003-2004 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - */ - -#ifndef MONITOR_HMP_TARGET_H -#define MONITOR_HMP_TARGET_H - -typedef struct MonitorDef MonitorDef; - -struct MonitorDef { - const char *name; - int offset; - int64_t (*get_value)(Monitor *mon, const MonitorDef *md, int offset); -}; - -const MonitorDef *target_monitor_defs(void); - -CPUArchState *mon_get_cpu_env(Monitor *mon); -CPUState *mon_get_cpu(Monitor *mon); - -#endif /* MONITOR_HMP_TARGET_H */ diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 930ffa31aba..357fc972885 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -24,6 +24,17 @@ g_assert_not_reached(); \ } =20 +typedef struct MonitorDef { + const char *name; + int offset; + int64_t (*get_value)(Monitor *mon, const struct MonitorDef *md, int of= fset); +} MonitorDef; + +const MonitorDef *target_monitor_defs(void); + +CPUArchState *mon_get_cpu_env(Monitor *mon); +CPUState *mon_get_cpu(Monitor *mon); + bool hmp_handle_error(Monitor *mon, Error *err); void hmp_help_cmd(Monitor *mon, const char *name); strList *hmp_split_at_comma(const char *str); diff --git a/hw/i386/sgx-stub.c b/hw/i386/sgx-stub.c index 2b083c77bc1..59d58926311 100644 --- a/hw/i386/sgx-stub.c +++ b/hw/i386/sgx-stub.c @@ -1,7 +1,6 @@ #include "qemu/osdep.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "hw/i386/pc.h" #include "hw/i386/sgx-epc.h" #include "qapi/qapi-commands-misc-i386.h" diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c index 5e792e8e6e9..7e4c509f5a4 100644 --- a/hw/i386/sgx.c +++ b/hw/i386/sgx.c @@ -17,7 +17,6 @@ #include "monitor/qdev.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qapi/qapi-commands-misc-i386.h" diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 1b44d07c18d..682bb62e91b 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -22,7 +22,6 @@ #include "monitor/hmp.h" #include "qemu/help_option.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "monitor/monitor-internal.h" #include "qapi/error.h" #include "qapi/qapi-commands-control.h" diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c index 550a7178052..2739383607d 100644 --- a/monitor/hmp-target.c +++ b/monitor/hmp-target.c @@ -28,7 +28,6 @@ #include "monitor/qdev.h" #include "net/slirp.h" #include "system/device_tree.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" #include "monitor/hmp-completion.h" #include "block/block-hmp-cmds.h" diff --git a/monitor/hmp.c b/monitor/hmp.c index fe2f5560013..02e9d72e672 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -28,7 +28,6 @@ #include "hw/core/sysemu-cpu-ops.h" #include "monitor-internal.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "qobject/qdict.h" #include "qobject/qnum.h" #include "qemu/bswap.h" diff --git a/stubs/target-monitor-defs.c b/stubs/target-monitor-defs.c index 35a0a342772..0dd4cdb34f6 100644 --- a/stubs/target-monitor-defs.c +++ b/stubs/target-monitor-defs.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "monitor/hmp-target.h" +#include "monitor/hmp.h" =20 const MonitorDef *target_monitor_defs(void) { diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c index eaa10ad2a3d..5599a4675c5 100644 --- a/target/i386/cpu-apic.c +++ b/target/i386/cpu-apic.c @@ -11,7 +11,6 @@ #include "qapi/error.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "system/hw_accel.h" #include "system/kvm.h" #include "system/xen.h" diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 98df5c7fd12..1befb8ea824 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" #include "qobject/qdict.h" #include "qapi/error.h" diff --git a/target/i386/sev-system-stub.c b/target/i386/sev-system-stub.c index 2ea85597cf9..d97536cca1c 100644 --- a/target/i386/sev-system-stub.c +++ b/target/i386/sev-system-stub.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "qapi/error.h" #include "sev.h" =20 diff --git a/target/i386/sev.c b/target/i386/sev.c index 261b6aaa37b..b44b5a1c2b9 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -40,7 +40,6 @@ #include "qom/object.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "qapi/qapi-commands-misc-i386.h" #include "confidential-guest.h" #include "hw/i386/pc.h" diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index 94bb12833af..be7411edca6 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -8,7 +8,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "monitor/monitor.h" =20 void hmp_info_tlb(Monitor *mon, const QDict *qdict) diff --git a/target/ppc/monitor.c b/target/ppc/monitor.c index 776a76602ea..7c88e0e2bda 100644 --- a/target/ppc/monitor.c +++ b/target/ppc/monitor.c @@ -7,9 +7,7 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/ctype.h" #include "monitor/monitor.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" #include "cpu.h" =20 diff --git a/target/riscv/monitor.c b/target/riscv/monitor.c index 3898595a3cb..63806002417 100644 --- a/target/riscv/monitor.c +++ b/target/riscv/monitor.c @@ -25,7 +25,6 @@ #include "cpu_bits.h" #include "monitor/monitor.h" #include "monitor/hmp.h" -#include "monitor/hmp-target.h" #include "system/memory.h" #include "internals.h" =20 diff --git a/target/sh4/monitor.c b/target/sh4/monitor.c index 2da6a5426eb..50324d3600c 100644 --- a/target/sh4/monitor.c +++ b/target/sh4/monitor.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" =20 static void print_tlb(Monitor *mon, int idx, tlb_t *tlb) diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c index a60671a60a4..99abddbf1e0 100644 --- a/target/sparc/monitor.c +++ b/target/sparc/monitor.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" =20 =20 diff --git a/target/xtensa/monitor.c b/target/xtensa/monitor.c index fbf60d55530..2af84934f83 100644 --- a/target/xtensa/monitor.c +++ b/target/xtensa/monitor.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" -#include "monitor/hmp-target.h" #include "monitor/hmp.h" =20 void hmp_info_tlb(Monitor *mon, const QDict *qdict) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076306; cv=none; d=zohomail.com; s=zohoarc; b=KXsnoyYLHRxxAZDECHm3cGKsNIyQVQTxJrRUVXhfcFcxtS80AeTDDqAm4hLOMBtPRR8yCtom9EPWpuyAkSAI+wpb5gUzpL5bNveWKWkGB2sgdZ9UhhXLa774atklPtUs5fnGBAI+4n2RhuPydrgAynXozRaYhI6iRDZYoXkdN5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076306; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=dgC99C4QHuUTSka7Jdb/jzkeq+ba0Okc1oUiPSrq668=; b=Ctp0EbzmIELpoT/7gGGbxWO6KdFtkIs08QeWuGOwK3VM/XWDZYCkwvLZTXmFyWYB1NIHh7ruwEto4omv4Z1+Efo4zW68UVAglibrIio1QtufdFZ21TuPmutW8y2Op9nBVT6VbUlZVIX23Kd4vVdfQEkigRO0xEM8I8rSOc34BlY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076306608288.11381579613214; Wed, 6 May 2026 07:05:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcrb-0001oD-Vc; Wed, 06 May 2026 10:04:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcqW-0008Bj-Pr for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:28 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcqS-00010z-Tk for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:28 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4891c00e7aeso55426585e9.2 for ; Wed, 06 May 2026 07:03:23 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e59b74277sm12014325e9.3.2026.05.06.07.03.19 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:03:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076201; x=1778681001; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dgC99C4QHuUTSka7Jdb/jzkeq+ba0Okc1oUiPSrq668=; b=PZejho8OC/gwUjv35N4UwznsCPOvwyrSrPmNF2Cc2Fer1oPPqNNQYLMw7dEsLefckm Glr0HyQ5opzN8W5wOZi2U/9O3uQ1+Bn+usuUXzCS+aXb1WwGeoEtlcGISxdbWSja7MN1 mQqWWbF33NQQic9bGoAoqP/6F6ZUkG7D+z1LRP06rCgtrHpJXhwdnXkyyuCMQNNI/vkq xUL+LUIJZ2ZMucTDHg1g2/hDe6mJyXXp/AfeyywdFN83oVWjyvg2bhh9voWrxQXxVhLS HQQFXa35XRIYFB/dKWK+S1KbSQqwJvtlesg6Q8lVD5X88qsE901udId9Q7ntfPIm5iyQ BFag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076201; x=1778681001; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=dgC99C4QHuUTSka7Jdb/jzkeq+ba0Okc1oUiPSrq668=; b=kvKvPbTIEwjv7dfdGJl9woolIUMJYXuK4CxwM7x/J75QPKWUDOGaJfclUItTcpS5in CubXCJPxwei/sD9K0INMhLvcnsMyR+6uzTodKauF0D65Pz2um/laiFiS0sPr7LAuNxrK 4q2ywwbht6xxpEUdiG0HhkHzD4BFu9xuZqxSzZ6rG0JIiWBr/wcpt2KDBlFUYc4mWem6 HEtAzIxnZ5LlXU1tqFhrdWetDT2bHBl3wpjhmn7OBYKPyKkzAt1q9nYqnQ35qREHAxaf pxXE1sjPKxGRj6MIwShgKQeou53lRzOebT2KEWBgxYWVqKgv8ISDhwk3N/jM6BjnlgCM iOmQ== X-Gm-Message-State: AOJu0YwiohlWdOw9weeD+hkRhUz2azxUWbkgnDsyxnEuDhVLqprn+c+T 7HE+EHPoOXwDbeSQluGF6r6oaJANhhPA7Egy+xvF1W4si9S4bJW18QssTCa7Igg5/vwYk3b8FL/ wVKjgL0g= X-Gm-Gg: AeBDieugfxWuEWUsqOGtJHc5sjJ4kGEyc46m/dXS39CCuBpuYNoGVUEJSekv7t61xmU xj9S7reXQ9blDgmd1Evf31L8uLxIjGainYbLcraH/wclWwC7RiP9S6P39+/zFO9Sea+Pf3BVwfU FmmFLYSWl1yQkQMekjfLmb2jUcGwdCyYhqOmmIsYFl5cYBKh0T/4rN1mCePNCUw/rZpcG4ly8pC 35x1jM1gC+zuHc+DX7xCsRutg9S1T3ILBpR46+3Lwd/zROR37aRYXoA5McrPj9SNLWmjddyTguQ hJwqAR0xHBV7QpiIm8cVrwDJRuaG7kdDzcGAO82X4tT8FsQgyv43tVMvSecKJsMYq2M1X7AGEqE uzlr6YVX1rPxHm4JQS3ZuMLXpcRVyhN12e9bI9iUIHCNLqZkiJEvUs2X22MIdASmwxFY4JG91Yv R7+yGsSWrVApRu1mUxiEm1s5DO9+4Fz6+wM5j8NKNyATDKTwR7razG8GB0vOcGfBEX/bQvctDuj fwhp4hhUvM= X-Received: by 2002:a05:600c:8115:b0:48a:53ea:1408 with SMTP id 5b1f17b1804b1-48e51e1804amr57241575e9.8.1778076201271; Wed, 06 May 2026 07:03:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 061/110] monitor: Forward-declare the MonitorDef type Date: Wed, 6 May 2026 15:54:33 +0200 Message-ID: <20260506135524.20617-62-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1778076307733154100 Rather than having core header forced to include "monitor/hmp.h" to get the MonitorDef type declaration, forward-declare it in "qemu/typedefs.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-26-philmd@linaro.org> --- include/monitor/hmp.h | 6 +++--- include/qemu/typedefs.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 357fc972885..d423f54f904 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -24,11 +24,11 @@ g_assert_not_reached(); \ } =20 -typedef struct MonitorDef { +struct MonitorDef { const char *name; int offset; - int64_t (*get_value)(Monitor *mon, const struct MonitorDef *md, int of= fset); -} MonitorDef; + int64_t (*get_value)(Monitor *mon, const MonitorDef *md, int offset); +}; =20 const MonitorDef *target_monitor_defs(void); =20 diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 416a8c9acea..07f2ae7c9f1 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -72,6 +72,7 @@ typedef struct MemoryRegionSection MemoryRegionSection; typedef struct MigrationIncomingState MigrationIncomingState; typedef struct MigrationState MigrationState; typedef struct Monitor Monitor; +typedef struct MonitorDef MonitorDef; typedef struct MSIMessage MSIMessage; typedef struct NetClientState NetClientState; typedef struct NetFilterState NetFilterState; --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076441; cv=none; d=zohomail.com; s=zohoarc; b=O3lC5mTUZeIyIiAytnXo6xIcmOs5p2HybBpbxuri7ancPHXoL5OOZc+bx6bZGYzEo8ansip8E8IsBS/23vskwN+RLzNZNaeAVc7H+gD8STdxNuBiaLxgYRLUl13AicSvyFMWJc1pSHJbIwZlRrT33ycTSrNNOFlsWGba299HexA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076441; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=ObHygtAeF4PYXWvdAwerohvClrll0PrC3oop6cMmCLg=; b=kERRdT+KN6/mbpWaDcGFfwMmhT06o1gfvVejJlzs1BVQe1BowWtW5zJO8pfahIMrW7h3kQXuQcnpcucmIc7FUUY172fzyNWuP2k62R/RbjdwNtyu+GFNMWbAIt/QlPxT0QJq3gvyB+6J8P2GVY9a28k4HhAnacQ1BpVIG6VA66s= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076441540514.4275088816862; Wed, 6 May 2026 07:07:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcrn-0002Ev-Jj; Wed, 06 May 2026 10:04:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcqd-00006g-9e for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:37 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcqZ-00016j-US for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:34 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-48a3e9862f0so7208395e9.1 for ; Wed, 06 May 2026 07:03:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538aaa0fsm66120195e9.7.2026.05.06.07.03.27 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:03:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076209; x=1778681009; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ObHygtAeF4PYXWvdAwerohvClrll0PrC3oop6cMmCLg=; b=ZGh6YHcH1wlrW6WujuVtSKgEwpLnfs5KNR8VR9HNxDr1UlJO8RtulKZQycnqk8x1Ev j+VhSWPMGPiGaFRdDuFgvh4hOeJx0vPAsabdim0CeTB37fgsXyLK6WxdDJyW82uDdPX5 sS1c4yT98IqWXGSH3sME/Xlgvvr30Z6uoh7In60t00S+RXtvVPcCHL4xbO9AtXC8s0C9 fziT682Cm0n4taJQwta1YEIm32hFbY9QTaKtj9EgcG+NM3lkPaGhQRQDSZibqAVwlrpF bnRqRHCYRekd0H+1mjIFO/g6qBXAl1ghaf9xiEvaWBViJzUm7ErMCyAFF8ye1CZQM7ju w80g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076209; x=1778681009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ObHygtAeF4PYXWvdAwerohvClrll0PrC3oop6cMmCLg=; b=fceRWQJZikYZAZz3PHvLoc1hIqTZB9mvZSV2ho29ckGHgd4mh127xzeQoW6Kgm6hTZ d8O5TmeTUvhhIVlFBDHJTskRZIFoyPjs/q2HywvpQ0gUk70PfoZd72LY2SC9tvI/Hhm6 ZnAkgQDaOkUvoHXGCyrh3ADvK15qCoiSrw8fPz0oOlIU5O01wbIbUteTomq58NKe5nyS QgjIfX29gSMDXQ6X3NrzgSjkJdYEHyZF/EZfcZjzC7CVGs4x3Xl6woJDmTMqdbNynQUD pDf5DsxYnBxwHhj1VbGMJXj63DyzL8qOzUwbQFUen/9aKa4xJEpE7QaMALTZEmd7ase1 4B0Q== X-Gm-Message-State: AOJu0YxYPaSfnx3losyAwCGnL1+eQu7m67g9kwYhSNMSt3/DkYg9fI0A zt1rVxCIUOXfP1i1FNpDm8IVEmjcTDsd66GOF6ZZiYbgAnxS7CjBLxA5n8QJUx77xgPOEsH2aWK lvUScnBE= X-Gm-Gg: AeBDiesgDEuvmiu9u8CMp/BikKbjPYdCwK6Pf6SaIF0Sj3q5l/Ttt7JY4xfiOZWBneU ORTBru/zoeRIBxY2e1gIBrfmytPjw93vWNu0SXxEI78tvv3L52sbudLUWVXllDXJKrfXasNbjrj ReCzPuWkSOuroamkqPJtOKEDbPOTAoxlawn2SH3DZPoYEWsg/WQkCF5UaZC4P9JeI3rSbtAqfXv YFTiD3fD4s8IWkZExEjPUz/HzDotSyb4NUVh77EaW8Dc90/HjBow6hPt16OJQx8YItGKspv65bd KTPq8EDL7MMNMx2AK52IXCbi5BXAs0Yym/5koN/pwnSXiHWs4+jdMvbeyJt+RPQziS1CAXAQFDM 0ykvnaCCJrhUHDY8rjC8HnB/v1cq/UkZIf5o+Ig2U0lZ+YadwbgCOFgVB4y2qbXT+y3/60DGZxc cHbhywVSrzELSwDg0ULV2y/KWyRysDdnfWQ3Ed6eSuKAa3r8lkhtHlG/uEF3QdWhIRXghdbMaL6 DLoXZBZOOg= X-Received: by 2002:a05:600c:348f:b0:485:3cef:d6ea with SMTP id 5b1f17b1804b1-48e522c0854mr55354405e9.13.1778076209282; Wed, 06 May 2026 07:03:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 062/110] cpus: Introduce SysemuCPUOps::monitor_defs hook Date: Wed, 6 May 2026 15:54:34 +0200 Message-ID: <20260506135524.20617-63-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1778076442687158500 Allow targets to register their legacy target_monitor_defs() in SysemuCPUOps; check it first in get_monitor_def() otherwise fall back to previous per-target helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-27-philmd@linaro.org> --- include/hw/core/sysemu-cpu-ops.h | 6 ++++++ monitor/hmp.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/hw/core/sysemu-cpu-ops.h b/include/hw/core/sysemu-cpu-= ops.h index 5b831393cf4..94e36ecdd18 100644 --- a/include/hw/core/sysemu-cpu-ops.h +++ b/include/hw/core/sysemu-cpu-ops.h @@ -93,6 +93,12 @@ typedef struct SysemuCPUOps { */ int (*monitor_get_register)(CPUState *cs, const char *name, int64_t *p= val); =20 + /** + * @monitor_defs: Array of MonitorDef entries. This field is legacy, + * use @gdb_core_xml_file to dump registers instead. + */ + const MonitorDef *monitor_defs; + /** * @legacy_vmsd: Legacy state for migration. * Do not use in new targets, use #DeviceClass::vmsd ins= tead. diff --git a/monitor/hmp.c b/monitor/hmp.c index 02e9d72e672..ad8b0d1a72e 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1608,11 +1608,15 @@ void monitor_register_hmp_info_hrt(const char *name, */ static int get_monitor_def(Monitor *mon, int64_t *pval, const char *name) { - const MonitorDef *md =3D target_monitor_defs(); CPUState *cs =3D mon_get_cpu(mon); + const MonitorDef *md; void *ptr; =20 - if (cs =3D=3D NULL || md =3D=3D NULL) { + if (cs =3D=3D NULL) { + return -1; + } + md =3D cs->cc->sysemu_ops->monitor_defs ?: target_monitor_defs(); + if (md =3D=3D NULL) { return -1; } =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076271; cv=none; d=zohomail.com; s=zohoarc; b=HzZkXkkFMTsGLPaqPrdd743tL0Wzn6zNYK5E/dI9inLLatn7MGzEGB8Mdnx6Ux92NuM7RkRBbRpl721eKC3WSXAskWY/T+J1LIPzgHtaG0PmVvaoKSqEWZKTKL8bZhmIAeKAkgMqvAdBlBgfarDbECnWt4kj+DLI7RnvuHdWYNo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076271; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=D7xz2BU2ssYT4B/I5t9sqXWgCa5HXT8/ZgAiIOFSxWk=; b=nx6Ku7pqYtvN4PWwJTDXz2Ka4DAGQwVCnMi48DoV7U2pPzH4xD4dNCYd/v0cNZ/S7obrYIQ8fCThVvKIHD/N5ZJikG0kLIy8RldeMgnI9v3YmcMgXuW51ioxmyeK5rc9sy76/49VzhYA3EbdIdgOwuar3N7J54nYltnbghK31og= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076271614580.182339288881; Wed, 6 May 2026 07:04:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcrG-0000g3-Jh; Wed, 06 May 2026 10:04:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcql-0000Ob-V0 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:48 -0400 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcqj-00019v-OC for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:43 -0400 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-5a40502e63bso6629531e87.0 for ; Wed, 06 May 2026 07:03:41 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4505285e765sm12329164f8f.10.2026.05.06.07.03.35 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:03:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076219; x=1778681019; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=D7xz2BU2ssYT4B/I5t9sqXWgCa5HXT8/ZgAiIOFSxWk=; b=PxlfGAkHPE4Y+jeKCdkCWaOKl96E6fpzDsn1Wt2bt0Lk1LxXskwXFuS6ac3hiQ4OZc PxoJNV5biWxD0ADKwsyOVyrmv+yZDtHGXy8Re3UNrBsI8ucum+PUvCbCGPxGgZ6pG8VQ T6MkLA1Q/Aeq6cP0IMDzlMO7MKdNqMyFwQroEHf/fvPlKHCU+MjwrdfugSU5Y5Y030Yw 6q/bPaomXJlq3aHMyQ4w0oaStlHTHVPmTzaIhMyvHc5UbkPAs8ODmb3jbduGu90sWdkZ GF/1yELjcnwr5mdni7BiqcKIWHgV6Hd/9vBCeli6so3waiq4aeQNe7yB6WurfrSVNDeM vzaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076219; x=1778681019; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=D7xz2BU2ssYT4B/I5t9sqXWgCa5HXT8/ZgAiIOFSxWk=; b=FRXPiz7Lc89jlPaecFUlwG5HTu4hRvzZi/U1wcZ45pa3aAK6/oEv2ycF7Bsv86VcH+ tH047x64+Y2cJj3KdxBjY2oLseZ32Df69ut/aWAd5JWkg1omgeDPP3i/7rkUeqdz582F X1BSKxWjkS/ZtbU4YTtd8l1D6E9IwKcnsCI5KrxpFSSFj4nCul0OM2kWbi9MZANxSs+b l1FM9bvU+uIlzNAM8HUXpnOpPtFIUx4ldSADTCEKupFC6R7s7Xh1ly9Svl5RDpaDNu9b qf0YYHFAqF5/Hm5Vsvuoqx9EkdTrBQQS9kCnyiCITG+HfZv7f71e4o2mVKPaDpnHDQOy aZTw== X-Gm-Message-State: AOJu0YzdSMYRhBP5Yq1AaiDESC5EezqyQ+QNrnxokwtxItkIZdT9gK73 QDyKAiTvpKcPb9PZAzKgZNIeeIy89wrT9BExIdYmbXqMjXfLBI4Z0XLHfGz2CUXgbtmu7s6RbMc qznzuOBs= X-Gm-Gg: AeBDieuECCT28uXjg/S1Qq0SSUdluuIZFBG7tf2FUU7vO7IWwFCOBmGbFKcmIfoxH62 h3NuOtmm+aqMMv1hEFUfAKrZHQbch2qFOVO4Nns6LE1fyHMZ/9vYnr7nGyywXDlJECQZ3rqq7kX PkjOhOgr9+AsZO9nH5Jv+0d1fqog24WGPtZ/9e0P7gN3ag4odxfzV9Z/crO/HWJ0DCz1jX6rogx 8zQew6kUCOpPYoruNPDi/p6rA+99/cfgLfP2cOM2PS+Z97AOzs10RyCS5q2O8GV/ltkvCbA8wwQ m89TmN2c6a4jNjguB3RN6U/iFw+8XK18yf+8euBm1sFudIuBV0gpJV0mkqF1vhq4mehvGRkEwow hFUsyKmgVqYvMr3RrXGGiJ0iXdveR1FN0LeH7rLQrRPNkDogUgSeH1m1f9OT/NluD5uJ/wgdUUX rVwvs9liFZJ08F5xNyD12K82NKokorSIeybzVOKmxecWOu5V35kbPyp5p1uLPPWgFgHsVlb9rIp +CjJX1Y+qw= X-Received: by 2002:a05:6512:3190:b0:5a3:d1d0:543e with SMTP id 2adb3069b0e04-5a887ceb431mr1268084e87.36.1778076216843; Wed, 06 May 2026 07:03:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 063/110] target/i386: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs Date: Wed, 6 May 2026 15:54:35 +0200 Message-ID: <20260506135524.20617-64-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::12f; envelope-from=philmd@linaro.org; helo=mail-lf1-x12f.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: 1778076273342158500 Restrict x86_monitor_defs[] to cpu.c, register it as SysemuCPUOps::monitor_defs hook, allowing to remove the target_monitor_defs() method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-28-philmd@linaro.org> --- target/i386/cpu.c | 29 +++++++++++++++++++++++++++++ target/i386/monitor.c | 30 ------------------------------ 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index efe7ba014d3..97c66c22262 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -41,6 +41,7 @@ #include "exec/watchpoint.h" #ifndef CONFIG_USER_ONLY #include "confidential-guest.h" +#include "monitor/hmp.h" #include "system/reset.h" #include "qapi/qapi-commands-machine.h" #include "system/address-spaces.h" @@ -10843,6 +10844,33 @@ static const Property x86_cpu_properties[] =3D { }; =20 #ifndef CONFIG_USER_ONLY + +static int64_t monitor_get_pc(Monitor *mon, const struct MonitorDef *md, + int offset) +{ + CPUArchState *env =3D mon_get_cpu_env(mon); + int64_t ret =3D env->eip + env->segs[R_CS].base; + + if (!(env->hflags & HF_CS64_MASK)) { + ret =3D (int32_t)ret; + } + return ret; +} + +static const MonitorDef x86_monitor_defs[] =3D { +#define SEG(name, seg) \ + { name ".limit", offsetof(CPUX86State, segs[seg].limit) }, + SEG("cs", R_CS) + SEG("ds", R_DS) + SEG("es", R_ES) + SEG("ss", R_SS) + SEG("fs", R_FS) + SEG("gs", R_GS) + { "pc", 0, monitor_get_pc, }, + { NULL }, +#undef SEG +}; + #include "hw/core/sysemu-cpu-ops.h" =20 static const struct SysemuCPUOps i386_sysemu_ops =3D { @@ -10856,6 +10884,7 @@ static const struct SysemuCPUOps i386_sysemu_ops = =3D { .write_elf64_note =3D x86_cpu_write_elf64_note, .write_elf32_qemunote =3D x86_cpu_write_elf32_qemunote, .write_elf64_qemunote =3D x86_cpu_write_elf64_qemunote, + .monitor_defs =3D x86_monitor_defs, .legacy_vmsd =3D &vmstate_x86_cpu, }; #endif diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 1befb8ea824..a536712c755 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -591,33 +591,3 @@ void hmp_mce(Monitor *mon, const QDict *qdict) flags); } } - -static int64_t monitor_get_pc(Monitor *mon, const struct MonitorDef *md, - int offset) -{ - CPUArchState *env =3D mon_get_cpu_env(mon); - int64_t ret =3D env->eip + env->segs[R_CS].base; - - if (!(env->hflags & HF_CS64_MASK)) { - ret =3D (int32_t)ret; - } - return ret; -} - -const MonitorDef monitor_defs[] =3D { -#define SEG(name, seg) \ - { name ".limit", offsetof(CPUX86State, segs[seg].limit) }, - SEG("cs", R_CS) - SEG("ds", R_DS) - SEG("es", R_ES) - SEG("ss", R_SS) - SEG("fs", R_FS) - SEG("gs", R_GS) - { "pc", 0, monitor_get_pc, }, - { NULL }, -}; - -const MonitorDef *target_monitor_defs(void) -{ - return monitor_defs; -} --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076559; cv=none; d=zohomail.com; s=zohoarc; b=RE/1TRXPQlypJf0KRKcWA5SAyUmzAdC9zktm6PGFTZXG1kwUe8Zk3O8Xb6jmvsCNIqKIVKntY20EytTH1Ofjls3EhE5SoTsCJpxR5gkTSMLLB+2bQvdWesxtT4e83a9KPWXj2hhofpMbWsKMMc2N6s2CDiHndZKYfWKvMBbSMPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076559; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=p3+mBWTr+gywNcALvVWo2llrDpelHbSPx6IEjp8iCFg=; b=Vl5NVSe3jWldixldz0pQlG/oxhW4fSIGIjPqwYwX9+UWzlGT7rC1VC/e4+9FJav6my/bWaAPP7EcH8BGl+lowlJQxv6r4F8QPYmyCJdSJTFIlsrWChJkBmyt8AhkPuzkpye1k8zQRmfmxwzqIK9KSBaFLv1XScniHUnutGn+DU8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076559717766.9972945420008; Wed, 6 May 2026 07:09:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcs7-00034G-OP; Wed, 06 May 2026 10:05:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcqs-0000Ou-5D for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:56 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcqq-0001AU-HY for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:49 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-488ba840146so57404565e9.1 for ; Wed, 06 May 2026 07:03:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5389da63sm49547775e9.4.2026.05.06.07.03.42 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:03:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076225; x=1778681025; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=p3+mBWTr+gywNcALvVWo2llrDpelHbSPx6IEjp8iCFg=; b=wDkqfhV2rsivvF7ZA/olDyXhD9enYA2D+z+zrQWbBPAROjSn4vvJqg4YgrPGIzCG7O ZsxJNQI7IVq5u0Ol1XC7//uYR1sAQK6wbHGjIXlmPrlv6OsUKr3hcAmcNBIxZtUNqQDM Qnj0JvBeYXRttRdwLv2GMrinajZ6flsZXsRvkZxHpNZZFh9yRkyhhViCdCP1S64GXq2b g2lOKdeJSnGGQM3QfNvXcrZYreNlAvXqOG+hE7+fUtGTjKtvxg7pCH7q5VV6zSvtVp+l Ek0sr+4WZbCIyWgFw5v8JN+meY05+ejsAVtUJVo1d03+D72FRFuwdv12/0Glx7tDqwVu vYxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076225; x=1778681025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=p3+mBWTr+gywNcALvVWo2llrDpelHbSPx6IEjp8iCFg=; b=LPvAxMrdmF/Ry+/R0UNftQiSvSINZns/IkcBaOd6uY6sLre54ZdGNh61gXW5965W2w 13AbI9iggyxOmrGvnfVhAoI4t6Oxbbn3BWoqEdZcoTNHKul5UBuKNzzLI5Q3OUn04Ntf lWv/5ag4eOPKmNLlQu5a6VvAXLcZwEOmkCZgrXRIGg0fLZFhtN4S7E1uTNO22zeVSWf7 C8R3RrRtkLMSzTjjOcemDpg8ms0IcJ0jVDsh/Qc9idSaIqcpNqZh44ZLTpVWCapO8iX3 K9Ybn7gXNCtjtkdNnvz3Qs2R+iE7mft+fODUDy4YGVXePy6tM8NBoBZ+NY/mEG+bLNd2 o6SA== X-Gm-Message-State: AOJu0YyIg0f8C021UaOywam4d4Azz6fttt0X/KEb74DT7mw8oN02mwNH yb7+EkkieCijPWfXp7Qjs4mHSRNR4yak4jt20dA+EttEWMJCoEkwIgQxPcZBa0S9nq1X5O1ZlL3 g5k4UQQ4= X-Gm-Gg: AeBDievJlhtUTWGCr59qN/+btTcYlD/v/zbkV4pC2TOzBD76gtNGM3eI0peZQV+wCW9 Zvn5JAmNhGwXxRqXj86+WF8FTJahCoX0b33iK51HmyOH3dXFGh4OwGHWvWl0M/1Mnyw40f7rcOO fx56Jet0twUstL1XCzwnwZwCdaO3XYcHOaf6zQGYJKCKBfxKH+OCAJk6K6NXvsBUi/WvcTIkPzD k138cKNbDCT+dCE1jil4FZP/1hv3PBvqGnk9g+bYCndH+CoN1UN+gBSJduoLk8p8lV5piyp41JB 3kZWvlugIPwS0oKS24n64hAL6z3BJPQ0kzAnbWwKzdIsIAAhwOlsOipmQjByBL412blbSwcapdl HvvhH243n+PyqdQj6d9nZF1zRczjWzZSreDapVJaUE5baItjqZHmfm1xGipYiOvZTNQ4H/DBET7 0AA99Trr6NeanPSFntYmEUWvt0wD9HQT1lJYZa8Dyu8DyBgwA0TJawhfCjCCt655mPJqVosNXd6 xLr3lyntxI= X-Received: by 2002:a05:600c:4881:b0:485:3ff1:d5ed with SMTP id 5b1f17b1804b1-48e51e0a697mr40023665e9.1.1778076224524; Wed, 06 May 2026 07:03:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 064/110] target/m68k: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs Date: Wed, 6 May 2026 15:54:36 +0200 Message-ID: <20260506135524.20617-65-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1778076561574158500 Restrict m68k_monitor_defs[] to cpu.c, register it as SysemuCPUOps::monitor_defs hook, allowing to remove the target_monitor_defs() method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-29-philmd@linaro.org> --- target/m68k/cpu.c | 18 ++++++++++++++++++ target/m68k/monitor.c | 21 --------------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index d849a4a90fc..f704a6af613 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -25,6 +25,7 @@ =20 #ifndef CONFIG_USER_ONLY #include "migration/vmstate.h" +#include "monitor/hmp.h" #endif =20 #include "cpu.h" @@ -602,11 +603,28 @@ static const VMStateDescription vmstate_m68k_cpu =3D { }, }; =20 +static const MonitorDef m68k_monitor_defs[] =3D { + { "ssp", offsetof(CPUM68KState, sp[0]) }, + { "usp", offsetof(CPUM68KState, sp[1]) }, + { "isp", offsetof(CPUM68KState, sp[2]) }, + { "sfc", offsetof(CPUM68KState, sfc) }, + { "dfc", offsetof(CPUM68KState, dfc) }, + { "urp", offsetof(CPUM68KState, mmu.urp) }, + { "srp", offsetof(CPUM68KState, mmu.srp) }, + { "dttr0", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR0]) }, + { "dttr1", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR1]) }, + { "ittr0", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR0]) }, + { "ittr1", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR1]) }, + { "mmusr", offsetof(CPUM68KState, mmu.mmusr) }, + { NULL }, +}; + #include "hw/core/sysemu-cpu-ops.h" =20 static const struct SysemuCPUOps m68k_sysemu_ops =3D { .has_work =3D m68k_cpu_has_work, .get_phys_page_debug =3D m68k_cpu_get_phys_page_debug, + .monitor_defs =3D m68k_monitor_defs, }; #endif /* !CONFIG_USER_ONLY */ =20 diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index be7411edca6..3e0df40a6b8 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -21,24 +21,3 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) =20 dump_mmu(env1); } - -static const MonitorDef monitor_defs[] =3D { - { "ssp", offsetof(CPUM68KState, sp[0]) }, - { "usp", offsetof(CPUM68KState, sp[1]) }, - { "isp", offsetof(CPUM68KState, sp[2]) }, - { "sfc", offsetof(CPUM68KState, sfc) }, - { "dfc", offsetof(CPUM68KState, dfc) }, - { "urp", offsetof(CPUM68KState, mmu.urp) }, - { "srp", offsetof(CPUM68KState, mmu.srp) }, - { "dttr0", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR0]) }, - { "dttr1", offsetof(CPUM68KState, mmu.ttr[M68K_DTTR1]) }, - { "ittr0", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR0]) }, - { "ittr1", offsetof(CPUM68KState, mmu.ttr[M68K_ITTR1]) }, - { "mmusr", offsetof(CPUM68KState, mmu.mmusr) }, - { NULL }, -}; - -const MonitorDef *target_monitor_defs(void) -{ - return monitor_defs; -} --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076429; cv=none; d=zohomail.com; s=zohoarc; b=PsKVyDih81WXoZYI8W90EdG71ADzPj669gjVYY/mLB+jn0ze8RUeoX+wSev61EIew2LjURaygiFQFDF9F7Bez1rIvfmZf9hwW6e5BNFvf0S+ir19fU4ougvxzq+MssBuakkqs+yjqcerg4dGeDbib2e7vbqjZ/UBPAMy4PSHz5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076429; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=v9IZia9T54nsdk1tWUK1kZA/j93ztaFsjJIvNzWV3m8=; b=OeLdTR+QKn+qrgvRf8x4BbkZ88zM6C5tU41lbZv9JnUXPbSBLSK32+9tHBfuoByYVY7Q3lqSxQRmsD0M4TgDdRFw1hvPDXczd4v7fnEPf527pEbakrnEieEWSH2AXKdfpaj0dp+5bzZcEhJ11DPJforpeh1NsLmOQg6p2Ojojrk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076429936904.4168573953984; Wed, 6 May 2026 07:07:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcs9-0003IF-Kw; Wed, 06 May 2026 10:05:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcqz-0000Qd-L0 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:03 -0400 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 1wKcqy-0001B3-0S for qemu-devel@nongnu.org; Wed, 06 May 2026 10:03:57 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4852b81c73aso49612425e9.3 for ; Wed, 06 May 2026 07:03:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5382a327sm90961905e9.0.2026.05.06.07.03.50 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076232; x=1778681032; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=v9IZia9T54nsdk1tWUK1kZA/j93ztaFsjJIvNzWV3m8=; b=siaXdHJOjM+alEQvRltXpx4FOr81K4dTtWB9YdDhQjuyTAWcF0dH6YRpzRSbSoTa+N WCtAa4i9qk0CLwbfZ05w4G1vAEkOLP5gKry11WqephDWbUfsLbCaXinL2VLhDa0iUBuo lAx2ls3NgmLoUpUM9TXR8f75pdo7NRn6kbM/riuOxH+0D8xppwzemyi4+DSY0Zlaf13f OlTNKb4uNPMAshHZ3CLwoRBFpXqp0EMbLPXfKyhMT0FZbLDMmOIG2q9kBJPw/76k8HF4 ZH6SR0Xpe7sQRmpLDZZjXIMPWTYDSR8JfnNpFI6MvmlS9KyV+7gfTlKuzzRiz/DqsW4a Pq9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076232; x=1778681032; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=v9IZia9T54nsdk1tWUK1kZA/j93ztaFsjJIvNzWV3m8=; b=k2qSTojZKpB3o9Ey+0NYMJ3pucg7s6u90VY+NrZ+qdCpYDh7wjmvV93Jrz20yRTx4d Pw5i83FP8SFXhmeifu7MIbmD0ktz6w7aJ+J3Lt3jVOkg8pguG6fA52yu8wZ0pXf2yipz sYXl3aRQnWa3GtAnVH1LhkwTIEl6f7wRsgokf0fb+6FX30dTvK1tTZXvFGw5wqMFlr8m UZJGMHCkbGiqFLEBiuSa0z4Ri5Sz9KgF5ydFjDPijOWalxVBsPD8FQ/rvIYLIO/z6nSV lCdihHlQXuiiALwGgf3mksNt/cvsTqlhQHs1CiLz28JRo+qVYu8jkNYZm92cWyj2UPHi lWog== X-Gm-Message-State: AOJu0Yz4Had42F2ILhWWVWRI18FnBjpUOurAbYv+pz/N08NAbvoEQdjg vKqnZF02XDJmzh5kQ0Nwr7zLnVIGVhbtD4PxzdhAaUHocaRNBegqgvvaT4PwepzHNEVapuwZckn 2LMnhF4s= X-Gm-Gg: AeBDiet2D6XC0UenRWZfF46SglCeQX8AxHwmu/6S1C3vVcwkqzT9NFCx9Fdt7WfH8aE 0FP3YeC/e32z0FklZQhKO6hUMJ/iN+f+292ztNoSQrqHRoQD5PUG8gQl74XjBBn30b/QWgHcF4I q071kM8Ue7YbVD95rSMFFDuUHiEYhvNCBCFjTdD/ldZW8GjXTPWNiV0MXnfZ4pHeK/6WLZd1zWK CBM6ZP26uOozgG2rzhU2FrR5jySdc/JPFiadMaBTGWmmjUqiGEyg4F3DrpGcNpz5HMmYTenRW8L QIqqWEMeO7WzOzsiF0FNVBcK9OoBgXWeTnk98CnjOggwnf9imjFJG9oRs1sjRfgheFQefX2XIq5 i2sukpw8Cj/890XjOlA8RLkPp74WNF73PqS/5V0VSOKWTHCXwiMCU9hxKbMYXDYctpZDfyyaouJ qqE+tudH/r0wVvExZ4x7FzPh8+SmrcWUthca+64EkIattWpFRbnGCYswAZ/8FxSve+5a8X/3qX2 R99Ymp/IZ0= X-Received: by 2002:a05:600c:c11c:b0:488:a723:ea53 with SMTP id 5b1f17b1804b1-48e51f5398emr43086785e9.7.1778076232270; Wed, 06 May 2026 07:03:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 065/110] target/sparc: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs Date: Wed, 6 May 2026 15:54:37 +0200 Message-ID: <20260506135524.20617-66-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076430720158500 Restrict sparc64_monitor_defs[] to cpu.c, register it as SysemuCPUOps::monitor_defs hook (taking care to not register it on 32-bit SPARC target), allowing to remove the target_monitor_defs() method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-30-philmd@linaro.org> --- target/sparc/cpu.c | 19 +++++++++++++++++++ target/sparc/monitor.c | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 77046104284..c6989229da6 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -993,12 +993,31 @@ static const Property sparc_cpu_properties[] =3D { }; =20 #ifndef CONFIG_USER_ONLY + +#ifdef TARGET_SPARC64 +#include "monitor/hmp.h" + +static const MonitorDef sparc64_monitor_defs[] =3D { + { "asi", offsetof(CPUSPARCState, asi) }, + { "pstate", offsetof(CPUSPARCState, pstate) }, + { "cansave", offsetof(CPUSPARCState, cansave) }, + { "canrestore", offsetof(CPUSPARCState, canrestore) }, + { "otherwin", offsetof(CPUSPARCState, otherwin) }, + { "wstate", offsetof(CPUSPARCState, wstate) }, + { "cleanwin", offsetof(CPUSPARCState, cleanwin) }, + { NULL }, +}; +#endif + #include "hw/core/sysemu-cpu-ops.h" =20 static const struct SysemuCPUOps sparc_sysemu_ops =3D { .has_work =3D sparc_cpu_has_work, .get_phys_page_debug =3D sparc_cpu_get_phys_page_debug, .legacy_vmsd =3D &vmstate_sparc_cpu, +#if defined(TARGET_SPARC64) + .monitor_defs =3D sparc64_monitor_defs, +#endif }; #endif =20 diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c index 99abddbf1e0..36f3d8d58e9 100644 --- a/target/sparc/monitor.c +++ b/target/sparc/monitor.c @@ -37,21 +37,3 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) } dump_mmu(env1); } - -const MonitorDef monitor_defs[] =3D { -#ifdef TARGET_SPARC64 - { "asi", offsetof(CPUSPARCState, asi) }, - { "pstate", offsetof(CPUSPARCState, pstate) }, - { "cansave", offsetof(CPUSPARCState, cansave) }, - { "canrestore", offsetof(CPUSPARCState, canrestore) }, - { "otherwin", offsetof(CPUSPARCState, otherwin) }, - { "wstate", offsetof(CPUSPARCState, wstate) }, - { "cleanwin", offsetof(CPUSPARCState, cleanwin) }, -#endif - { NULL }, -}; - -const MonitorDef *target_monitor_defs(void) -{ - return monitor_defs; -} --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076493; cv=none; d=zohomail.com; s=zohoarc; b=i+HdljZR/b0DpC+e1WmJx4S85/oJ3k5LTEwWWwkBthNvt5fAIYFP40m/9GekuKVeS8B9+tqmwiDLWPYv+LmpnDDPWFf3lIYFT9jAtbGY/PQP5tUCxr3r36ifHU0+4GMhSDM7Mv4/M5jg3eA3g+iK6MDXa8utLVQukEhJDeufQ+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076493; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=XQjXLV+ZgTD2AtRw0z/SHqVbFTw/hIPpAz6udWTcRtA=; b=My49bsa0RvI0xtnnIfnqztLqesHvdvvCbCAMmhNteoX20bm7gyYA1XYzW7vRem7BZDJ2w2q9ecqJWUDiss0iMc0sqXAf97sarsNl1jqBbPQgHZec9zGXiy1c2jNckz6cIm+Jfg5yjCou8GdkX5IY2q8s8eZjUcrYSp8kAoQqqzU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076493105889.0387155118615; Wed, 6 May 2026 07:08:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcrh-00027a-PI; Wed, 06 May 2026 10:04:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcr6-0000WT-Mi for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:05 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcr5-0001Bz-2r for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:04 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso62719595e9.2 for ; Wed, 06 May 2026 07:04:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53891163sm54736895e9.2.2026.05.06.07.03.58 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:03:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076240; x=1778681040; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XQjXLV+ZgTD2AtRw0z/SHqVbFTw/hIPpAz6udWTcRtA=; b=jA6TxgIASGzAqS6eNi6zYDn8U8oFFabvuB/tt8pptzzt5oS5NaIFqzdkHHP7fGFoeZ SqscEtMEFmGw6Awvex6PWu/DkTeDnrnSFrSbMRRn7lIHmTO3biyTWM84NZuXUXN2CU/m AijrHc8xc3WDMx5H+PfXzbrEn02Omn0z05kzaZOXT2sE4FNuZUIf1xSDMP+R6Q9zmv8x 1mtx8Zt0rXBn+v5qMLs6xFRPoN6dXQ2gIriBTGPbM62goZtE9s2xC7dR74XF96ekUBB5 26pEkD2aL/xXptJx1qf2aUR000xg4wKJzYlC8jnGQMOnEFU9p+rbb0rLXXjsqcLxMUJ2 5SPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076240; x=1778681040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=XQjXLV+ZgTD2AtRw0z/SHqVbFTw/hIPpAz6udWTcRtA=; b=oqtCHKSrYHfRwvJB8HfsUtsai0NynqEVat9Go30/Q3CaaEzZFCjQF8UNyDswSrQmen piOdbiiKNmYrAhS9sRnJwQ+UwcNNNgKhzRB3KyzNTGG4QFkjVg1hn7ymEWvDn9aivGbm bSWLXG+CDTT90g2TR/fiTDzqFvK0Gido/kxWd7ICRvh0s2yiuMFMn9UWQSMowDQk83XU PhoFc7iJ/B21sWcOr5uiZSRcrRtHR4/OXX/aEj1z292tx42Suvw3kpfpoB83z7/+9AiQ 2ZrjZFBuuZYy0Ena9MyDPibYoVF1vJc5QnAbPNcswed8YzcnPU4xSQFHPjS0Fbh25F8f PpdA== X-Gm-Message-State: AOJu0Ywxgl9TGw6KeB9cAiecwrQx/wSF0NRHcolztMh9/1tfYkcakZhM Ojt6AZYk+hBl8bJs3UpnIOuR3/lYRo2o59lB0E+xFEzLBkXA9uFhBGdS3jWI7jrqICQu2Ttcl6J NZuMKAPU= X-Gm-Gg: AeBDietJV3GjJSXlH+yhKCm7iCf/JDV9y2EGj2qazcawVGPyINc13Mx7vyJBNBqzyFh S7UJ0B0ve0Ijjq6fMvlcCFKK9n4DoRoZdiwai7lG3SIIyStOEwF6DECPZAFaLYOKqZF9okh5t14 bmhFx+w6bsXKtjtWKK1iXd3hFKT/dUfsMbgVss5+vthroV4tq3tHFJmJLZ6gv9pXqyolxkW7Wgk 6WHZZgAgC5WgpgD1+CRK5XA0kItu0VadQ78XtsE6c6NPuUIWIKfrGEYOh/sK2CD8Jf5NQQ6mhwt bubdpQi3exLW35seFnZxZzcMRbvwHMs16wzpXMdJDTUhzEJrNF5EZRDPjknlbdEnlONtDQYiAou Ypon+oSZb6Lk2VjLbbUpcJIbyGaPHLV2J7Cbu9r/JDEYE0Xv+0ShWYY/0OqdyMetPgs9CxWFY/C UyrvS+bdWlQppA54hpeyeBxzqbC0+dB9yvfFLHRPSM0fapFChwm2RlLoP16F4cSe9NG7mUXN35z jeKwJagY/w= X-Received: by 2002:a05:600c:2d15:b0:485:9a50:3370 with SMTP id 5b1f17b1804b1-48e51e16d0bmr36356015e9.8.1778076239917; Wed, 06 May 2026 07:03:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 066/110] monitor: Remove target_monitor_defs() Date: Wed, 6 May 2026 15:54:38 +0200 Message-ID: <20260506135524.20617-67-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1778076495045158500 target_monitor_defs() is now only a dead stub. Remove as pointless. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-31-philmd@linaro.org> --- include/monitor/hmp.h | 2 -- monitor/hmp.c | 2 +- stubs/target-monitor-defs.c | 7 ------- stubs/meson.build | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 stubs/target-monitor-defs.c diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index d423f54f904..9bf46795bd4 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -30,8 +30,6 @@ struct MonitorDef { int64_t (*get_value)(Monitor *mon, const MonitorDef *md, int offset); }; =20 -const MonitorDef *target_monitor_defs(void); - CPUArchState *mon_get_cpu_env(Monitor *mon); CPUState *mon_get_cpu(Monitor *mon); =20 diff --git a/monitor/hmp.c b/monitor/hmp.c index ad8b0d1a72e..cc4390486e1 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1615,7 +1615,7 @@ static int get_monitor_def(Monitor *mon, int64_t *pva= l, const char *name) if (cs =3D=3D NULL) { return -1; } - md =3D cs->cc->sysemu_ops->monitor_defs ?: target_monitor_defs(); + md =3D cs->cc->sysemu_ops->monitor_defs; if (md =3D=3D NULL) { return -1; } diff --git a/stubs/target-monitor-defs.c b/stubs/target-monitor-defs.c deleted file mode 100644 index 0dd4cdb34f6..00000000000 --- a/stubs/target-monitor-defs.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "qemu/osdep.h" -#include "monitor/hmp.h" - -const MonitorDef *target_monitor_defs(void) -{ - return NULL; -} diff --git a/stubs/meson.build b/stubs/meson.build index 3489b1f20dd..3b2f2680b19 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -75,7 +75,6 @@ if have_system stub_ss.add(files('igvm.c')) endif stub_ss.add(files('kvm.c')) - stub_ss.add(files('target-monitor-defs.c')) stub_ss.add(files('win32-kbd-hook.c')) stub_ss.add(files('xen-hw-stub.c')) stub_ss.add(files('qmp-arm-gic.c')) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076514; cv=none; d=zohomail.com; s=zohoarc; b=URFQV1Bq34UEu9j4GdWCzGJsxedgwJeLM1xe/M0Lmg8WRvS5H6Bz7AposXL6DIw0i0TaII0oF1JLIA+iWOW4uDRTkS3UwnGm4t9gqfrQMHROqYUR71NrqBw0WuNORKp92P7kFixSNuDf6PtcwBBfUXoRDG5+ACrWKxTSqstsS0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076514; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=DHM6buaaRLBiKh6jcSvc9MFpxLAKvh+sCx3ywa9Z/Xk=; b=jWePsqK8THIsfa175YzdJdj70N5547wkNINOGehmr32wEYbUxrqj1aYyg29E5xMeFEn0aSoFzEoIBwnakq3SSn6RX0MmtbipY307POa5WAF23cwcpSgtzvXoj1MlsAG+4EV5fFfjKEC4Yl2/pbelxadL6lUCePCLl/g2Wc8WmhA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17780765142661010.8035714351406; Wed, 6 May 2026 07:08:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcrh-00023b-0H; Wed, 06 May 2026 10:04:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcrH-0000nQ-CA for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:15 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcrF-0001Dp-6I for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:15 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488af96f6b2so81619375e9.0 for ; Wed, 06 May 2026 07:04:12 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5312dcbesm17323105e9.22.2026.05.06.07.04.08 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076251; x=1778681051; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DHM6buaaRLBiKh6jcSvc9MFpxLAKvh+sCx3ywa9Z/Xk=; b=yYSPZWI8winisI4+aFq6OH6GJ0EGIp34uT64BVLlRFoNldQS7ih4f2xGStXy+0ZoKB r+VsUyRwOO46YqtwOEIvOLCv5XXJzaT8T71buDXdZqGUfObBoTOI57lPuoxihJqt5Rps ZWh3yWjjZ8t1U4LXvK4Jd7+MfuSHQ/9mrcgDuBno/GW92rSEVAl68zXIDhJ3pMRwKs1d lLArLtmbNgkq/2kruGDUfAEHYSg9bm6CUEyQl6dkTJeVvQsiOEjnq1CVqAdLhDReNQbJ ktQ85NKVdu/LOmSFz8bfBtV9XZFJpF2JCBS1o6lvxGLOwmajg9q884mL195WSM+T6Rjn Mk+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076251; x=1778681051; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=DHM6buaaRLBiKh6jcSvc9MFpxLAKvh+sCx3ywa9Z/Xk=; b=RX4imDXnB99iLHUmYt7UsHDWwXaN7RonF0wi0O0KjafinLShogKS3DpZ13om23uFNC fj6wTHG3AoTeDxEk/NnS9W1RX7t92WXXYzx7o9kWlyQNN2SruAAMPymeMtTivtrCOOGo G7DNKl+WMzqGfoKz6HBr2N3Yelpuiy+CSErXqfw9wuwScg2PhSpbSm5/5t5kM7x8caFw Vk0qn/kHIiq+Bzlfr+rcD+KWGDGkZSC0fuUCWc9TuvFWEcDVHGZDGf07vbbFkCZWrJ9m oo3MIo5s0XiWirUB9zPJt2ByXWAHH21CK5kpwYdtJmTs8BIW6mj0Js5hWflhZYBTBqaG OOIg== X-Gm-Message-State: AOJu0YxVc/HhZP2Ykxk7/uebyKO+ddBSaC3y6gHy43DTQgIratT2aVnp keJKBca/pU2NaKj8C0nfxYoBuTTRb7LY/2StMI1VLyyV60Kf4r4wdxNzOtb2fvNkEzUKFbC9U5J 1FDfc8NM= X-Gm-Gg: AeBDieswC73FaWNJGZqNEac7WfAQx+10UR9gAflRotRcxD3X+nW1+EJu3zgW5EOw7tD 0qFeuUD8wdgbq22zBELauduYhsHfTc6+8OGTeo7Bal5rRO+faXUMfbyJ+DNUK1d2HmUWHZjKj9l 6perTtYBOVz6izM9cU5GaSymv6DZXmiXmHY/IB2lWNmyLM6vAlAf0HJaZ22EzPJmb+JZCudMELZ chzhskEYKbz+ojBoInS0l/uBgX+su1t5KbcNRebjygU0mlLKALx1v+o0GhsJ/OXEsQ/FsD5glIl 84g3rLSNvzOG90Kl+M1CMR1WggN4s75MiA4YX9wu+UvNkuIVhdWkemmbMYt01CJrx34JZGsh4qG SC1CGcGlvkSvwBjYwj/3GPHoIJjuSjOm+NlAqHApB3cpjF4hHuvjUlXjG3cLb0fCusTIuNcKz06 dNB/78sd4vd6TG6xO8wPOWZmMFBdVawVT3gUMJKkCFufMsVAwAAVjHZCVJ8zucDcgzIMkecrx8V btmk1iXTes= X-Received: by 2002:a05:600c:c107:b0:48a:56d5:16f2 with SMTP id 5b1f17b1804b1-48e51e15b69mr48842905e9.7.1778076250482; Wed, 06 May 2026 07:04:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 067/110] monitor: Merge hmp-target.c code within hmp-cmds.c Date: Wed, 6 May 2026 15:54:39 +0200 Message-ID: <20260506135524.20617-68-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1778076517363154101 hmp-target.c doesn't contain any target-specific code anymore. Merge it within hmp-cmds.c (which is already built once). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-32-philmd@linaro.org> --- MAINTAINERS | 1 - monitor/hmp-cmds.c | 40 ++++++++++++++++++++++++ monitor/hmp-target.c | 74 -------------------------------------------- monitor/meson.build | 3 -- 4 files changed, 40 insertions(+), 78 deletions(-) delete mode 100644 monitor/hmp-target.c diff --git a/MAINTAINERS b/MAINTAINERS index c4f78ac07f7..10bf7b761b1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3408,7 +3408,6 @@ Human Monitor (HMP) M: Dr. David Alan Gilbert S: Maintained F: monitor/monitor-internal.h -F: monitor/hmp-target.c F: monitor/monitor.c F: monitor/hmp* F: hmp.h diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 682bb62e91b..db92d6cb86b 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -14,6 +14,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/base-arch-defs.h" #include "system/address-spaces.h" #include "system/ioport.h" #include "exec/gdbstub.h" @@ -22,19 +23,58 @@ #include "monitor/hmp.h" #include "qemu/help_option.h" #include "monitor/hmp.h" +#include "monitor/hmp-completion.h" #include "monitor/monitor-internal.h" +#include "monitor/qdev.h" #include "qapi/error.h" #include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-machine.h" #include "qapi/qapi-commands-misc.h" +#include "block/block-hmp-cmds.h" #include "qobject/qdict.h" #include "qemu/cutils.h" #include "qemu/log.h" +#include "net/slirp.h" +#include "system/device_tree.h" #include "system/hw_accel.h" #include "system/memory.h" #include "system/system.h" #include "disas/disas.h" =20 +/* Please update hmp-commands.hx when adding or changing commands */ +static HMPCommand hmp_info_cmds[] =3D { +#include "hmp-commands-info.h" + { NULL, NULL, }, +}; + +/* hmp_cmds and hmp_info_cmds would be sorted at runtime */ +static HMPCommand hmp_cmds[] =3D { +#include "hmp-commands.h" + { NULL, NULL, }, +}; + +HMPCommand *hmp_cmds_for_target(bool info_command) +{ + return info_command ? hmp_info_cmds : hmp_cmds; +} + +static int +compare_mon_cmd(const void *a, const void *b) +{ + return strcmp(((const HMPCommand *)a)->name, + ((const HMPCommand *)b)->name); +} + +static void __attribute__((__constructor__)) sortcmdlist(void) +{ + qsort(hmp_cmds, ARRAY_SIZE(hmp_cmds) - 1, + sizeof(*hmp_cmds), + compare_mon_cmd); + qsort(hmp_info_cmds, ARRAY_SIZE(hmp_info_cmds) - 1, + sizeof(*hmp_info_cmds), + compare_mon_cmd); +} + bool hmp_handle_error(Monitor *mon, Error *err) { if (err) { diff --git a/monitor/hmp-target.c b/monitor/hmp-target.c deleted file mode 100644 index 2739383607d..00000000000 --- a/monitor/hmp-target.c +++ /dev/null @@ -1,74 +0,0 @@ -/* - * QEMU monitor, target-dependent part - * - * Copyright (c) 2003-2004 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - */ - -#include "qemu/osdep.h" -#include "qemu/base-arch-defs.h" -#include "monitor-internal.h" -#include "monitor/qdev.h" -#include "net/slirp.h" -#include "system/device_tree.h" -#include "monitor/hmp.h" -#include "monitor/hmp-completion.h" -#include "block/block-hmp-cmds.h" -#include "qapi/qapi-commands-control.h" -#include "qapi/qapi-commands-misc.h" -#include "qapi/qapi-commands-machine.h" -#include "hw/core/sysemu-cpu-ops.h" - -/* Make devices configuration available for use in hmp-commands*.hx templa= tes */ -#include CONFIG_DEVICES - -/* Please update hmp-commands.hx when adding or changing commands */ -static HMPCommand hmp_info_cmds[] =3D { -#include "hmp-commands-info.h" - { NULL, NULL, }, -}; - -/* hmp_cmds and hmp_info_cmds would be sorted at runtime */ -static HMPCommand hmp_cmds[] =3D { -#include "hmp-commands.h" - { NULL, NULL, }, -}; - -HMPCommand *hmp_cmds_for_target(bool info_command) -{ - return info_command ? hmp_info_cmds : hmp_cmds; -} - -static int -compare_mon_cmd(const void *a, const void *b) -{ - return strcmp(((const HMPCommand *)a)->name, - ((const HMPCommand *)b)->name); -} - -static void __attribute__((__constructor__)) sortcmdlist(void) -{ - qsort(hmp_cmds, ARRAY_SIZE(hmp_cmds) - 1, - sizeof(*hmp_cmds), - compare_mon_cmd); - qsort(hmp_info_cmds, ARRAY_SIZE(hmp_info_cmds) - 1, - sizeof(*hmp_info_cmds), - compare_mon_cmd); -} diff --git a/monitor/meson.build b/monitor/meson.build index 585251804e4..4c58dd148c0 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -7,6 +7,3 @@ system_ss.add(files( 'qemu-config-qmp.c', 'qmp-cmds.c', )) - -specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', - if_true: [files('hmp-target.c')]) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076491; cv=none; d=zohomail.com; s=zohoarc; b=OP6SEkziEXSd1z908yCFKKIMT5viD6jfeF9kR4tGYj0m2Jzp0HXfyRjEfNHAKGsrSmfO0ZW6qg6ZOZ03mT9lnFSVzZNQ0noHOFoGkLMtpjh5Ml8nUdDxRvKPRwXaI3FenJokqX4fJ1DGb4nxxeMB4ojvGVlj3a+F9mBUJd/fS0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076491; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=iaJFzIJUDSNhlu1CwM+oWQIx5FuRz0v1PPPiqNFhe2o=; b=iIdk6b5+VKHitmKUTddMca2x6awYHTfya8gUZnaHpX1L+GgQAKTvrqYx614w8b9VVuSDVqgcMhTHsGEeu1bFWHTP+/BJI2naCxWBICMazRK0PZXlr8MypVid0zfiZULNYqqSi+S6mRSGm7V7M0qO88KuWg+tAiUmAgDN+Xbj3X4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076491347704.9491224776224; Wed, 6 May 2026 07:08:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcsD-0003W0-1O; Wed, 06 May 2026 10:05:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcrQ-0001K7-0Q for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:25 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcrO-0001FL-Ho for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:23 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48909558b3aso71329195e9.0 for ; Wed, 06 May 2026 07:04:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53142ce6sm17647295e9.28.2026.05.06.07.04.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076260; x=1778681060; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=iaJFzIJUDSNhlu1CwM+oWQIx5FuRz0v1PPPiqNFhe2o=; b=e/9RZV0omwD2jQy/0ItRK5G9LsfmtRICjp/MWI3Bx7TGX2S5c9XSO7iL7978/plVLl UoVHA//b5SyoV4K/FfdMmE8O+UTwVvUuFOwZuATAXYFWFYY3B8jhF/SrWDj1qNv+utNy GBENYg1TTV5vLa9fm4tYqBOhe+HK85kpuZQjDIuU7f0IvlZGjN3BNFlMhO6L8C5yzeju tWOWZY2knBud1yBXiNMjwJS6p2d+BiWR4WU1L58uk82/Vd0g+rItMvpLPPsZ3VC6B2IM YIf6erflkHZOcXPFS9h8b9sTQFgqk7eIXGKFa1YO+rF3gtLQYDMkOzQTzDOonssDmo6X gJDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076260; x=1778681060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=iaJFzIJUDSNhlu1CwM+oWQIx5FuRz0v1PPPiqNFhe2o=; b=Ll68Mrf5yC4cFb3y5DDdWI7eRTPZrXTvLLbsnNcNkMET3RHcJ8RJS/u9nVz0e5OnEh fLTMzlINxKheNZLfPYzYOebxmO+p8as8+k1GKI3Ri9kh6b2IZdUst32PrTnF4K62dSp5 EAGrtjxUj6851Kh6YjEWwJnBm7LtlfSzjs0CfWa/LtW6kki+y7NsRjhQvwjIEW+yhff/ OIw3fvhJp6+qolWtbWBCq/SGQFIaFnU8zt6eYMSpdBCq1lrggpN+RBqmV1WFZLbKfU0M SMx0kTG3fCSogloDk3DS79lRrJIKmHPHE0axajh5fS1TSqcu/dQUEPZjgaXQUiSNbmOX C62g== X-Gm-Message-State: AOJu0YzLTl+I9D6QZl9/YDd/DHWFAq2gdNGdXXRt0PE0qPoyDKcr4GTQ tinuEctKoRl1oaqvZkrSskaG116WUACO7ybsFdz8rf6OHfzzvUTJ8dEiJb5jqYE813n95ufwJiG 2UD4RlY8= X-Gm-Gg: AeBDievVb8BtrRH6THrjXhpRHF5EfkoQGGHkKB5AO7FSTK+0H2crq6I/BQGDB1RKdvj RqvXt7gBONZPp0noF8uv5KF5zmRek9x9ZhfKwmBeJOq9Xv4Dli8rW/ts91qr6Op5tS72JZShU7W AUnKYj0/c8E6fyFXcnzYwRO3b+3Nkm/45IE/uulVsfRPC/ZdN68qrPDyzomLVF8wu7n4lQdmr36 knFBcmEcS9ZjqM7qGMhwp6OH3GSLEfGWpvlNlFSLWmIZB7sre8NTlstg6Aqh6sG6DI1/qlSGC/P IApGlFHLfWYBr9fxB/posh0oj5Ndfrs3arRTGAZch0ovbq3XM32IFRIGKEXR8K72IZSG0ty/EBY HH3+wtza/Nqs33HO2wqnm1nHt1ZTva5QjUHQRTg5v/3JgrotT48LTiMsuwjy/0C9zQVmdAn7vym fpUBvXej2DI5uM82PhjdBKuQcnuRArQAmi7dP6sY4XRkjj3aeHSwru22tyLXqAn70JHClevpnr8 CKTha+4yqY= X-Received: by 2002:a05:600c:47d3:b0:48d:c0a:3813 with SMTP id 5b1f17b1804b1-48e51e0bb62mr38985735e9.3.1778076259944; Wed, 06 May 2026 07:04:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 068/110] monitor: Remove hmp_info_pic() left-over declaration Date: Wed, 6 May 2026 15:54:40 +0200 Message-ID: <20260506135524.20617-69-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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: 1778076493064158500 When converting 'info pic' to QMP in commit 795eaa62fa6 ("hw/intc: Introduce x-query-interrupt-controllers QMP command"), we forgot to remove the hmp_info_pic() declaration. Do it now. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260427080738.77138-33-philmd@linaro.org> --- include/monitor/hmp.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 9bf46795bd4..9258a049bff 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -52,7 +52,6 @@ void hmp_info_cpus(Monitor *mon, const QDict *qdict); void hmp_info_vnc(Monitor *mon, const QDict *qdict); void hmp_info_spice(Monitor *mon, const QDict *qdict); void hmp_info_balloon(Monitor *mon, const QDict *qdict); -void hmp_info_pic(Monitor *mon, const QDict *qdict); void hmp_info_pci(Monitor *mon, const QDict *qdict); void hmp_info_tpm(Monitor *mon, const QDict *qdict); void hmp_info_iothreads(Monitor *mon, const QDict *qdict); --=20 2.53.0 From nobody Sat May 30 07:57:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076449914208.39490485779186; Wed, 6 May 2026 07:07:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcs3-0002eB-1i; Wed, 06 May 2026 10:05:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcra-0001hy-0D for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:34 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcrY-0001HA-1o for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:33 -0400 Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-ba3115fe0d5so182701966b.1 for ; Wed, 06 May 2026 07:04:31 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45052a48c04sm13277383f8f.15.2026.05.06.07.04.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:04:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076269; x=1778681069; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uM6UWyoawDF9y6Yim7qGoTjBgyDsq2sGYBt8tqPaAvs=; b=uEA0UZ2s0fNv5JhBBQka7ua30cCrEHEyv5hpTfFISL5sLvJtDfcM2WRc15euOhKHe4 /V+oZTrgt1tuUICr2R5XtQ4P9yMjEt7Jgw7YqaUeScw9bQBOpzf5mGQOj4KIECRXR1fQ jGrb4kB2TdCUnxYw0EdzJPolRm5Iym+1HHMUE1wrEIJE9KJohbEXI3xT+DBzEH0sd1jy EDXWfRdqodXMVy+eDj8omQKYgaQ1jev7tQJw9u8Lth+cTTykLMPKS2+8KjnjtRR3mEZe eqXIlumX9Kv3Q9BbNmlgak9P2QlXwMI8woIjEb459bXForF6NK7wq3j1bOIe/S/8009a kTlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076269; x=1778681069; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=uM6UWyoawDF9y6Yim7qGoTjBgyDsq2sGYBt8tqPaAvs=; b=HOU2oNCSB1rWIiyKlufx5vaGhYA8ttRv8msKarFM/OYvq4ml/PXgxtsQF8MLBlrqz7 KcRlPATXtUsWwQo6E6G+Xo650T7DGvGO8tc6IE9onex3eQJ7jUQ5sLIwsRr3dS2elQyA xcgmosNeDB0NI9R7kWjp0DgR4WJzkHrtzTt4QUuToy5kD6XL0KSPHqn9Q1BdgcKqI7Lg +R/kYadFv+TM5BdjOvNLujX/xbS1VF4EhIAm4oMvPqshWx9YnRtQmCEWCwyymItIIsFK ASoZxQwEqSEUIsuUTwb9AmfHWFy6KVAoeIP11+AI4If86GkJyD7Y1r7YWXyyfEHEAjhq gwQg== X-Gm-Message-State: AOJu0YxpM117jCnoGeNmVg0+mhzDJcD9fPENvaFkyP5QI44IqBFCEdJy 0BaIIEXyMXVHlpBpgh4VCjXARdRDIEd4b4FW+/fHXGCuWIPeQAEK2e0WkXIo5EYMuWUoSaecNeL Xho/r8po= X-Gm-Gg: AeBDiesrWDIFv5jJHu3KW+oBbHosKhwX3XKJ+DkYggex9wsIicVULmiPIlKlcJ07FDZ Mtc10q2c//hp2n/LU+ntxJHkfSbhgse9w8SIIQ/GnluCwxJUdMSQd/fVBcSuKV/UDSA6A2SsmMt uM093Y/r/HQSwHlF2Fs+CEdGyMvXCd7VKJjLfoxTdD+liTZG76HyJRqYk+jISOQ0PJM6Lc2g9F6 YAdJmpJZaZpn/fOvM7nuSYKghYaI8pmRZCKOLYAY1Fs34c5W/9AM938m8rdDM/hO/z31NY36Q6o gyjjie3DM5X0GMGyFGwqFBWDPPQdZn8ks3CgNyu9WgnAHaNa5rG8GWMMB2G5F3AvniinKKmpsw2 /eGHG7O0mzx3HY7Pa4q1OEqwFqrXEnwiEnK1c03itC9H63JR2hJaa3Mgm0CinTXCxLyOx4CqQOi yj9wK860vgjhwc0WjBDbaqKfgSkSo9fEVtgKjlU+WoU+I4QJZPqGe/4224sTwRQ77eVpWKzqXPt GiquGkTDwU= X-Received: by 2002:a17:906:e090:b0:bc4:f3ff:7c46 with SMTP id a640c23a62f3a-bc4f3ff83d3mr210646366b.7.1778076267985; Wed, 06 May 2026 07:04:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 069/110] target/mips: Inline cpu_ld{uw, l}_code() calls in set_badinstr_registers Date: Wed, 6 May 2026 15:54:41 +0200 Message-ID: <20260506135524.20617-70-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=philmd@linaro.org; helo=mail-ej1-x634.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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1778076452212154100 In preparation of removing the cpu_lduw_code() and cpu_ldl_code() wrappers, inline them. Directly replace MO_TE by mo_endian_env(env). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260320074555.33974-2-philmd@linaro.org> --- target/mips/tcg/system/tlb_helper.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/target/mips/tcg/system/tlb_helper.c b/target/mips/tcg/system/t= lb_helper.c index 566924b079e..b989c7e5bd5 100644 --- a/target/mips/tcg/system/tlb_helper.c +++ b/target/mips/tcg/system/tlb_helper.c @@ -999,16 +999,22 @@ static void set_hflags_for_handler(CPUMIPSState *env) =20 static inline void set_badinstr_registers(CPUMIPSState *env) { + CPUState *cs =3D env_cpu(env); + MemOpIdx oi; + if (env->insn_flags & ISA_NANOMIPS32) { if (env->CP0_Config3 & (1 << CP0C3_BI)) { - uint32_t instr =3D (cpu_lduw_code(env, env->active_tc.PC)) << = 16; + uint32_t instr; + + oi =3D make_memop_idx(mo_endian_env(env) | MO_UW, cpu_mmu_inde= x(cs, true)); + instr =3D cpu_ldw_code_mmu(env, env->active_tc.PC, oi, 0) << = 16; if ((instr & 0x10000000) =3D=3D 0) { - instr |=3D cpu_lduw_code(env, env->active_tc.PC + 2); + instr |=3D cpu_ldw_code_mmu(env, env->active_tc.PC + 2, oi= , 0); } env->CP0_BadInstr =3D instr; =20 if ((instr & 0xFC000000) =3D=3D 0x60000000) { - instr =3D cpu_lduw_code(env, env->active_tc.PC + 4) << 16; + instr =3D cpu_ldw_code_mmu(env, env->active_tc.PC + 4, oi= , 0) << 16; env->CP0_BadInstrX =3D instr; } } @@ -1019,12 +1025,14 @@ static inline void set_badinstr_registers(CPUMIPSSt= ate *env) /* TODO: add BadInstr support for microMIPS */ return; } + + oi =3D make_memop_idx(mo_endian_env(env) | MO_UL, cpu_mmu_index(cs, tr= ue)); if (env->CP0_Config3 & (1 << CP0C3_BI)) { - env->CP0_BadInstr =3D cpu_ldl_code(env, env->active_tc.PC); + env->CP0_BadInstr =3D cpu_ldl_code_mmu(env, env->active_tc.PC, oi,= 0); } if ((env->CP0_Config3 & (1 << CP0C3_BP)) && (env->hflags & MIPS_HFLAG_BMASK)) { - env->CP0_BadInstrP =3D cpu_ldl_code(env, env->active_tc.PC - 4); + env->CP0_BadInstrP =3D cpu_ldl_code_mmu(env, env->active_tc.PC - 4= , oi, 0); } } =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076475; cv=none; d=zohomail.com; s=zohoarc; b=YVDEiOzbHWsZ/vpKrl/NIOSTxV4Ms1xFDfKi3f9lM3+K0SK5CLik1mwh9N1qHNLsymvhe6AM5oUh+GW2UJZAB7g2cwIe6ks2IAaKzW6sxf9UsmJl69GrXzEzzcSxYri5syXSHa1gMAGibbOZvrM75vKDmbuR8OwTNB3UVtE5k6s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076475; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=ZP4w7Rk3n+TwTim0y/LaZ0U4XGUljk46CIvMASTDLg4=; b=Z3ZpQRwcFxfVb5ntd/eJEXdG9bwIlHtV81X0AQGpR59j8fRJsQxR1NL4Bp9OoXO8T6ztk6BU/rKXB3QtxR+qrQj0a2ofmQe169CraZgDVYXsF9p2ojErjQqHWjfNy/9U1FqE7/Ilj1RVYwfFyxZAWZRTtyEj3NoNHqIXk354z6Q= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076475585251.44781070787212; Wed, 6 May 2026 07:07:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcsF-0003kF-MJ; Wed, 06 May 2026 10:05:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcrh-0002E4-I5 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:42 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcre-0001IZ-Qz for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:41 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-452169ae568so386357f8f.3 for ; Wed, 06 May 2026 07:04:38 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-450524833e1sm13014054f8f.2.2026.05.06.07.04.33 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:04:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076276; x=1778681076; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ZP4w7Rk3n+TwTim0y/LaZ0U4XGUljk46CIvMASTDLg4=; b=tnL3Iv+eB2Fs57wCa71oRR+jKL7Kw03E9jjCH6mqmmPGT/fLbPvq3jq8YPi1urzFma eQcnYeAzLr1lb+IghwmgJwOfLDYWZankU0RhgXunoGTmB+/G2IxdxaWa9SiViGwrWVtL jg9wOnMMcsCZC4kvSpe9Z+Hx5zoLI2kn3O6kIsBDGQ73D/1UAsdvwWbztoLrYjGqwxKp aUm7HhyvYzE9vqRxOsDXogywDesqJN/yo3Gle3mIpuR+nJyNhJEOf8umeroW7RmfIv+J gFPsEBL5MYQtKSV8qlWDdHhWgLHqrytrlDY6ozLMPIIXFkU1L5euRWe5qxnzmlFM6MIE PEKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076276; x=1778681076; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ZP4w7Rk3n+TwTim0y/LaZ0U4XGUljk46CIvMASTDLg4=; b=lma3xuuCw/QlsTxQR6kMX9M1kzMb3Aj8amCTyMcRjMLJNCI/RvIBY7YvRAPsr7uy3M yO9HO+EgOhaKjp61T8BJmdrPUBNVhVcIrnRrM3FcHIi0aFDAt8OBJmYJEKA5V/WcLrPx vSGo95J8D05IJgtGg2WmtXSOU7ZvTwrAKNiqF1Pvrn0vnwATaQHBodcrZnGcaR8I5v5l Esg7C6qm0T1XraHO62L5RGb+2EiL6NvWW1QBESzfA5qV9o6SxZD3u9WlStlb2TCUjyOA iJqNfz9tUo9eDZYfzZOj/COEpT7uMe2XuXuzggG7ZEbQzGMq/tV+1x+++d62Ob9uNSD6 2hHA== X-Gm-Message-State: AOJu0YygmcV5W186X7ArqCSO4t7Ifq/QbcLO4z6BkjDI3J9RNw5gaCp4 yIeclrvkwQDSmoAv+RbVa3kKihGZLtNUcRDKYyyjyhbF2bT6Z0krPaWrcNCtyhzRXB1/X6YtsS5 bx/r6DAc= X-Gm-Gg: AeBDieuV1tEh5EJJ1Vz9TadqDrE+j3JGTOnxC+CcRKdmNMk826U6ESVtOVPf4VJwl13 lO5jMWS3UtUp8HnwJl6dVeftS+JjywApP0LO89hw+ZmEiTHTNq/7G3QBjksoOyeZ/X2rGL9DBMV j1HnuJd1UZhicA+ffU39BPCf6TfLlIo1UN83oPQJgP7dwREYB+qQkRyKLJeYYbCay5ILousi8sc m2nHo39rWzPFk//lFHzwzp+8l0u1bkiAKa5r1KDQQq+pWc5ee1P5LEtsjl2iqxenp+i66RMkO+x Fu9k7YlHLglSx30voHE51YjBnZotqI8OXKd4YErcyFKYsmVC8Bi8y/jYaSlifIuY5knYUndwRLc dGny2OVy1tzPxYJyoNw6GoCosDC/Q1FUuIDEAlDcn49i7YWzULkEA5TNxkzQUvMq9mZ52oBm66M 7TmDXhdqdfrZSK1ZcmGl81cqmcdzXrur0g3U5P88lUrhQ/QL55eyAVuqcmomCMoVGeJGLtPZmBB zTsC4JAjV+GM8A197EDiA== X-Received: by 2002:a05:6000:290f:b0:43d:7af0:3a7c with SMTP id ffacd0b85a97d-4515d3dc24cmr6096479f8f.29.1778076275787; Wed, 06 May 2026 07:04:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 070/110] accel/tcg: Remove non-explicit endian cpu_ld*_code() wrappers Date: Wed, 6 May 2026 15:54:42 +0200 Message-ID: <20260506135524.20617-71-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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: 1778076478697154100 All uses were converted to the cpu_ld*_code_mmu() helpers: remove them. Update the documentation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260320074555.33974-3-philmd@linaro.org> --- docs/devel/loads-stores.rst | 21 +++++++++------------ include/accel/tcg/cpu-ldst.h | 33 ++------------------------------- 2 files changed, 11 insertions(+), 43 deletions(-) diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst index 57892e814cd..c719241a7f5 100644 --- a/docs/devel/loads-stores.rst +++ b/docs/devel/loads-stores.rst @@ -235,16 +235,13 @@ Regexes for git grep: - ``\`` - ``\`` =20 -``cpu_ld*_code`` -~~~~~~~~~~~~~~~~ +``cpu_ld*_code_mmu`` +~~~~~~~~~~~~~~~~~~~~ =20 -These functions perform a read for instruction execution. The ``mmuidx`` -parameter is taken from the current mode of the guest CPU, as determined -by ``cpu_mmu_index(env, true)``. The ``retaddr`` parameter is 0, and -thus does not unwind guest CPU state, because CPU state is always -synchronized while translating instructions. Any guest CPU exception -that is raised will indicate an instruction execution fault rather than -a data read fault. +These functions work like the ``cpu_{ld,st}*_mmu`` functions +except that they perform a read for instruction execution. +Any guest CPU exception that is raised will indicate an instruction +execution fault rather than a data read fault. =20 In general these functions should not be used directly during translation. There are wrapper functions that are to be used which also take care of @@ -252,7 +249,7 @@ plugins for tracing. =20 Function names follow the pattern: =20 -load: ``cpu_ld{sign}{size}_code(env, ptr)`` +load: ``cpu_ld{sign}{size}_code_mmu(env, addr, oi, retaddr)`` =20 ``sign`` - (empty) : for 32 or 64 bit sizes @@ -266,12 +263,12 @@ load: ``cpu_ld{sign}{size}_code(env, ptr)`` - ``q`` : 64 bits =20 Regexes for git grep: - - ``\`` + - ``\`` =20 ``translator_ld*`` ~~~~~~~~~~~~~~~~~~ =20 -These functions are a wrapper for ``cpu_ld*_code`` which also perform +These functions are a wrapper for ``cpu_ld*_code_mmu`` which also perform any actions required by any tracing plugins. They are only to be called during the translator callback ``translate_insn``. =20 diff --git a/include/accel/tcg/cpu-ldst.h b/include/accel/tcg/cpu-ldst.h index ea2cbf40fe4..1facabccb23 100644 --- a/include/accel/tcg/cpu-ldst.h +++ b/include/accel/tcg/cpu-ldst.h @@ -51,10 +51,9 @@ * _be: for forced big endian * _le: for forced little endian * - * mmusuffix is one of the generic suffixes "data" or "code", or "mmuidx". + * mmusuffix is one of the generic suffixes "data" or "mmuidx". * The "mmuidx" suffix carries an extra mmu_idx argument that specifies - * the index to use; the "data" and "code" suffixes take the index from - * cpu_mmu_index(). + * the index to use; the "data" suffix take the index from cpu_mmu_index(). * * The "mmu" suffix carries the full MemOpIdx, with both mmu_idx and the * MemOp including alignment requirements. The alignment will be enforced. @@ -470,34 +469,6 @@ cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint6= 4_t val) # define cpu_stl_mmuidx_ra cpu_stl_le_mmuidx_ra # define cpu_stq_mmuidx_ra cpu_stq_le_mmuidx_ra #endif - -static inline uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr) -{ - CPUState *cs =3D env_cpu(env); - MemOpIdx oi =3D make_memop_idx(MO_UB, cpu_mmu_index(cs, true)); - return cpu_ldb_code_mmu(env, addr, oi, 0); -} - -static inline uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr) -{ - CPUState *cs =3D env_cpu(env); - MemOpIdx oi =3D make_memop_idx(MO_TEUW, cpu_mmu_index(cs, true)); - return cpu_ldw_code_mmu(env, addr, oi, 0); -} - -static inline uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr) -{ - CPUState *cs =3D env_cpu(env); - MemOpIdx oi =3D make_memop_idx(MO_TEUL, cpu_mmu_index(cs, true)); - return cpu_ldl_code_mmu(env, addr, oi, 0); -} - -static inline uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr) -{ - CPUState *cs =3D env_cpu(env); - MemOpIdx oi =3D make_memop_idx(MO_TEUQ, cpu_mmu_index(cs, true)); - return cpu_ldq_code_mmu(env, addr, oi, 0); -} #endif /* TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API */ =20 #endif /* ACCEL_TCG_CPU_LDST_H */ --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076363; cv=none; d=zohomail.com; s=zohoarc; b=WU++TTNZ1IZ/17QrXYuZXUrCqb9jcsSslMRqTYPQnM2QtXT/tOBejYQ7iaU9Vs2nh6M5pMj2VzAJCRNH1ex0690/6WIm8PNpu3F7Qsz0Hz77pn74lAaIHoWqfeuPSObb54RgvFe/D4S1sATqtacELPhtU207NMCrYTeIuRgiSHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076363; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=2sOtV0nGpXlClIGXqHIZRKSGE+5DG05GGKqGl7jucBY=; b=JV1aTcP+eWAyTNBo3ob8HCgYwuNvV1EB8l8t62Xtm3yUqd5MsD5hBC+6rLiNT7BrIfubVD4e772DdyVPMPciPhI1iEHnHSkSxL8o9tDSommI3628laQMi2nv8sP5m/XE1zg0AiLnXcfE814Yl90KlMyMBdz3NdbBbuqcKjE1XUc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076363811459.565279717405; Wed, 6 May 2026 07:06:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcsJ-0003qu-OI; Wed, 06 May 2026 10:05:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcrx-0002OM-LW for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:59 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcrq-0001KR-Ge for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:56 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-44c4cc7c1cfso3163372f8f.0 for ; Wed, 06 May 2026 07:04:50 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055e2d3d0sm12313320f8f.34.2026.05.06.07.04.41 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076287; x=1778681087; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2sOtV0nGpXlClIGXqHIZRKSGE+5DG05GGKqGl7jucBY=; b=y+X50X0bdWAGkIkotpqgddlnGA4udrHud5xBaCVvDdFByC8HtoB+WXwDxsIRdb9a/H tnWksiSJSzEnoLieMZ9dOGwX0ZAz0eCkB1VbaJsIHDi1zqFHOHBkTZx3uTAColPEjg59 Qh0rxtjCl3KYnQ2LtOpHZQ8ZvglJHB/XlGGK4qLclD1rG6g+ghAptRw0oBZvvQeW/F73 t9wsWZD467zZdgn11XXWA7mI9XONQK0GNwnyknW6R0p1GUYsNa8w47gfCWWdt3/0tiky UJOWIc7U4HHoR0TWSPBVNga0vzeb4VEBeqrunAxUOGVso7aXUMCYZnEC0VLhE+bn96a+ qGHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076287; x=1778681087; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=2sOtV0nGpXlClIGXqHIZRKSGE+5DG05GGKqGl7jucBY=; b=TqOdCvcAYlEoVJQ2KMovgLYcWikZsCcM59tw3EbpOTmQPl1W+F3dBj4M4W8Itv1UKx agDuSDsDDUR+MsuvB/rj0R1NUQ7XZS5xJNs2Z0k+VsQPL+nWkxXOcdzC5WoizmWafjl3 VnzePbBewd789FytbTTi+Jll/IiTSrA1KGxv/rPMBexe/aBU7bZFa08jUjsgogt2hB9t W7yGkJEK1ruIaJuz0ypU9oUTYu0bQVOyf8PwNKYIE25myVXmmUKddLPEbX00GZBzzu7E SfQtxgfBfQwhd111HN7W2WTumpLUF6AV6kNPz7V9b8Nxq5jGt1NtE/dH1JYYMaqO38G3 Bjog== X-Gm-Message-State: AOJu0YzSkFz5FKPPp9xhe3cakpxHeRq1xTiPNsPc8nX6hyaN+4c0+NhL 7XAPWd/It+eipXwZryvzc75GV+UC103dUx8XTRoS/f7CLfDhTYKsUX202av15XzRhT4fW+g/UzC y8NY6r8Q= X-Gm-Gg: AeBDiessHjx6BHoSoTHqmCF7tBEIKft31hThsr2X/IJA0VSre7KpDcdMYqMsZUJDPoT TwEjcW1/tpVIip+ZsILcdcBtb8j8LUzR4ma3UoWhhL5r/YswhUiENlOIn1pXkncjGyM+cN6mfEG 7hi6DzA84ghXWW+Kiy4jVwTjVat5OPIHRMr6Hy9M6zdkRhyUnvKq4WITVPI+mZZc0kDf6tAeq+1 yn2+lq1c2xQez8lltbMryCNud6rObfHU2hlWZD7cHqSex+UHSDAZXhNjORJ9bXxuZPqfg9CNaJp 4Bjnlxh6Ob0g3B0iUyetI+BS2NRyqVu/6UyinLV1H/CwI/7Sn2KA+ezslIE3Pb9vcjx9JgRkx0M vDl8/3HONxo7dXvpoOhApviar/WDHePgx2NSknTvhvRVBXP50JSwlxaZmVj5vOZrYK9lFCSBCGh x3bWhm4/2GG/aJoajkrBwciqP5b0DspE8VhZRjX2Z2gIBamaOnnesXCjmbnmClPHGgzbVvfqe2b cW1mjktOEk= X-Received: by 2002:a5d:54c9:0:b0:43d:73d4:b34 with SMTP id ffacd0b85a97d-4515b525080mr4463863f8f.16.1778076285495; Wed, 06 May 2026 07:04:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 071/110] target/mips: Expand TCGv type as 32-bit for XBurst MXU Date: Wed, 6 May 2026 15:54:43 +0200 Message-ID: <20260506135524.20617-72-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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: 1778076366848154100 The MXU extension is only built as 32-bit, so TCGv expands to TCGv_i32. Use the latter which is more explicit. In gen_mxu_s32madd_sub() directly expand: - tcg_gen_ext[u]_tl_i64 -> tcg_gen_ext[u]_i32_i64 - tcg_gen_concat_tl_i64 -> tcg_gen_concat_i32_i64 the rest being mechanical changes. Cc: Siarhei Volkau Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260401144503.80510-2-philmd@linaro.org> --- target/mips/tcg/mxu_translate.c | 1954 +++++++++++++++---------------- 1 file changed, 977 insertions(+), 977 deletions(-) diff --git a/target/mips/tcg/mxu_translate.c b/target/mips/tcg/mxu_translat= e.c index 35ebb0397da..7961b073144 100644 --- a/target/mips/tcg/mxu_translate.c +++ b/target/mips/tcg/mxu_translate.c @@ -606,8 +606,8 @@ enum { #define MXU_OPTN3_PTN7 7 =20 /* MXU registers */ -static TCGv mxu_gpr[NUMBER_OF_MXU_REGISTERS - 1]; -static TCGv mxu_CR; +static TCGv_i32 mxu_gpr[NUMBER_OF_MXU_REGISTERS - 1]; +static TCGv_i32 mxu_CR; =20 static const char mxuregnames[NUMBER_OF_MXU_REGISTERS][4] =3D { "XR1", "XR2", "XR3", "XR4", "XR5", "XR6", "XR7", "XR8", @@ -628,42 +628,42 @@ void mxu_translate_init(void) } =20 /* MXU General purpose registers moves. */ -static inline void gen_load_mxu_gpr(TCGv t, unsigned int reg) +static inline void gen_load_mxu_gpr(TCGv_i32 t, unsigned int reg) { if (reg =3D=3D 0) { - tcg_gen_movi_tl(t, 0); + tcg_gen_movi_i32(t, 0); } else if (reg <=3D 15) { - tcg_gen_mov_tl(t, mxu_gpr[reg - 1]); + tcg_gen_mov_i32(t, mxu_gpr[reg - 1]); } } =20 -static inline void gen_store_mxu_gpr(TCGv t, unsigned int reg) +static inline void gen_store_mxu_gpr(TCGv_i32 t, unsigned int reg) { if (reg > 0 && reg <=3D 15) { - tcg_gen_mov_tl(mxu_gpr[reg - 1], t); + tcg_gen_mov_i32(mxu_gpr[reg - 1], t); } } =20 -static inline void gen_extract_mxu_gpr(TCGv t, unsigned int reg, +static inline void gen_extract_mxu_gpr(TCGv_i32 t, unsigned int reg, unsigned int ofs, unsigned int len) { if (reg =3D=3D 0) { - tcg_gen_movi_tl(t, 0); + tcg_gen_movi_i32(t, 0); } else if (reg <=3D 15) { - tcg_gen_extract_tl(t, mxu_gpr[reg - 1], ofs, len); + tcg_gen_extract_i32(t, mxu_gpr[reg - 1], ofs, len); } } =20 /* MXU control register moves. */ -static inline void gen_load_mxu_cr(TCGv t) +static inline void gen_load_mxu_cr(TCGv_i32 t) { - tcg_gen_mov_tl(t, mxu_CR); + tcg_gen_mov_i32(t, mxu_CR); } =20 -static inline void gen_store_mxu_cr(TCGv t) +static inline void gen_store_mxu_cr(TCGv_i32 t) { /* TODO: Add handling of RW rules for MXU_CR. */ - tcg_gen_mov_tl(mxu_CR, t); + tcg_gen_mov_i32(mxu_CR, t); } =20 /* @@ -671,10 +671,10 @@ static inline void gen_store_mxu_cr(TCGv t) */ static void gen_mxu_s32i2m(DisasContext *ctx) { - TCGv t0; + TCGv_i32 t0; uint32_t XRa, Rb; =20 - t0 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 5); Rb =3D extract32(ctx->opcode, 16, 5); @@ -692,10 +692,10 @@ static void gen_mxu_s32i2m(DisasContext *ctx) */ static void gen_mxu_s32m2i(DisasContext *ctx) { - TCGv t0; + TCGv_i32 t0; uint32_t XRa, Rb; =20 - t0 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 5); Rb =3D extract32(ctx->opcode, 16, 5); @@ -717,11 +717,11 @@ static void gen_mxu_s32m2i(DisasContext *ctx) */ static void gen_mxu_s8ldd(DisasContext *ctx, bool postmodify) { - TCGv t0, t1; + TCGv_i32 t0, t1; uint32_t XRa, Rb, s8, optn3; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); s8 =3D extract32(ctx->opcode, 10, 8); @@ -729,7 +729,7 @@ static void gen_mxu_s8ldd(DisasContext *ctx, bool postm= odify) Rb =3D extract32(ctx->opcode, 21, 5); =20 gen_load_gpr(t0, Rb); - tcg_gen_addi_tl(t0, t0, (int8_t)s8); + tcg_gen_addi_i32(t0, t0, (int8_t)s8); if (postmodify) { gen_store_gpr(t0, Rb); } @@ -737,52 +737,52 @@ static void gen_mxu_s8ldd(DisasContext *ctx, bool pos= tmodify) switch (optn3) { /* XRa[7:0] =3D tmp8 */ case MXU_OPTN3_PTN0: - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UB); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_UB); gen_load_mxu_gpr(t0, XRa); - tcg_gen_deposit_tl(t0, t0, t1, 0, 8); + tcg_gen_deposit_i32(t0, t0, t1, 0, 8); break; /* XRa[15:8] =3D tmp8 */ case MXU_OPTN3_PTN1: - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UB); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_UB); gen_load_mxu_gpr(t0, XRa); - tcg_gen_deposit_tl(t0, t0, t1, 8, 8); + tcg_gen_deposit_i32(t0, t0, t1, 8, 8); break; /* XRa[23:16] =3D tmp8 */ case MXU_OPTN3_PTN2: - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UB); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_UB); gen_load_mxu_gpr(t0, XRa); - tcg_gen_deposit_tl(t0, t0, t1, 16, 8); + tcg_gen_deposit_i32(t0, t0, t1, 16, 8); break; /* XRa[31:24] =3D tmp8 */ case MXU_OPTN3_PTN3: - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UB); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_UB); gen_load_mxu_gpr(t0, XRa); - tcg_gen_deposit_tl(t0, t0, t1, 24, 8); + tcg_gen_deposit_i32(t0, t0, t1, 24, 8); break; /* XRa =3D {8'b0, tmp8, 8'b0, tmp8} */ case MXU_OPTN3_PTN4: - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UB); - tcg_gen_deposit_tl(t0, t1, t1, 16, 16); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_UB); + tcg_gen_deposit_i32(t0, t1, t1, 16, 16); break; /* XRa =3D {tmp8, 8'b0, tmp8, 8'b0} */ case MXU_OPTN3_PTN5: - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UB); - tcg_gen_shli_tl(t1, t1, 8); - tcg_gen_deposit_tl(t0, t1, t1, 16, 16); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_UB); + tcg_gen_shli_i32(t1, t1, 8); + tcg_gen_deposit_i32(t0, t1, t1, 16, 16); break; /* XRa =3D {{8{sign of tmp8}}, tmp8, {8{sign of tmp8}}, tmp8} */ case MXU_OPTN3_PTN6: - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_SB); - tcg_gen_mov_tl(t0, t1); - tcg_gen_andi_tl(t0, t0, 0xFF00FFFF); - tcg_gen_shli_tl(t1, t1, 16); - tcg_gen_or_tl(t0, t0, t1); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_SB); + tcg_gen_mov_i32(t0, t1); + tcg_gen_andi_i32(t0, t0, 0xFF00FFFF); + tcg_gen_shli_i32(t1, t1, 16); + tcg_gen_or_i32(t0, t0, t1); break; /* XRa =3D {tmp8, tmp8, tmp8, tmp8} */ case MXU_OPTN3_PTN7: - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UB); - tcg_gen_deposit_tl(t1, t1, t1, 8, 8); - tcg_gen_deposit_tl(t0, t1, t1, 16, 16); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_UB); + tcg_gen_deposit_i32(t1, t1, t1, 8, 8); + tcg_gen_deposit_i32(t0, t1, t1, 16, 16); break; } =20 @@ -797,11 +797,11 @@ static void gen_mxu_s8ldd(DisasContext *ctx, bool pos= tmodify) */ static void gen_mxu_s8std(DisasContext *ctx, bool postmodify) { - TCGv t0, t1; + TCGv_i32 t0, t1; uint32_t XRa, Rb, s8, optn3; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); s8 =3D extract32(ctx->opcode, 10, 8); @@ -814,7 +814,7 @@ static void gen_mxu_s8std(DisasContext *ctx, bool postm= odify) } =20 gen_load_gpr(t0, Rb); - tcg_gen_addi_tl(t0, t0, (int8_t)s8); + tcg_gen_addi_i32(t0, t0, (int8_t)s8); if (postmodify) { gen_store_gpr(t0, Rb); } @@ -823,23 +823,23 @@ static void gen_mxu_s8std(DisasContext *ctx, bool pos= tmodify) switch (optn3) { /* XRa[7:0] =3D> tmp8 */ case MXU_OPTN3_PTN0: - tcg_gen_extract_tl(t1, t1, 0, 8); + tcg_gen_extract_i32(t1, t1, 0, 8); break; /* XRa[15:8] =3D> tmp8 */ case MXU_OPTN3_PTN1: - tcg_gen_extract_tl(t1, t1, 8, 8); + tcg_gen_extract_i32(t1, t1, 8, 8); break; /* XRa[23:16] =3D> tmp8 */ case MXU_OPTN3_PTN2: - tcg_gen_extract_tl(t1, t1, 16, 8); + tcg_gen_extract_i32(t1, t1, 16, 8); break; /* XRa[31:24] =3D> tmp8 */ case MXU_OPTN3_PTN3: - tcg_gen_extract_tl(t1, t1, 24, 8); + tcg_gen_extract_i32(t1, t1, 24, 8); break; } =20 - tcg_gen_qemu_st_tl(t1, t0, ctx->mem_idx, MO_UB); + tcg_gen_qemu_st_i32(t1, t0, ctx->mem_idx, MO_UB); } =20 /* @@ -850,12 +850,12 @@ static void gen_mxu_s8std(DisasContext *ctx, bool pos= tmodify) */ static void gen_mxu_s16ldd(DisasContext *ctx, bool postmodify) { - TCGv t0, t1; + TCGv_i32 t0, t1; uint32_t XRa, Rb, optn2; int32_t s10; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); s10 =3D sextract32(ctx->opcode, 10, 9) * 2; @@ -863,7 +863,7 @@ static void gen_mxu_s16ldd(DisasContext *ctx, bool post= modify) Rb =3D extract32(ctx->opcode, 21, 5); =20 gen_load_gpr(t0, Rb); - tcg_gen_addi_tl(t0, t0, s10); + tcg_gen_addi_i32(t0, t0, s10); if (postmodify) { gen_store_gpr(t0, Rb); } @@ -871,25 +871,25 @@ static void gen_mxu_s16ldd(DisasContext *ctx, bool po= stmodify) switch (optn2) { /* XRa[15:0] =3D tmp16 */ case MXU_OPTN2_PTN0: - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UW); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_UW); gen_load_mxu_gpr(t0, XRa); - tcg_gen_deposit_tl(t0, t0, t1, 0, 16); + tcg_gen_deposit_i32(t0, t0, t1, 0, 16); break; /* XRa[31:16] =3D tmp16 */ case MXU_OPTN2_PTN1: - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UW); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_UW); gen_load_mxu_gpr(t0, XRa); - tcg_gen_deposit_tl(t0, t0, t1, 16, 16); + tcg_gen_deposit_i32(t0, t0, t1, 16, 16); break; /* XRa =3D sign_extend(tmp16) */ case MXU_OPTN2_PTN2: - tcg_gen_qemu_ld_tl(t0, t0, ctx->mem_idx, MO_SW); + tcg_gen_qemu_ld_i32(t0, t0, ctx->mem_idx, MO_SW); break; /* XRa =3D {tmp16, tmp16} */ case MXU_OPTN2_PTN3: - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_UW); - tcg_gen_deposit_tl(t0, t1, t1, 0, 16); - tcg_gen_deposit_tl(t0, t1, t1, 16, 16); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_UW); + tcg_gen_deposit_i32(t0, t1, t1, 0, 16); + tcg_gen_deposit_i32(t0, t1, t1, 16, 16); break; } =20 @@ -904,12 +904,12 @@ static void gen_mxu_s16ldd(DisasContext *ctx, bool po= stmodify) */ static void gen_mxu_s16std(DisasContext *ctx, bool postmodify) { - TCGv t0, t1; + TCGv_i32 t0, t1; uint32_t XRa, Rb, optn2; int32_t s10; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); s10 =3D sextract32(ctx->opcode, 10, 9) * 2; @@ -922,7 +922,7 @@ static void gen_mxu_s16std(DisasContext *ctx, bool post= modify) } =20 gen_load_gpr(t0, Rb); - tcg_gen_addi_tl(t0, t0, s10); + tcg_gen_addi_i32(t0, t0, s10); if (postmodify) { gen_store_gpr(t0, Rb); } @@ -931,15 +931,15 @@ static void gen_mxu_s16std(DisasContext *ctx, bool po= stmodify) switch (optn2) { /* XRa[15:0] =3D> tmp16 */ case MXU_OPTN2_PTN0: - tcg_gen_extract_tl(t1, t1, 0, 16); + tcg_gen_extract_i32(t1, t1, 0, 16); break; /* XRa[31:16] =3D> tmp16 */ case MXU_OPTN2_PTN1: - tcg_gen_extract_tl(t1, t1, 16, 16); + tcg_gen_extract_i32(t1, t1, 16, 16); break; } =20 - tcg_gen_qemu_st_tl(t1, t0, ctx->mem_idx, MO_UW); + tcg_gen_qemu_st_i32(t1, t0, ctx->mem_idx, MO_UW); } =20 /* @@ -953,11 +953,11 @@ static void gen_mxu_s16std(DisasContext *ctx, bool po= stmodify) */ static void gen_mxu_s32mul(DisasContext *ctx, bool mulu) { - TCGv t0, t1; + TCGv_i32 t0, t1; uint32_t XRa, XRd, rs, rt; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); XRd =3D extract32(ctx->opcode, 10, 4); @@ -965,20 +965,20 @@ static void gen_mxu_s32mul(DisasContext *ctx, bool mu= lu) rt =3D extract32(ctx->opcode, 21, 5); =20 if (unlikely(rs =3D=3D 0 || rt =3D=3D 0)) { - tcg_gen_movi_tl(t0, 0); - tcg_gen_movi_tl(t1, 0); + tcg_gen_movi_i32(t0, 0); + tcg_gen_movi_i32(t1, 0); } else { gen_load_gpr(t0, rs); gen_load_gpr(t1, rt); =20 if (mulu) { - tcg_gen_mulu2_tl(t0, t1, t0, t1); + tcg_gen_mulu2_i32(t0, t1, t0, t1); } else { - tcg_gen_muls2_tl(t0, t1, t0, t1); + tcg_gen_muls2_i32(t0, t1, t0, t1); } } - tcg_gen_mov_tl(cpu_HI[0], t1); - tcg_gen_mov_tl(cpu_LO[0], t0); + tcg_gen_mov_i32(cpu_HI[0], t1); + tcg_gen_mov_i32(cpu_LO[0], t0); gen_store_mxu_gpr(t1, XRa); gen_store_mxu_gpr(t0, XRd); } @@ -993,13 +993,13 @@ static void gen_mxu_s32mul(DisasContext *ctx, bool mu= lu) static void gen_mxu_d16mul(DisasContext *ctx, bool fractional, bool packed_result) { - TCGv t0, t1, t2, t3; + TCGv_i32 t0, t1, t2, t3; uint32_t XRa, XRb, XRc, XRd, optn2; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); - t2 =3D tcg_temp_new(); - t3 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); + t2 =3D tcg_temp_new_i32(); + t3 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); XRb =3D extract32(ctx->opcode, 10, 4); @@ -1014,64 +1014,64 @@ static void gen_mxu_d16mul(DisasContext *ctx, bool = fractional, */ =20 gen_load_mxu_gpr(t1, XRb); - tcg_gen_sextract_tl(t0, t1, 0, 16); - tcg_gen_sextract_tl(t1, t1, 16, 16); + tcg_gen_sextract_i32(t0, t1, 0, 16); + tcg_gen_sextract_i32(t1, t1, 16, 16); gen_load_mxu_gpr(t3, XRc); - tcg_gen_sextract_tl(t2, t3, 0, 16); - tcg_gen_sextract_tl(t3, t3, 16, 16); + tcg_gen_sextract_i32(t2, t3, 0, 16); + tcg_gen_sextract_i32(t3, t3, 16, 16); =20 switch (optn2) { case MXU_OPTN2_WW: /* XRB.H*XRC.H =3D=3D lop, XRB.L*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t1, t3); - tcg_gen_mul_tl(t2, t0, t2); + tcg_gen_mul_i32(t3, t1, t3); + tcg_gen_mul_i32(t2, t0, t2); break; case MXU_OPTN2_LW: /* XRB.L*XRC.H =3D=3D lop, XRB.L*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t0, t3); - tcg_gen_mul_tl(t2, t0, t2); + tcg_gen_mul_i32(t3, t0, t3); + tcg_gen_mul_i32(t2, t0, t2); break; case MXU_OPTN2_HW: /* XRB.H*XRC.H =3D=3D lop, XRB.H*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t1, t3); - tcg_gen_mul_tl(t2, t1, t2); + tcg_gen_mul_i32(t3, t1, t3); + tcg_gen_mul_i32(t2, t1, t2); break; case MXU_OPTN2_XW: /* XRB.L*XRC.H =3D=3D lop, XRB.H*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t0, t3); - tcg_gen_mul_tl(t2, t1, t2); + tcg_gen_mul_i32(t3, t0, t3); + tcg_gen_mul_i32(t2, t1, t2); break; } if (fractional) { TCGLabel *l_done =3D gen_new_label(); - TCGv rounding =3D tcg_temp_new(); + TCGv_i32 rounding =3D tcg_temp_new_i32(); =20 - tcg_gen_shli_tl(t3, t3, 1); - tcg_gen_shli_tl(t2, t2, 1); - tcg_gen_andi_tl(rounding, mxu_CR, 0x2); - tcg_gen_brcondi_tl(TCG_COND_EQ, rounding, 0, l_done); + tcg_gen_shli_i32(t3, t3, 1); + tcg_gen_shli_i32(t2, t2, 1); + tcg_gen_andi_i32(rounding, mxu_CR, 0x2); + tcg_gen_brcondi_i32(TCG_COND_EQ, rounding, 0, l_done); if (packed_result) { TCGLabel *l_apply_bias_l =3D gen_new_label(); TCGLabel *l_apply_bias_r =3D gen_new_label(); TCGLabel *l_half_done =3D gen_new_label(); - TCGv bias =3D tcg_temp_new(); + TCGv_i32 bias =3D tcg_temp_new_i32(); =20 /* * D16MULF supports unbiased rounding aka "bankers rounding", * "round to even", "convergent rounding" */ - tcg_gen_andi_tl(bias, mxu_CR, 0x4); - tcg_gen_brcondi_tl(TCG_COND_NE, bias, 0, l_apply_bias_l); - tcg_gen_andi_tl(t0, t3, 0x1ffff); - tcg_gen_brcondi_tl(TCG_COND_EQ, t0, 0x8000, l_half_done); + tcg_gen_andi_i32(bias, mxu_CR, 0x4); + tcg_gen_brcondi_i32(TCG_COND_NE, bias, 0, l_apply_bias_l); + tcg_gen_andi_i32(t0, t3, 0x1ffff); + tcg_gen_brcondi_i32(TCG_COND_EQ, t0, 0x8000, l_half_done); gen_set_label(l_apply_bias_l); - tcg_gen_addi_tl(t3, t3, 0x8000); + tcg_gen_addi_i32(t3, t3, 0x8000); gen_set_label(l_half_done); - tcg_gen_brcondi_tl(TCG_COND_NE, bias, 0, l_apply_bias_r); - tcg_gen_andi_tl(t0, t2, 0x1ffff); - tcg_gen_brcondi_tl(TCG_COND_EQ, t0, 0x8000, l_done); + tcg_gen_brcondi_i32(TCG_COND_NE, bias, 0, l_apply_bias_r); + tcg_gen_andi_i32(t0, t2, 0x1ffff); + tcg_gen_brcondi_i32(TCG_COND_EQ, t0, 0x8000, l_done); gen_set_label(l_apply_bias_r); - tcg_gen_addi_tl(t2, t2, 0x8000); + tcg_gen_addi_i32(t2, t2, 0x8000); } else { /* D16MULE doesn't support unbiased rounding */ - tcg_gen_addi_tl(t3, t3, 0x8000); - tcg_gen_addi_tl(t2, t2, 0x8000); + tcg_gen_addi_i32(t3, t3, 0x8000); + tcg_gen_addi_i32(t2, t2, 0x8000); } gen_set_label(l_done); } @@ -1079,9 +1079,9 @@ static void gen_mxu_d16mul(DisasContext *ctx, bool fr= actional, gen_store_mxu_gpr(t3, XRa); gen_store_mxu_gpr(t2, XRd); } else { - tcg_gen_andi_tl(t3, t3, 0xffff0000); - tcg_gen_shri_tl(t2, t2, 16); - tcg_gen_or_tl(t3, t3, t2); + tcg_gen_andi_i32(t3, t3, 0xffff0000); + tcg_gen_shri_i32(t2, t2, 16); + tcg_gen_or_i32(t3, t3, t2); gen_store_mxu_gpr(t3, XRa); } } @@ -1097,13 +1097,13 @@ static void gen_mxu_d16mul(DisasContext *ctx, bool = fractional, static void gen_mxu_d16mac(DisasContext *ctx, bool fractional, bool packed_result) { - TCGv t0, t1, t2, t3; + TCGv_i32 t0, t1, t2, t3; uint32_t XRa, XRb, XRc, XRd, optn2, aptn2; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); - t2 =3D tcg_temp_new(); - t3 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); + t2 =3D tcg_temp_new_i32(); + t3 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); XRb =3D extract32(ctx->opcode, 10, 4); @@ -1113,90 +1113,90 @@ static void gen_mxu_d16mac(DisasContext *ctx, bool = fractional, aptn2 =3D extract32(ctx->opcode, 24, 2); =20 gen_load_mxu_gpr(t1, XRb); - tcg_gen_sextract_tl(t0, t1, 0, 16); - tcg_gen_sextract_tl(t1, t1, 16, 16); + tcg_gen_sextract_i32(t0, t1, 0, 16); + tcg_gen_sextract_i32(t1, t1, 16, 16); =20 gen_load_mxu_gpr(t3, XRc); - tcg_gen_sextract_tl(t2, t3, 0, 16); - tcg_gen_sextract_tl(t3, t3, 16, 16); + tcg_gen_sextract_i32(t2, t3, 0, 16); + tcg_gen_sextract_i32(t3, t3, 16, 16); =20 switch (optn2) { case MXU_OPTN2_WW: /* XRB.H*XRC.H =3D=3D lop, XRB.L*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t1, t3); - tcg_gen_mul_tl(t2, t0, t2); + tcg_gen_mul_i32(t3, t1, t3); + tcg_gen_mul_i32(t2, t0, t2); break; case MXU_OPTN2_LW: /* XRB.L*XRC.H =3D=3D lop, XRB.L*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t0, t3); - tcg_gen_mul_tl(t2, t0, t2); + tcg_gen_mul_i32(t3, t0, t3); + tcg_gen_mul_i32(t2, t0, t2); break; case MXU_OPTN2_HW: /* XRB.H*XRC.H =3D=3D lop, XRB.H*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t1, t3); - tcg_gen_mul_tl(t2, t1, t2); + tcg_gen_mul_i32(t3, t1, t3); + tcg_gen_mul_i32(t2, t1, t2); break; case MXU_OPTN2_XW: /* XRB.L*XRC.H =3D=3D lop, XRB.H*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t0, t3); - tcg_gen_mul_tl(t2, t1, t2); + tcg_gen_mul_i32(t3, t0, t3); + tcg_gen_mul_i32(t2, t1, t2); break; } =20 if (fractional) { - tcg_gen_shli_tl(t3, t3, 1); - tcg_gen_shli_tl(t2, t2, 1); + tcg_gen_shli_i32(t3, t3, 1); + tcg_gen_shli_i32(t2, t2, 1); } gen_load_mxu_gpr(t0, XRa); gen_load_mxu_gpr(t1, XRd); =20 switch (aptn2) { case MXU_APTN2_AA: - tcg_gen_add_tl(t3, t0, t3); - tcg_gen_add_tl(t2, t1, t2); + tcg_gen_add_i32(t3, t0, t3); + tcg_gen_add_i32(t2, t1, t2); break; case MXU_APTN2_AS: - tcg_gen_add_tl(t3, t0, t3); - tcg_gen_sub_tl(t2, t1, t2); + tcg_gen_add_i32(t3, t0, t3); + tcg_gen_sub_i32(t2, t1, t2); break; case MXU_APTN2_SA: - tcg_gen_sub_tl(t3, t0, t3); - tcg_gen_add_tl(t2, t1, t2); + tcg_gen_sub_i32(t3, t0, t3); + tcg_gen_add_i32(t2, t1, t2); break; case MXU_APTN2_SS: - tcg_gen_sub_tl(t3, t0, t3); - tcg_gen_sub_tl(t2, t1, t2); + tcg_gen_sub_i32(t3, t0, t3); + tcg_gen_sub_i32(t2, t1, t2); break; } =20 if (fractional) { TCGLabel *l_done =3D gen_new_label(); - TCGv rounding =3D tcg_temp_new(); + TCGv_i32 rounding =3D tcg_temp_new_i32(); =20 - tcg_gen_andi_tl(rounding, mxu_CR, 0x2); - tcg_gen_brcondi_tl(TCG_COND_EQ, rounding, 0, l_done); + tcg_gen_andi_i32(rounding, mxu_CR, 0x2); + tcg_gen_brcondi_i32(TCG_COND_EQ, rounding, 0, l_done); if (packed_result) { TCGLabel *l_apply_bias_l =3D gen_new_label(); TCGLabel *l_apply_bias_r =3D gen_new_label(); TCGLabel *l_half_done =3D gen_new_label(); - TCGv bias =3D tcg_temp_new(); + TCGv_i32 bias =3D tcg_temp_new_i32(); =20 /* * D16MACF supports unbiased rounding aka "bankers rounding", * "round to even", "convergent rounding" */ - tcg_gen_andi_tl(bias, mxu_CR, 0x4); - tcg_gen_brcondi_tl(TCG_COND_NE, bias, 0, l_apply_bias_l); - tcg_gen_andi_tl(t0, t3, 0x1ffff); - tcg_gen_brcondi_tl(TCG_COND_EQ, t0, 0x8000, l_half_done); + tcg_gen_andi_i32(bias, mxu_CR, 0x4); + tcg_gen_brcondi_i32(TCG_COND_NE, bias, 0, l_apply_bias_l); + tcg_gen_andi_i32(t0, t3, 0x1ffff); + tcg_gen_brcondi_i32(TCG_COND_EQ, t0, 0x8000, l_half_done); gen_set_label(l_apply_bias_l); - tcg_gen_addi_tl(t3, t3, 0x8000); + tcg_gen_addi_i32(t3, t3, 0x8000); gen_set_label(l_half_done); - tcg_gen_brcondi_tl(TCG_COND_NE, bias, 0, l_apply_bias_r); - tcg_gen_andi_tl(t0, t2, 0x1ffff); - tcg_gen_brcondi_tl(TCG_COND_EQ, t0, 0x8000, l_done); + tcg_gen_brcondi_i32(TCG_COND_NE, bias, 0, l_apply_bias_r); + tcg_gen_andi_i32(t0, t2, 0x1ffff); + tcg_gen_brcondi_i32(TCG_COND_EQ, t0, 0x8000, l_done); gen_set_label(l_apply_bias_r); - tcg_gen_addi_tl(t2, t2, 0x8000); + tcg_gen_addi_i32(t2, t2, 0x8000); } else { /* D16MACE doesn't support unbiased rounding */ - tcg_gen_addi_tl(t3, t3, 0x8000); - tcg_gen_addi_tl(t2, t2, 0x8000); + tcg_gen_addi_i32(t3, t3, 0x8000); + tcg_gen_addi_i32(t2, t2, 0x8000); } gen_set_label(l_done); } @@ -1205,9 +1205,9 @@ static void gen_mxu_d16mac(DisasContext *ctx, bool fr= actional, gen_store_mxu_gpr(t3, XRa); gen_store_mxu_gpr(t2, XRd); } else { - tcg_gen_andi_tl(t3, t3, 0xffff0000); - tcg_gen_shri_tl(t2, t2, 16); - tcg_gen_or_tl(t3, t3, t2); + tcg_gen_andi_i32(t3, t3, 0xffff0000); + tcg_gen_shri_i32(t2, t2, 16); + tcg_gen_or_i32(t3, t3, t2); gen_store_mxu_gpr(t3, XRa); } } @@ -1218,13 +1218,13 @@ static void gen_mxu_d16mac(DisasContext *ctx, bool = fractional, */ static void gen_mxu_d16madl(DisasContext *ctx) { - TCGv t0, t1, t2, t3; + TCGv_i32 t0, t1, t2, t3; uint32_t XRa, XRb, XRc, XRd, optn2, aptn2; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); - t2 =3D tcg_temp_new(); - t3 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); + t2 =3D tcg_temp_new_i32(); + t3 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); XRb =3D extract32(ctx->opcode, 10, 4); @@ -1234,60 +1234,60 @@ static void gen_mxu_d16madl(DisasContext *ctx) aptn2 =3D extract32(ctx->opcode, 24, 2); =20 gen_load_mxu_gpr(t1, XRb); - tcg_gen_sextract_tl(t0, t1, 0, 16); - tcg_gen_sextract_tl(t1, t1, 16, 16); + tcg_gen_sextract_i32(t0, t1, 0, 16); + tcg_gen_sextract_i32(t1, t1, 16, 16); =20 gen_load_mxu_gpr(t3, XRc); - tcg_gen_sextract_tl(t2, t3, 0, 16); - tcg_gen_sextract_tl(t3, t3, 16, 16); + tcg_gen_sextract_i32(t2, t3, 0, 16); + tcg_gen_sextract_i32(t3, t3, 16, 16); =20 switch (optn2) { case MXU_OPTN2_WW: /* XRB.H*XRC.H =3D=3D lop, XRB.L*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t1, t3); - tcg_gen_mul_tl(t2, t0, t2); + tcg_gen_mul_i32(t3, t1, t3); + tcg_gen_mul_i32(t2, t0, t2); break; case MXU_OPTN2_LW: /* XRB.L*XRC.H =3D=3D lop, XRB.L*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t0, t3); - tcg_gen_mul_tl(t2, t0, t2); + tcg_gen_mul_i32(t3, t0, t3); + tcg_gen_mul_i32(t2, t0, t2); break; case MXU_OPTN2_HW: /* XRB.H*XRC.H =3D=3D lop, XRB.H*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t1, t3); - tcg_gen_mul_tl(t2, t1, t2); + tcg_gen_mul_i32(t3, t1, t3); + tcg_gen_mul_i32(t2, t1, t2); break; case MXU_OPTN2_XW: /* XRB.L*XRC.H =3D=3D lop, XRB.H*XRC.L =3D=3D rop */ - tcg_gen_mul_tl(t3, t0, t3); - tcg_gen_mul_tl(t2, t1, t2); + tcg_gen_mul_i32(t3, t0, t3); + tcg_gen_mul_i32(t2, t1, t2); break; } - tcg_gen_extract_tl(t2, t2, 0, 16); - tcg_gen_extract_tl(t3, t3, 0, 16); + tcg_gen_extract_i32(t2, t2, 0, 16); + tcg_gen_extract_i32(t3, t3, 0, 16); =20 gen_load_mxu_gpr(t1, XRa); - tcg_gen_extract_tl(t0, t1, 0, 16); - tcg_gen_extract_tl(t1, t1, 16, 16); + tcg_gen_extract_i32(t0, t1, 0, 16); + tcg_gen_extract_i32(t1, t1, 16, 16); =20 switch (aptn2) { case MXU_APTN2_AA: - tcg_gen_add_tl(t3, t1, t3); - tcg_gen_add_tl(t2, t0, t2); + tcg_gen_add_i32(t3, t1, t3); + tcg_gen_add_i32(t2, t0, t2); break; case MXU_APTN2_AS: - tcg_gen_add_tl(t3, t1, t3); - tcg_gen_sub_tl(t2, t0, t2); + tcg_gen_add_i32(t3, t1, t3); + tcg_gen_sub_i32(t2, t0, t2); break; case MXU_APTN2_SA: - tcg_gen_sub_tl(t3, t1, t3); - tcg_gen_add_tl(t2, t0, t2); + tcg_gen_sub_i32(t3, t1, t3); + tcg_gen_add_i32(t2, t0, t2); break; case MXU_APTN2_SS: - tcg_gen_sub_tl(t3, t1, t3); - tcg_gen_sub_tl(t2, t0, t2); + tcg_gen_sub_i32(t3, t1, t3); + tcg_gen_sub_i32(t2, t0, t2); break; } =20 - tcg_gen_andi_tl(t2, t2, 0xffff); - tcg_gen_shli_tl(t3, t3, 16); - tcg_gen_or_tl(mxu_gpr[XRd - 1], t3, t2); + tcg_gen_andi_i32(t2, t2, 0xffff); + tcg_gen_shli_i32(t3, t3, 16); + tcg_gen_or_i32(mxu_gpr[XRd - 1], t3, t2); } =20 /* @@ -1296,11 +1296,11 @@ static void gen_mxu_d16madl(DisasContext *ctx) */ static void gen_mxu_s16mad(DisasContext *ctx) { - TCGv t0, t1; + TCGv_i32 t0, t1; uint32_t XRa, XRb, XRc, XRd, optn2, aptn1, pad; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); XRb =3D extract32(ctx->opcode, 10, 4); @@ -1319,32 +1319,32 @@ static void gen_mxu_s16mad(DisasContext *ctx) =20 switch (optn2) { case MXU_OPTN2_WW: /* XRB.H*XRC.H */ - tcg_gen_sextract_tl(t0, t0, 16, 16); - tcg_gen_sextract_tl(t1, t1, 16, 16); + tcg_gen_sextract_i32(t0, t0, 16, 16); + tcg_gen_sextract_i32(t1, t1, 16, 16); break; case MXU_OPTN2_LW: /* XRB.L*XRC.L */ - tcg_gen_sextract_tl(t0, t0, 0, 16); - tcg_gen_sextract_tl(t1, t1, 0, 16); + tcg_gen_sextract_i32(t0, t0, 0, 16); + tcg_gen_sextract_i32(t1, t1, 0, 16); break; case MXU_OPTN2_HW: /* XRB.H*XRC.L */ - tcg_gen_sextract_tl(t0, t0, 16, 16); - tcg_gen_sextract_tl(t1, t1, 0, 16); + tcg_gen_sextract_i32(t0, t0, 16, 16); + tcg_gen_sextract_i32(t1, t1, 0, 16); break; case MXU_OPTN2_XW: /* XRB.L*XRC.H */ - tcg_gen_sextract_tl(t0, t0, 0, 16); - tcg_gen_sextract_tl(t1, t1, 16, 16); + tcg_gen_sextract_i32(t0, t0, 0, 16); + tcg_gen_sextract_i32(t1, t1, 16, 16); break; } - tcg_gen_mul_tl(t0, t0, t1); + tcg_gen_mul_i32(t0, t0, t1); =20 gen_load_mxu_gpr(t1, XRa); =20 switch (aptn1) { case MXU_APTN1_A: - tcg_gen_add_tl(t1, t1, t0); + tcg_gen_add_i32(t1, t1, t0); break; case MXU_APTN1_S: - tcg_gen_sub_tl(t1, t1, t0); + tcg_gen_sub_i32(t1, t1, t0); break; } =20 @@ -1361,17 +1361,17 @@ static void gen_mxu_s16mad(DisasContext *ctx) */ static void gen_mxu_q8mul_mac(DisasContext *ctx, bool su, bool mac) { - TCGv t0, t1, t2, t3, t4, t5, t6, t7; + TCGv_i32 t0, t1, t2, t3, t4, t5, t6, t7; uint32_t XRa, XRb, XRc, XRd, aptn2; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); - t2 =3D tcg_temp_new(); - t3 =3D tcg_temp_new(); - t4 =3D tcg_temp_new(); - t5 =3D tcg_temp_new(); - t6 =3D tcg_temp_new(); - t7 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); + t2 =3D tcg_temp_new_i32(); + t3 =3D tcg_temp_new_i32(); + t4 =3D tcg_temp_new_i32(); + t5 =3D tcg_temp_new_i32(); + t6 =3D tcg_temp_new_i32(); + t7 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); XRb =3D extract32(ctx->opcode, 10, 4); @@ -1384,53 +1384,53 @@ static void gen_mxu_q8mul_mac(DisasContext *ctx, bo= ol su, bool mac) =20 if (su) { /* Q8MULSU / Q8MACSU */ - tcg_gen_sextract_tl(t0, t3, 0, 8); - tcg_gen_sextract_tl(t1, t3, 8, 8); - tcg_gen_sextract_tl(t2, t3, 16, 8); - tcg_gen_sextract_tl(t3, t3, 24, 8); + tcg_gen_sextract_i32(t0, t3, 0, 8); + tcg_gen_sextract_i32(t1, t3, 8, 8); + tcg_gen_sextract_i32(t2, t3, 16, 8); + tcg_gen_sextract_i32(t3, t3, 24, 8); } else { /* Q8MUL / Q8MAC */ - tcg_gen_extract_tl(t0, t3, 0, 8); - tcg_gen_extract_tl(t1, t3, 8, 8); - tcg_gen_extract_tl(t2, t3, 16, 8); - tcg_gen_extract_tl(t3, t3, 24, 8); + tcg_gen_extract_i32(t0, t3, 0, 8); + tcg_gen_extract_i32(t1, t3, 8, 8); + tcg_gen_extract_i32(t2, t3, 16, 8); + tcg_gen_extract_i32(t3, t3, 24, 8); } =20 - tcg_gen_extract_tl(t4, t7, 0, 8); - tcg_gen_extract_tl(t5, t7, 8, 8); - tcg_gen_extract_tl(t6, t7, 16, 8); - tcg_gen_extract_tl(t7, t7, 24, 8); + tcg_gen_extract_i32(t4, t7, 0, 8); + tcg_gen_extract_i32(t5, t7, 8, 8); + tcg_gen_extract_i32(t6, t7, 16, 8); + tcg_gen_extract_i32(t7, t7, 24, 8); =20 - tcg_gen_mul_tl(t0, t0, t4); - tcg_gen_mul_tl(t1, t1, t5); - tcg_gen_mul_tl(t2, t2, t6); - tcg_gen_mul_tl(t3, t3, t7); + tcg_gen_mul_i32(t0, t0, t4); + tcg_gen_mul_i32(t1, t1, t5); + tcg_gen_mul_i32(t2, t2, t6); + tcg_gen_mul_i32(t3, t3, t7); =20 if (mac) { gen_load_mxu_gpr(t4, XRd); gen_load_mxu_gpr(t5, XRa); - tcg_gen_extract_tl(t6, t4, 0, 16); - tcg_gen_extract_tl(t7, t4, 16, 16); + tcg_gen_extract_i32(t6, t4, 0, 16); + tcg_gen_extract_i32(t7, t4, 16, 16); if (aptn2 & 1) { - tcg_gen_sub_tl(t0, t6, t0); - tcg_gen_sub_tl(t1, t7, t1); + tcg_gen_sub_i32(t0, t6, t0); + tcg_gen_sub_i32(t1, t7, t1); } else { - tcg_gen_add_tl(t0, t6, t0); - tcg_gen_add_tl(t1, t7, t1); + tcg_gen_add_i32(t0, t6, t0); + tcg_gen_add_i32(t1, t7, t1); } - tcg_gen_extract_tl(t6, t5, 0, 16); - tcg_gen_extract_tl(t7, t5, 16, 16); + tcg_gen_extract_i32(t6, t5, 0, 16); + tcg_gen_extract_i32(t7, t5, 16, 16); if (aptn2 & 2) { - tcg_gen_sub_tl(t2, t6, t2); - tcg_gen_sub_tl(t3, t7, t3); + tcg_gen_sub_i32(t2, t6, t2); + tcg_gen_sub_i32(t3, t7, t3); } else { - tcg_gen_add_tl(t2, t6, t2); - tcg_gen_add_tl(t3, t7, t3); + tcg_gen_add_i32(t2, t6, t2); + tcg_gen_add_i32(t3, t7, t3); } } =20 - tcg_gen_deposit_tl(t0, t0, t1, 16, 16); - tcg_gen_deposit_tl(t1, t2, t3, 16, 16); + tcg_gen_deposit_i32(t0, t0, t1, 16, 16); + tcg_gen_deposit_i32(t1, t2, t3, 16, 16); =20 gen_store_mxu_gpr(t0, XRd); gen_store_mxu_gpr(t1, XRa); @@ -1443,17 +1443,17 @@ static void gen_mxu_q8mul_mac(DisasContext *ctx, bo= ol su, bool mac) */ static void gen_mxu_q8madl(DisasContext *ctx) { - TCGv t0, t1, t2, t3, t4, t5, t6, t7; + TCGv_i32 t0, t1, t2, t3, t4, t5, t6, t7; uint32_t XRa, XRb, XRc, XRd, aptn2; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); - t2 =3D tcg_temp_new(); - t3 =3D tcg_temp_new(); - t4 =3D tcg_temp_new(); - t5 =3D tcg_temp_new(); - t6 =3D tcg_temp_new(); - t7 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); + t2 =3D tcg_temp_new_i32(); + t3 =3D tcg_temp_new_i32(); + t4 =3D tcg_temp_new_i32(); + t5 =3D tcg_temp_new_i32(); + t6 =3D tcg_temp_new_i32(); + t7 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); XRb =3D extract32(ctx->opcode, 10, 4); @@ -1464,45 +1464,45 @@ static void gen_mxu_q8madl(DisasContext *ctx) gen_load_mxu_gpr(t3, XRb); gen_load_mxu_gpr(t7, XRc); =20 - tcg_gen_extract_tl(t0, t3, 0, 8); - tcg_gen_extract_tl(t1, t3, 8, 8); - tcg_gen_extract_tl(t2, t3, 16, 8); - tcg_gen_extract_tl(t3, t3, 24, 8); + tcg_gen_extract_i32(t0, t3, 0, 8); + tcg_gen_extract_i32(t1, t3, 8, 8); + tcg_gen_extract_i32(t2, t3, 16, 8); + tcg_gen_extract_i32(t3, t3, 24, 8); =20 - tcg_gen_extract_tl(t4, t7, 0, 8); - tcg_gen_extract_tl(t5, t7, 8, 8); - tcg_gen_extract_tl(t6, t7, 16, 8); - tcg_gen_extract_tl(t7, t7, 24, 8); + tcg_gen_extract_i32(t4, t7, 0, 8); + tcg_gen_extract_i32(t5, t7, 8, 8); + tcg_gen_extract_i32(t6, t7, 16, 8); + tcg_gen_extract_i32(t7, t7, 24, 8); =20 - tcg_gen_mul_tl(t0, t0, t4); - tcg_gen_mul_tl(t1, t1, t5); - tcg_gen_mul_tl(t2, t2, t6); - tcg_gen_mul_tl(t3, t3, t7); + tcg_gen_mul_i32(t0, t0, t4); + tcg_gen_mul_i32(t1, t1, t5); + tcg_gen_mul_i32(t2, t2, t6); + tcg_gen_mul_i32(t3, t3, t7); =20 gen_load_mxu_gpr(t4, XRa); - tcg_gen_extract_tl(t6, t4, 0, 8); - tcg_gen_extract_tl(t7, t4, 8, 8); + tcg_gen_extract_i32(t6, t4, 0, 8); + tcg_gen_extract_i32(t7, t4, 8, 8); if (aptn2 & 1) { - tcg_gen_sub_tl(t0, t6, t0); - tcg_gen_sub_tl(t1, t7, t1); + tcg_gen_sub_i32(t0, t6, t0); + tcg_gen_sub_i32(t1, t7, t1); } else { - tcg_gen_add_tl(t0, t6, t0); - tcg_gen_add_tl(t1, t7, t1); + tcg_gen_add_i32(t0, t6, t0); + tcg_gen_add_i32(t1, t7, t1); } - tcg_gen_extract_tl(t6, t4, 16, 8); - tcg_gen_extract_tl(t7, t4, 24, 8); + tcg_gen_extract_i32(t6, t4, 16, 8); + tcg_gen_extract_i32(t7, t4, 24, 8); if (aptn2 & 2) { - tcg_gen_sub_tl(t2, t6, t2); - tcg_gen_sub_tl(t3, t7, t3); + tcg_gen_sub_i32(t2, t6, t2); + tcg_gen_sub_i32(t3, t7, t3); } else { - tcg_gen_add_tl(t2, t6, t2); - tcg_gen_add_tl(t3, t7, t3); + tcg_gen_add_i32(t2, t6, t2); + tcg_gen_add_i32(t3, t7, t3); } =20 - tcg_gen_andi_tl(t5, t0, 0xff); - tcg_gen_deposit_tl(t5, t5, t1, 8, 8); - tcg_gen_deposit_tl(t5, t5, t2, 16, 8); - tcg_gen_deposit_tl(t5, t5, t3, 24, 8); + tcg_gen_andi_i32(t5, t0, 0xff); + tcg_gen_deposit_i32(t5, t5, t1, 8, 8); + tcg_gen_deposit_i32(t5, t5, t2, 16, 8); + tcg_gen_deposit_i32(t5, t5, t3, 24, 8); =20 gen_store_mxu_gpr(t5, XRd); } @@ -1518,21 +1518,21 @@ static void gen_mxu_q8madl(DisasContext *ctx) */ static void gen_mxu_s32ldxx(DisasContext *ctx, bool reversed, bool postinc) { - TCGv t0, t1; + TCGv_i32 t0, t1; uint32_t XRa, Rb, s12; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); s12 =3D sextract32(ctx->opcode, 10, 10); Rb =3D extract32(ctx->opcode, 21, 5); =20 gen_load_gpr(t0, Rb); - tcg_gen_movi_tl(t1, s12 * 4); - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_movi_i32(t1, s12 * 4); + tcg_gen_add_i32(t0, t0, t1); =20 - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_SL | mo_endian_rev(ctx, reversed) | ctx->default_tcg_memop_mask); gen_store_mxu_gpr(t1, XRa); @@ -1553,22 +1553,22 @@ static void gen_mxu_s32ldxx(DisasContext *ctx, bool= reversed, bool postinc) */ static void gen_mxu_s32stxx(DisasContext *ctx, bool reversed, bool postinc) { - TCGv t0, t1; + TCGv_i32 t0, t1; uint32_t XRa, Rb, s12; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); s12 =3D sextract32(ctx->opcode, 10, 10); Rb =3D extract32(ctx->opcode, 21, 5); =20 gen_load_gpr(t0, Rb); - tcg_gen_movi_tl(t1, s12 * 4); - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_movi_i32(t1, s12 * 4); + tcg_gen_add_i32(t0, t0, t1); =20 gen_load_mxu_gpr(t1, XRa); - tcg_gen_qemu_st_tl(t1, t0, ctx->mem_idx, + tcg_gen_qemu_st_i32(t1, t0, ctx->mem_idx, MO_SL | mo_endian_rev(ctx, reversed) | ctx->default_tcg_memop_mask); =20 @@ -1589,11 +1589,11 @@ static void gen_mxu_s32stxx(DisasContext *ctx, bool= reversed, bool postinc) static void gen_mxu_s32ldxvx(DisasContext *ctx, bool reversed, bool postinc, uint32_t strd2) { - TCGv t0, t1; + TCGv_i32 t0, t1; uint32_t XRa, Rb, Rc; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); Rc =3D extract32(ctx->opcode, 16, 5); @@ -1601,10 +1601,10 @@ static void gen_mxu_s32ldxvx(DisasContext *ctx, boo= l reversed, =20 gen_load_gpr(t0, Rb); gen_load_gpr(t1, Rc); - tcg_gen_shli_tl(t1, t1, strd2); - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_shli_i32(t1, t1, strd2); + tcg_gen_add_i32(t0, t0, t1); =20 - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, MO_SL | mo_endian_rev(ctx, reversed) | ctx->default_tcg_memop_mask); gen_store_mxu_gpr(t1, XRa); @@ -1627,11 +1627,11 @@ static void gen_mxu_s32ldxvx(DisasContext *ctx, boo= l reversed, */ static void gen_mxu_lxx(DisasContext *ctx, uint32_t strd2, MemOp mop) { - TCGv t0, t1; + TCGv_i32 t0, t1; uint32_t Ra, Rb, Rc; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); =20 Ra =3D extract32(ctx->opcode, 11, 5); Rc =3D extract32(ctx->opcode, 16, 5); @@ -1639,10 +1639,10 @@ static void gen_mxu_lxx(DisasContext *ctx, uint32_t= strd2, MemOp mop) =20 gen_load_gpr(t0, Rb); gen_load_gpr(t1, Rc); - tcg_gen_shli_tl(t1, t1, strd2); - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_shli_i32(t1, t1, strd2); + tcg_gen_add_i32(t0, t0, t1); =20 - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, mop | ctx->default_tcg_memop_= mask); + tcg_gen_qemu_ld_i32(t1, t0, ctx->mem_idx, mop | ctx->default_tcg_memop= _mask); gen_store_gpr(t1, Ra); } =20 @@ -1658,11 +1658,11 @@ static void gen_mxu_lxx(DisasContext *ctx, uint32_t= strd2, MemOp mop) static void gen_mxu_s32stxvx(DisasContext *ctx, bool reversed, bool postinc, uint32_t strd2) { - TCGv t0, t1; + TCGv_i32 t0, t1; uint32_t XRa, Rb, Rc; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); Rc =3D extract32(ctx->opcode, 16, 5); @@ -1670,11 +1670,11 @@ static void gen_mxu_s32stxvx(DisasContext *ctx, boo= l reversed, =20 gen_load_gpr(t0, Rb); gen_load_gpr(t1, Rc); - tcg_gen_shli_tl(t1, t1, strd2); - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_shli_i32(t1, t1, strd2); + tcg_gen_add_i32(t0, t0, t1); =20 gen_load_mxu_gpr(t1, XRa); - tcg_gen_qemu_st_tl(t1, t0, ctx->mem_idx, + tcg_gen_qemu_st_i32(t1, t0, ctx->mem_idx, MO_SL | mo_endian_rev(ctx, reversed) | ctx->default_tcg_memop_mask); =20 @@ -1859,23 +1859,23 @@ static void gen_mxu_d32sxx(DisasContext *ctx, bool = right, bool arithmetic) XRd =3D extract32(ctx->opcode, 18, 4); sft4 =3D extract32(ctx->opcode, 22, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t0, XRb); gen_load_mxu_gpr(t1, XRc); =20 if (right) { if (arithmetic) { - tcg_gen_sari_tl(t0, t0, sft4); - tcg_gen_sari_tl(t1, t1, sft4); + tcg_gen_sari_i32(t0, t0, sft4); + tcg_gen_sari_i32(t1, t1, sft4); } else { - tcg_gen_shri_tl(t0, t0, sft4); - tcg_gen_shri_tl(t1, t1, sft4); + tcg_gen_shri_i32(t0, t0, sft4); + tcg_gen_shri_i32(t1, t1, sft4); } } else { - tcg_gen_shli_tl(t0, t0, sft4); - tcg_gen_shli_tl(t1, t1, sft4); + tcg_gen_shli_i32(t0, t0, sft4); + tcg_gen_shli_i32(t1, t1, sft4); } gen_store_mxu_gpr(t0, XRa); gen_store_mxu_gpr(t1, XRd); @@ -1900,26 +1900,26 @@ static void gen_mxu_d32sxxv(DisasContext *ctx, bool= right, bool arithmetic) XRd =3D extract32(ctx->opcode, 14, 4); rs =3D extract32(ctx->opcode, 21, 5); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t0, XRa); gen_load_mxu_gpr(t1, XRd); gen_load_gpr(t2, rs); - tcg_gen_andi_tl(t2, t2, 0x0f); + tcg_gen_andi_i32(t2, t2, 0x0f); =20 if (right) { if (arithmetic) { - tcg_gen_sar_tl(t0, t0, t2); - tcg_gen_sar_tl(t1, t1, t2); + tcg_gen_sar_i32(t0, t0, t2); + tcg_gen_sar_i32(t1, t1, t2); } else { - tcg_gen_shr_tl(t0, t0, t2); - tcg_gen_shr_tl(t1, t1, t2); + tcg_gen_shr_i32(t0, t0, t2); + tcg_gen_shr_i32(t1, t1, t2); } } else { - tcg_gen_shl_tl(t0, t0, t2); - tcg_gen_shl_tl(t1, t1, t2); + tcg_gen_shl_i32(t0, t0, t2); + tcg_gen_shl_i32(t1, t1, t2); } gen_store_mxu_gpr(t0, XRa); gen_store_mxu_gpr(t1, XRd); @@ -1946,23 +1946,23 @@ static void gen_mxu_d32sarl(DisasContext *ctx, bool= sarw) if (unlikely(XRa =3D=3D 0)) { /* destination is zero register -> do nothing */ } else { - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); =20 if (!sarw) { /* Make SFT4 from rb field */ - tcg_gen_movi_tl(t2, rb >> 1); + tcg_gen_movi_i32(t2, rb >> 1); } else { gen_load_gpr(t2, rb); - tcg_gen_andi_tl(t2, t2, 0x0f); + tcg_gen_andi_i32(t2, t2, 0x0f); } gen_load_mxu_gpr(t0, XRb); gen_load_mxu_gpr(t1, XRc); - tcg_gen_sar_tl(t0, t0, t2); - tcg_gen_sar_tl(t1, t1, t2); - tcg_gen_extract_tl(t2, t1, 0, 16); - tcg_gen_deposit_tl(t2, t2, t0, 16, 16); + tcg_gen_sar_i32(t0, t0, t2); + tcg_gen_sar_i32(t1, t1, t2); + tcg_gen_extract_i32(t2, t1, 0, 16); + tcg_gen_deposit_i32(t2, t2, t0, 16, 16); gen_store_mxu_gpr(t2, XRa); } } @@ -1988,46 +1988,46 @@ static void gen_mxu_q16sxx(DisasContext *ctx, bool = right, bool arithmetic) XRd =3D extract32(ctx->opcode, 18, 4); sft4 =3D extract32(ctx->opcode, 22, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t0, XRb); gen_load_mxu_gpr(t2, XRc); =20 if (arithmetic) { - tcg_gen_sextract_tl(t1, t0, 16, 16); - tcg_gen_sextract_tl(t0, t0, 0, 16); - tcg_gen_sextract_tl(t3, t2, 16, 16); - tcg_gen_sextract_tl(t2, t2, 0, 16); + tcg_gen_sextract_i32(t1, t0, 16, 16); + tcg_gen_sextract_i32(t0, t0, 0, 16); + tcg_gen_sextract_i32(t3, t2, 16, 16); + tcg_gen_sextract_i32(t2, t2, 0, 16); } else { - tcg_gen_extract_tl(t1, t0, 16, 16); - tcg_gen_extract_tl(t0, t0, 0, 16); - tcg_gen_extract_tl(t3, t2, 16, 16); - tcg_gen_extract_tl(t2, t2, 0, 16); + tcg_gen_extract_i32(t1, t0, 16, 16); + tcg_gen_extract_i32(t0, t0, 0, 16); + tcg_gen_extract_i32(t3, t2, 16, 16); + tcg_gen_extract_i32(t2, t2, 0, 16); } =20 if (right) { if (arithmetic) { - tcg_gen_sari_tl(t0, t0, sft4); - tcg_gen_sari_tl(t1, t1, sft4); - tcg_gen_sari_tl(t2, t2, sft4); - tcg_gen_sari_tl(t3, t3, sft4); + tcg_gen_sari_i32(t0, t0, sft4); + tcg_gen_sari_i32(t1, t1, sft4); + tcg_gen_sari_i32(t2, t2, sft4); + tcg_gen_sari_i32(t3, t3, sft4); } else { - tcg_gen_shri_tl(t0, t0, sft4); - tcg_gen_shri_tl(t1, t1, sft4); - tcg_gen_shri_tl(t2, t2, sft4); - tcg_gen_shri_tl(t3, t3, sft4); + tcg_gen_shri_i32(t0, t0, sft4); + tcg_gen_shri_i32(t1, t1, sft4); + tcg_gen_shri_i32(t2, t2, sft4); + tcg_gen_shri_i32(t3, t3, sft4); } } else { - tcg_gen_shli_tl(t0, t0, sft4); - tcg_gen_shli_tl(t1, t1, sft4); - tcg_gen_shli_tl(t2, t2, sft4); - tcg_gen_shli_tl(t3, t3, sft4); + tcg_gen_shli_i32(t0, t0, sft4); + tcg_gen_shli_i32(t1, t1, sft4); + tcg_gen_shli_i32(t2, t2, sft4); + tcg_gen_shli_i32(t3, t3, sft4); } - tcg_gen_deposit_tl(t0, t0, t1, 16, 16); - tcg_gen_deposit_tl(t2, t2, t3, 16, 16); + tcg_gen_deposit_i32(t0, t0, t1, 16, 16); + tcg_gen_deposit_i32(t2, t2, t3, 16, 16); =20 gen_store_mxu_gpr(t0, XRa); gen_store_mxu_gpr(t2, XRd); @@ -2052,50 +2052,50 @@ static void gen_mxu_q16sxxv(DisasContext *ctx, bool= right, bool arithmetic) XRd =3D extract32(ctx->opcode, 14, 4); rs =3D extract32(ctx->opcode, 21, 5); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t5 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t5 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t0, XRa); gen_load_mxu_gpr(t2, XRd); gen_load_gpr(t5, rs); - tcg_gen_andi_tl(t5, t5, 0x0f); + tcg_gen_andi_i32(t5, t5, 0x0f); =20 =20 if (arithmetic) { - tcg_gen_sextract_tl(t1, t0, 16, 16); - tcg_gen_sextract_tl(t0, t0, 0, 16); - tcg_gen_sextract_tl(t3, t2, 16, 16); - tcg_gen_sextract_tl(t2, t2, 0, 16); + tcg_gen_sextract_i32(t1, t0, 16, 16); + tcg_gen_sextract_i32(t0, t0, 0, 16); + tcg_gen_sextract_i32(t3, t2, 16, 16); + tcg_gen_sextract_i32(t2, t2, 0, 16); } else { - tcg_gen_extract_tl(t1, t0, 16, 16); - tcg_gen_extract_tl(t0, t0, 0, 16); - tcg_gen_extract_tl(t3, t2, 16, 16); - tcg_gen_extract_tl(t2, t2, 0, 16); + tcg_gen_extract_i32(t1, t0, 16, 16); + tcg_gen_extract_i32(t0, t0, 0, 16); + tcg_gen_extract_i32(t3, t2, 16, 16); + tcg_gen_extract_i32(t2, t2, 0, 16); } =20 if (right) { if (arithmetic) { - tcg_gen_sar_tl(t0, t0, t5); - tcg_gen_sar_tl(t1, t1, t5); - tcg_gen_sar_tl(t2, t2, t5); - tcg_gen_sar_tl(t3, t3, t5); + tcg_gen_sar_i32(t0, t0, t5); + tcg_gen_sar_i32(t1, t1, t5); + tcg_gen_sar_i32(t2, t2, t5); + tcg_gen_sar_i32(t3, t3, t5); } else { - tcg_gen_shr_tl(t0, t0, t5); - tcg_gen_shr_tl(t1, t1, t5); - tcg_gen_shr_tl(t2, t2, t5); - tcg_gen_shr_tl(t3, t3, t5); + tcg_gen_shr_i32(t0, t0, t5); + tcg_gen_shr_i32(t1, t1, t5); + tcg_gen_shr_i32(t2, t2, t5); + tcg_gen_shr_i32(t3, t3, t5); } } else { - tcg_gen_shl_tl(t0, t0, t5); - tcg_gen_shl_tl(t1, t1, t5); - tcg_gen_shl_tl(t2, t2, t5); - tcg_gen_shl_tl(t3, t3, t5); + tcg_gen_shl_i32(t0, t0, t5); + tcg_gen_shl_i32(t1, t1, t5); + tcg_gen_shl_i32(t2, t2, t5); + tcg_gen_shl_i32(t3, t3, t5); } - tcg_gen_deposit_tl(t0, t0, t1, 16, 16); - tcg_gen_deposit_tl(t2, t2, t3, 16, 16); + tcg_gen_deposit_i32(t0, t0, t1, 16, 16); + tcg_gen_deposit_i32(t2, t2, t3, 16, 16); =20 gen_store_mxu_gpr(t0, XRa); gen_store_mxu_gpr(t2, XRd); @@ -2195,9 +2195,9 @@ static void gen_mxu_D16MAX_D16MIN(DisasContext *ctx) /* exactly one operand is zero register - find which one is not...= */ uint32_t XRx =3D XRb ? XRb : XRc; /* ...and do half-word-wise max/min with one operand 0 */ - TCGv_i32 t0 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); TCGv_i32 t1 =3D tcg_constant_i32(0); - TCGv_i32 t2 =3D tcg_temp_new(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); =20 /* the left half-word first */ tcg_gen_andi_i32(t0, mxu_gpr[XRx - 1], 0xFFFF0000); @@ -2226,9 +2226,9 @@ static void gen_mxu_D16MAX_D16MIN(DisasContext *ctx) tcg_gen_mov_i32(mxu_gpr[XRa - 1], mxu_gpr[XRb - 1]); } else { /* the most general case */ - TCGv_i32 t0 =3D tcg_temp_new(); - TCGv_i32 t1 =3D tcg_temp_new(); - TCGv_i32 t2 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); =20 /* the left half-word first */ tcg_gen_andi_i32(t0, mxu_gpr[XRb - 1], 0xFFFF0000); @@ -2288,9 +2288,9 @@ static void gen_mxu_Q8MAX_Q8MIN(DisasContext *ctx) /* exactly one operand is zero register - make it be the first...*/ uint32_t XRx =3D XRb ? XRb : XRc; /* ...and do byte-wise max/min with one operand 0 */ - TCGv_i32 t0 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); TCGv_i32 t1 =3D tcg_constant_i32(0); - TCGv_i32 t2 =3D tcg_temp_new(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); int32_t i; =20 /* the leftmost byte (byte 3) first */ @@ -2324,9 +2324,9 @@ static void gen_mxu_Q8MAX_Q8MIN(DisasContext *ctx) tcg_gen_mov_i32(mxu_gpr[XRa - 1], mxu_gpr[XRb - 1]); } else { /* the most general case */ - TCGv_i32 t0 =3D tcg_temp_new(); - TCGv_i32 t1 =3D tcg_temp_new(); - TCGv_i32 t2 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); int32_t i; =20 /* the leftmost bytes (bytes 3) first */ @@ -2387,32 +2387,32 @@ static void gen_mxu_q8slt(DisasContext *ctx, bool s= ltu) /* destination is zero register -> do nothing */ } else if (unlikely((XRb =3D=3D 0) && (XRc =3D=3D 0))) { /* both operands zero registers -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else if (unlikely(XRb =3D=3D XRc)) { /* both operands same registers -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t4 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t4 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t3, XRb); gen_load_mxu_gpr(t4, XRc); - tcg_gen_movi_tl(t2, 0); + tcg_gen_movi_i32(t2, 0); =20 for (int i =3D 0; i < 4; i++) { if (sltu) { - tcg_gen_extract_tl(t0, t3, 8 * i, 8); - tcg_gen_extract_tl(t1, t4, 8 * i, 8); + tcg_gen_extract_i32(t0, t3, 8 * i, 8); + tcg_gen_extract_i32(t1, t4, 8 * i, 8); } else { - tcg_gen_sextract_tl(t0, t3, 8 * i, 8); - tcg_gen_sextract_tl(t1, t4, 8 * i, 8); + tcg_gen_sextract_i32(t0, t3, 8 * i, 8); + tcg_gen_sextract_i32(t1, t4, 8 * i, 8); } - tcg_gen_setcond_tl(TCG_COND_LT, t0, t0, t1); - tcg_gen_deposit_tl(t2, t2, t0, 8 * i, 8); + tcg_gen_setcond_i32(TCG_COND_LT, t0, t0, t1); + tcg_gen_deposit_i32(t2, t2, t0, 8 * i, 8); } gen_store_mxu_gpr(t2, XRa); } @@ -2438,18 +2438,18 @@ static void gen_mxu_S32SLT(DisasContext *ctx) /* destination is zero register -> do nothing */ } else if (unlikely((XRb =3D=3D 0) && (XRc =3D=3D 0))) { /* both operands zero registers -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else if (unlikely(XRb =3D=3D XRc)) { /* both operands same registers -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t0, XRb); gen_load_mxu_gpr(t1, XRc); - tcg_gen_setcond_tl(TCG_COND_LT, mxu_gpr[XRa - 1], t0, t1); + tcg_gen_setcond_i32(TCG_COND_LT, mxu_gpr[XRa - 1], t0, t1); } } =20 @@ -2474,28 +2474,28 @@ static void gen_mxu_D16SLT(DisasContext *ctx) /* destination is zero register -> do nothing */ } else if (unlikely((XRb =3D=3D 0) && (XRc =3D=3D 0))) { /* both operands zero registers -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else if (unlikely(XRb =3D=3D XRc)) { /* both operands same registers -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t4 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t4 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t3, XRb); gen_load_mxu_gpr(t4, XRc); - tcg_gen_sextract_tl(t0, t3, 16, 16); - tcg_gen_sextract_tl(t1, t4, 16, 16); - tcg_gen_setcond_tl(TCG_COND_LT, t0, t0, t1); - tcg_gen_shli_tl(t2, t0, 16); - tcg_gen_sextract_tl(t0, t3, 0, 16); - tcg_gen_sextract_tl(t1, t4, 0, 16); - tcg_gen_setcond_tl(TCG_COND_LT, t0, t0, t1); - tcg_gen_or_tl(mxu_gpr[XRa - 1], t2, t0); + tcg_gen_sextract_i32(t0, t3, 16, 16); + tcg_gen_sextract_i32(t1, t4, 16, 16); + tcg_gen_setcond_i32(TCG_COND_LT, t0, t0, t1); + tcg_gen_shli_i32(t2, t0, 16); + tcg_gen_sextract_i32(t0, t3, 0, 16); + tcg_gen_sextract_i32(t1, t4, 0, 16); + tcg_gen_setcond_i32(TCG_COND_LT, t0, t0, t1); + tcg_gen_or_i32(mxu_gpr[XRa - 1], t2, t0); } } =20 @@ -2525,36 +2525,36 @@ static void gen_mxu_d16avg(DisasContext *ctx, bool = round45) /* destination is zero register -> do nothing */ } else if (unlikely((XRb =3D=3D 0) && (XRc =3D=3D 0))) { /* both operands zero registers -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else if (unlikely(XRb =3D=3D XRc)) { /* both operands same registers -> just set destination to same */ - tcg_gen_mov_tl(mxu_gpr[XRa - 1], mxu_gpr[XRb - 1]); + tcg_gen_mov_i32(mxu_gpr[XRa - 1], mxu_gpr[XRb - 1]); } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t4 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t4 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t3, XRb); gen_load_mxu_gpr(t4, XRc); - tcg_gen_sextract_tl(t0, t3, 16, 16); - tcg_gen_sextract_tl(t1, t4, 16, 16); - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_sextract_i32(t0, t3, 16, 16); + tcg_gen_sextract_i32(t1, t4, 16, 16); + tcg_gen_add_i32(t0, t0, t1); if (round45) { - tcg_gen_addi_tl(t0, t0, 1); + tcg_gen_addi_i32(t0, t0, 1); } - tcg_gen_shli_tl(t2, t0, 15); - tcg_gen_andi_tl(t2, t2, 0xffff0000); - tcg_gen_sextract_tl(t0, t3, 0, 16); - tcg_gen_sextract_tl(t1, t4, 0, 16); - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_shli_i32(t2, t0, 15); + tcg_gen_andi_i32(t2, t2, 0xffff0000); + tcg_gen_sextract_i32(t0, t3, 0, 16); + tcg_gen_sextract_i32(t1, t4, 0, 16); + tcg_gen_add_i32(t0, t0, t1); if (round45) { - tcg_gen_addi_tl(t0, t0, 1); + tcg_gen_addi_i32(t0, t0, 1); } - tcg_gen_shri_tl(t0, t0, 1); - tcg_gen_deposit_tl(t2, t2, t0, 0, 16); + tcg_gen_shri_i32(t0, t0, 1); + tcg_gen_deposit_i32(t2, t2, t0, 0, 16); gen_store_mxu_gpr(t2, XRa); } } @@ -2585,31 +2585,31 @@ static void gen_mxu_q8avg(DisasContext *ctx, bool r= ound45) /* destination is zero register -> do nothing */ } else if (unlikely((XRb =3D=3D 0) && (XRc =3D=3D 0))) { /* both operands zero registers -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else if (unlikely(XRb =3D=3D XRc)) { /* both operands same registers -> just set destination to same */ - tcg_gen_mov_tl(mxu_gpr[XRa - 1], mxu_gpr[XRb - 1]); + tcg_gen_mov_i32(mxu_gpr[XRa - 1], mxu_gpr[XRb - 1]); } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t4 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t4 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t3, XRb); gen_load_mxu_gpr(t4, XRc); - tcg_gen_movi_tl(t2, 0); + tcg_gen_movi_i32(t2, 0); =20 for (int i =3D 0; i < 4; i++) { - tcg_gen_extract_tl(t0, t3, 8 * i, 8); - tcg_gen_extract_tl(t1, t4, 8 * i, 8); - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_extract_i32(t0, t3, 8 * i, 8); + tcg_gen_extract_i32(t1, t4, 8 * i, 8); + tcg_gen_add_i32(t0, t0, t1); if (round45) { - tcg_gen_addi_tl(t0, t0, 1); + tcg_gen_addi_i32(t0, t0, 1); } - tcg_gen_shri_tl(t0, t0, 1); - tcg_gen_deposit_tl(t2, t2, t0, 8 * i, 8); + tcg_gen_shri_i32(t0, t0, 1); + tcg_gen_deposit_i32(t2, t2, t0, 8 * i, 8); } gen_store_mxu_gpr(t2, XRa); } @@ -2636,10 +2636,10 @@ static void gen_mxu_q8movzn(DisasContext *ctx, TCGC= ond cond) XRb =3D extract32(ctx->opcode, 10, 4); XRc =3D extract32(ctx->opcode, 14, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); TCGLabel *l_quarterdone =3D gen_new_label(); TCGLabel *l_halfdone =3D gen_new_label(); TCGLabel *l_quarterrest =3D gen_new_label(); @@ -2649,28 +2649,28 @@ static void gen_mxu_q8movzn(DisasContext *ctx, TCGC= ond cond) gen_load_mxu_gpr(t1, XRb); gen_load_mxu_gpr(t2, XRa); =20 - tcg_gen_extract_tl(t3, t1, 24, 8); - tcg_gen_brcondi_tl(cond, t3, 0, l_quarterdone); - tcg_gen_extract_tl(t3, t0, 24, 8); - tcg_gen_deposit_tl(t2, t2, t3, 24, 8); + tcg_gen_extract_i32(t3, t1, 24, 8); + tcg_gen_brcondi_i32(cond, t3, 0, l_quarterdone); + tcg_gen_extract_i32(t3, t0, 24, 8); + tcg_gen_deposit_i32(t2, t2, t3, 24, 8); =20 gen_set_label(l_quarterdone); - tcg_gen_extract_tl(t3, t1, 16, 8); - tcg_gen_brcondi_tl(cond, t3, 0, l_halfdone); - tcg_gen_extract_tl(t3, t0, 16, 8); - tcg_gen_deposit_tl(t2, t2, t3, 16, 8); + tcg_gen_extract_i32(t3, t1, 16, 8); + tcg_gen_brcondi_i32(cond, t3, 0, l_halfdone); + tcg_gen_extract_i32(t3, t0, 16, 8); + tcg_gen_deposit_i32(t2, t2, t3, 16, 8); =20 gen_set_label(l_halfdone); - tcg_gen_extract_tl(t3, t1, 8, 8); - tcg_gen_brcondi_tl(cond, t3, 0, l_quarterrest); - tcg_gen_extract_tl(t3, t0, 8, 8); - tcg_gen_deposit_tl(t2, t2, t3, 8, 8); + tcg_gen_extract_i32(t3, t1, 8, 8); + tcg_gen_brcondi_i32(cond, t3, 0, l_quarterrest); + tcg_gen_extract_i32(t3, t0, 8, 8); + tcg_gen_deposit_i32(t2, t2, t3, 8, 8); =20 gen_set_label(l_quarterrest); - tcg_gen_extract_tl(t3, t1, 0, 8); - tcg_gen_brcondi_tl(cond, t3, 0, l_done); - tcg_gen_extract_tl(t3, t0, 0, 8); - tcg_gen_deposit_tl(t2, t2, t3, 0, 8); + tcg_gen_extract_i32(t3, t1, 0, 8); + tcg_gen_brcondi_i32(cond, t3, 0, l_done); + tcg_gen_extract_i32(t3, t0, 0, 8); + tcg_gen_deposit_i32(t2, t2, t3, 0, 8); =20 gen_set_label(l_done); gen_store_mxu_gpr(t2, XRa); @@ -2697,10 +2697,10 @@ static void gen_mxu_d16movzn(DisasContext *ctx, TCG= Cond cond) XRb =3D extract32(ctx->opcode, 10, 4); XRc =3D extract32(ctx->opcode, 14, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); TCGLabel *l_halfdone =3D gen_new_label(); TCGLabel *l_done =3D gen_new_label(); =20 @@ -2708,16 +2708,16 @@ static void gen_mxu_d16movzn(DisasContext *ctx, TCG= Cond cond) gen_load_mxu_gpr(t1, XRb); gen_load_mxu_gpr(t2, XRa); =20 - tcg_gen_extract_tl(t3, t1, 16, 16); - tcg_gen_brcondi_tl(cond, t3, 0, l_halfdone); - tcg_gen_extract_tl(t3, t0, 16, 16); - tcg_gen_deposit_tl(t2, t2, t3, 16, 16); + tcg_gen_extract_i32(t3, t1, 16, 16); + tcg_gen_brcondi_i32(cond, t3, 0, l_halfdone); + tcg_gen_extract_i32(t3, t0, 16, 16); + tcg_gen_deposit_i32(t2, t2, t3, 16, 16); =20 gen_set_label(l_halfdone); - tcg_gen_extract_tl(t3, t1, 0, 16); - tcg_gen_brcondi_tl(cond, t3, 0, l_done); - tcg_gen_extract_tl(t3, t0, 0, 16); - tcg_gen_deposit_tl(t2, t2, t3, 0, 16); + tcg_gen_extract_i32(t3, t1, 0, 16); + tcg_gen_brcondi_i32(cond, t3, 0, l_done); + tcg_gen_extract_i32(t3, t0, 0, 16); + tcg_gen_deposit_i32(t2, t2, t3, 0, 16); =20 gen_set_label(l_done); gen_store_mxu_gpr(t2, XRa); @@ -2744,14 +2744,14 @@ static void gen_mxu_s32movzn(DisasContext *ctx, TCG= Cond cond) XRb =3D extract32(ctx->opcode, 10, 4); XRc =3D extract32(ctx->opcode, 14, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); TCGLabel *l_done =3D gen_new_label(); =20 gen_load_mxu_gpr(t0, XRc); gen_load_mxu_gpr(t1, XRb); =20 - tcg_gen_brcondi_tl(cond, t1, 0, l_done); + tcg_gen_brcondi_i32(cond, t1, 0, l_done); gen_store_mxu_gpr(t0, XRa); gen_set_label(l_done); } @@ -2784,18 +2784,18 @@ static void gen_mxu_S32CPS(DisasContext *ctx) /* destination is zero register -> do nothing */ } else if (unlikely(XRb =3D=3D 0)) { /* XRc make no sense 0 - 0 =3D 0 -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else if (unlikely(XRc =3D=3D 0)) { /* condition always false -> just move XRb to XRa */ - tcg_gen_mov_tl(mxu_gpr[XRa - 1], mxu_gpr[XRb - 1]); + tcg_gen_mov_i32(mxu_gpr[XRa - 1], mxu_gpr[XRb - 1]); } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); TCGLabel *l_not_less =3D gen_new_label(); TCGLabel *l_done =3D gen_new_label(); =20 - tcg_gen_brcondi_tl(TCG_COND_GE, mxu_gpr[XRc - 1], 0, l_not_less); - tcg_gen_neg_tl(t0, mxu_gpr[XRb - 1]); + tcg_gen_brcondi_i32(TCG_COND_GE, mxu_gpr[XRc - 1], 0, l_not_less); + tcg_gen_neg_i32(t0, mxu_gpr[XRb - 1]); tcg_gen_br(l_done); gen_set_label(l_not_less); gen_load_mxu_gpr(t0, XRb); @@ -2824,37 +2824,37 @@ static void gen_mxu_D16CPS(DisasContext *ctx) /* destination is zero register -> do nothing */ } else if (unlikely(XRb =3D=3D 0)) { /* XRc make no sense 0 - 0 =3D 0 -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else if (unlikely(XRc =3D=3D 0)) { /* condition always false -> just move XRb to XRa */ - tcg_gen_mov_tl(mxu_gpr[XRa - 1], mxu_gpr[XRb - 1]); + tcg_gen_mov_i32(mxu_gpr[XRa - 1], mxu_gpr[XRb - 1]); } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); TCGLabel *l_done_hi =3D gen_new_label(); TCGLabel *l_not_less_lo =3D gen_new_label(); TCGLabel *l_done_lo =3D gen_new_label(); =20 - tcg_gen_sextract_tl(t0, mxu_gpr[XRc - 1], 16, 16); - tcg_gen_sextract_tl(t1, mxu_gpr[XRb - 1], 16, 16); - tcg_gen_brcondi_tl(TCG_COND_GE, t0, 0, l_done_hi); - tcg_gen_subfi_tl(t1, 0, t1); + tcg_gen_sextract_i32(t0, mxu_gpr[XRc - 1], 16, 16); + tcg_gen_sextract_i32(t1, mxu_gpr[XRb - 1], 16, 16); + tcg_gen_brcondi_i32(TCG_COND_GE, t0, 0, l_done_hi); + tcg_gen_subfi_i32(t1, 0, t1); =20 gen_set_label(l_done_hi); tcg_gen_shli_i32(t1, t1, 16); =20 - tcg_gen_sextract_tl(t0, mxu_gpr[XRc - 1], 0, 16); - tcg_gen_brcondi_tl(TCG_COND_GE, t0, 0, l_not_less_lo); - tcg_gen_sextract_tl(t0, mxu_gpr[XRb - 1], 0, 16); - tcg_gen_subfi_tl(t0, 0, t0); + tcg_gen_sextract_i32(t0, mxu_gpr[XRc - 1], 0, 16); + tcg_gen_brcondi_i32(TCG_COND_GE, t0, 0, l_not_less_lo); + tcg_gen_sextract_i32(t0, mxu_gpr[XRb - 1], 0, 16); + tcg_gen_subfi_i32(t0, 0, t0); tcg_gen_br(l_done_lo); =20 gen_set_label(l_not_less_lo); - tcg_gen_extract_tl(t0, mxu_gpr[XRb - 1], 0, 16); + tcg_gen_extract_i32(t0, mxu_gpr[XRb - 1], 0, 16); =20 gen_set_label(l_done_lo); - tcg_gen_deposit_tl(mxu_gpr[XRa - 1], t1, t0, 0, 16); + tcg_gen_deposit_i32(mxu_gpr[XRa - 1], t1, t0, 0, 16); } } =20 @@ -2880,27 +2880,27 @@ static void gen_mxu_Q8ABD(DisasContext *ctx) /* destination is zero register -> do nothing */ } else if (unlikely((XRb =3D=3D 0) && (XRc =3D=3D 0))) { /* both operands zero registers -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t4 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t4 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t3, XRb); gen_load_mxu_gpr(t4, XRc); - tcg_gen_movi_tl(t2, 0); + tcg_gen_movi_i32(t2, 0); =20 for (int i =3D 0; i < 4; i++) { - tcg_gen_extract_tl(t0, t3, 8 * i, 8); - tcg_gen_extract_tl(t1, t4, 8 * i, 8); + tcg_gen_extract_i32(t0, t3, 8 * i, 8); + tcg_gen_extract_i32(t1, t4, 8 * i, 8); =20 - tcg_gen_sub_tl(t0, t0, t1); - tcg_gen_abs_tl(t0, t0); + tcg_gen_sub_i32(t0, t0, t1); + tcg_gen_abs_i32(t0, t0); =20 - tcg_gen_deposit_tl(t2, t2, t0, 8 * i, 8); + tcg_gen_deposit_i32(t2, t2, t0, 8 * i, 8); } gen_store_mxu_gpr(t2, XRa); } @@ -2930,41 +2930,41 @@ static void gen_mxu_Q8ADD(DisasContext *ctx) tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t4 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t4 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t3, XRb); gen_load_mxu_gpr(t4, XRc); =20 for (int i =3D 0; i < 4; i++) { - tcg_gen_andi_tl(t0, t3, 0xff); - tcg_gen_andi_tl(t1, t4, 0xff); + tcg_gen_andi_i32(t0, t3, 0xff); + tcg_gen_andi_i32(t1, t4, 0xff); =20 if (i < 2) { if (aptn2 & 0x01) { - tcg_gen_sub_tl(t0, t0, t1); + tcg_gen_sub_i32(t0, t0, t1); } else { - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_add_i32(t0, t0, t1); } } else { if (aptn2 & 0x02) { - tcg_gen_sub_tl(t0, t0, t1); + tcg_gen_sub_i32(t0, t0, t1); } else { - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_add_i32(t0, t0, t1); } } if (i < 3) { - tcg_gen_shri_tl(t3, t3, 8); - tcg_gen_shri_tl(t4, t4, 8); + tcg_gen_shri_i32(t3, t3, 8); + tcg_gen_shri_i32(t4, t4, 8); } if (i > 0) { - tcg_gen_deposit_tl(t2, t2, t0, 8 * i, 8); + tcg_gen_deposit_i32(t2, t2, t0, 8 * i, 8); } else { - tcg_gen_andi_tl(t0, t0, 0xff); - tcg_gen_mov_tl(t2, t0); + tcg_gen_andi_i32(t0, t0, 0xff); + tcg_gen_mov_i32(t2, t0); } } gen_store_mxu_gpr(t2, XRa); @@ -2999,19 +2999,19 @@ static void gen_mxu_q8adde(DisasContext *ctx, bool = accumulate) if (unlikely((XRb =3D=3D 0) && (XRc =3D=3D 0))) { /* both operands zero registers -> just set destination to zero */ if (XRa !=3D 0) { - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } if (XRd !=3D 0) { - tcg_gen_movi_tl(mxu_gpr[XRd - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRd - 1], 0); } } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t4 =3D tcg_temp_new(); - TCGv t5 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t4 =3D tcg_temp_new_i32(); + TCGv_i32 t5 =3D tcg_temp_new_i32(); =20 if (XRa !=3D 0) { gen_extract_mxu_gpr(t0, XRb, 16, 8); @@ -3019,22 +3019,22 @@ static void gen_mxu_q8adde(DisasContext *ctx, bool = accumulate) gen_extract_mxu_gpr(t2, XRb, 24, 8); gen_extract_mxu_gpr(t3, XRc, 24, 8); if (aptn2 & 2) { - tcg_gen_sub_tl(t0, t0, t1); - tcg_gen_sub_tl(t2, t2, t3); + tcg_gen_sub_i32(t0, t0, t1); + tcg_gen_sub_i32(t2, t2, t3); } else { - tcg_gen_add_tl(t0, t0, t1); - tcg_gen_add_tl(t2, t2, t3); + tcg_gen_add_i32(t0, t0, t1); + tcg_gen_add_i32(t2, t2, t3); } if (accumulate) { gen_load_mxu_gpr(t5, XRa); - tcg_gen_extract_tl(t1, t5, 0, 16); - tcg_gen_extract_tl(t3, t5, 16, 16); - tcg_gen_add_tl(t0, t0, t1); - tcg_gen_add_tl(t2, t2, t3); + tcg_gen_extract_i32(t1, t5, 0, 16); + tcg_gen_extract_i32(t3, t5, 16, 16); + tcg_gen_add_i32(t0, t0, t1); + tcg_gen_add_i32(t2, t2, t3); } - tcg_gen_shli_tl(t2, t2, 16); - tcg_gen_extract_tl(t0, t0, 0, 16); - tcg_gen_or_tl(t4, t2, t0); + tcg_gen_shli_i32(t2, t2, 16); + tcg_gen_extract_i32(t0, t0, 0, 16); + tcg_gen_or_i32(t4, t2, t0); } if (XRd !=3D 0) { gen_extract_mxu_gpr(t0, XRb, 0, 8); @@ -3042,22 +3042,22 @@ static void gen_mxu_q8adde(DisasContext *ctx, bool = accumulate) gen_extract_mxu_gpr(t2, XRb, 8, 8); gen_extract_mxu_gpr(t3, XRc, 8, 8); if (aptn2 & 1) { - tcg_gen_sub_tl(t0, t0, t1); - tcg_gen_sub_tl(t2, t2, t3); + tcg_gen_sub_i32(t0, t0, t1); + tcg_gen_sub_i32(t2, t2, t3); } else { - tcg_gen_add_tl(t0, t0, t1); - tcg_gen_add_tl(t2, t2, t3); + tcg_gen_add_i32(t0, t0, t1); + tcg_gen_add_i32(t2, t2, t3); } if (accumulate) { gen_load_mxu_gpr(t5, XRd); - tcg_gen_extract_tl(t1, t5, 0, 16); - tcg_gen_extract_tl(t3, t5, 16, 16); - tcg_gen_add_tl(t0, t0, t1); - tcg_gen_add_tl(t2, t2, t3); + tcg_gen_extract_i32(t1, t5, 0, 16); + tcg_gen_extract_i32(t3, t5, 16, 16); + tcg_gen_add_i32(t0, t0, t1); + tcg_gen_add_i32(t2, t2, t3); } - tcg_gen_shli_tl(t2, t2, 16); - tcg_gen_extract_tl(t0, t0, 0, 16); - tcg_gen_or_tl(t5, t2, t0); + tcg_gen_shli_i32(t2, t2, 16); + tcg_gen_extract_i32(t0, t0, 0, 16); + tcg_gen_or_i32(t5, t2, t0); } =20 gen_store_mxu_gpr(t4, XRa); @@ -3090,46 +3090,46 @@ static void gen_mxu_d8sum(DisasContext *ctx, bool s= umc) /* destination is zero register -> do nothing */ } else if (unlikely((XRb =3D=3D 0) && (XRc =3D=3D 0))) { /* both operands zero registers -> just set destination to zero */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t4 =3D tcg_temp_new(); - TCGv t5 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t4 =3D tcg_temp_new_i32(); + TCGv_i32 t5 =3D tcg_temp_new_i32(); =20 if (XRb !=3D 0) { - tcg_gen_extract_tl(t0, mxu_gpr[XRb - 1], 0, 8); - tcg_gen_extract_tl(t1, mxu_gpr[XRb - 1], 8, 8); - tcg_gen_extract_tl(t2, mxu_gpr[XRb - 1], 16, 8); - tcg_gen_extract_tl(t3, mxu_gpr[XRb - 1], 24, 8); - tcg_gen_add_tl(t4, t0, t1); - tcg_gen_add_tl(t4, t4, t2); - tcg_gen_add_tl(t4, t4, t3); + tcg_gen_extract_i32(t0, mxu_gpr[XRb - 1], 0, 8); + tcg_gen_extract_i32(t1, mxu_gpr[XRb - 1], 8, 8); + tcg_gen_extract_i32(t2, mxu_gpr[XRb - 1], 16, 8); + tcg_gen_extract_i32(t3, mxu_gpr[XRb - 1], 24, 8); + tcg_gen_add_i32(t4, t0, t1); + tcg_gen_add_i32(t4, t4, t2); + tcg_gen_add_i32(t4, t4, t3); } else { - tcg_gen_mov_tl(t4, 0); + tcg_gen_mov_i32(t4, 0); } if (XRc !=3D 0) { - tcg_gen_extract_tl(t0, mxu_gpr[XRc - 1], 0, 8); - tcg_gen_extract_tl(t1, mxu_gpr[XRc - 1], 8, 8); - tcg_gen_extract_tl(t2, mxu_gpr[XRc - 1], 16, 8); - tcg_gen_extract_tl(t3, mxu_gpr[XRc - 1], 24, 8); - tcg_gen_add_tl(t5, t0, t1); - tcg_gen_add_tl(t5, t5, t2); - tcg_gen_add_tl(t5, t5, t3); + tcg_gen_extract_i32(t0, mxu_gpr[XRc - 1], 0, 8); + tcg_gen_extract_i32(t1, mxu_gpr[XRc - 1], 8, 8); + tcg_gen_extract_i32(t2, mxu_gpr[XRc - 1], 16, 8); + tcg_gen_extract_i32(t3, mxu_gpr[XRc - 1], 24, 8); + tcg_gen_add_i32(t5, t0, t1); + tcg_gen_add_i32(t5, t5, t2); + tcg_gen_add_i32(t5, t5, t3); } else { - tcg_gen_mov_tl(t5, 0); + tcg_gen_mov_i32(t5, 0); } =20 if (sumc) { - tcg_gen_addi_tl(t4, t4, 2); - tcg_gen_addi_tl(t5, t5, 2); + tcg_gen_addi_i32(t4, t4, 2); + tcg_gen_addi_i32(t5, t5, 2); } - tcg_gen_shli_tl(t4, t4, 16); + tcg_gen_shli_i32(t4, t4, 16); =20 - tcg_gen_or_tl(mxu_gpr[XRa - 1], t4, t5); + tcg_gen_or_i32(mxu_gpr[XRa - 1], t4, t5); } } =20 @@ -3148,74 +3148,74 @@ static void gen_mxu_q16add(DisasContext *ctx) XRb =3D extract32(ctx->opcode, 10, 4); XRa =3D extract32(ctx->opcode, 6, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t4 =3D tcg_temp_new(); - TCGv t5 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t4 =3D tcg_temp_new_i32(); + TCGv_i32 t5 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t1, XRb); - tcg_gen_extract_tl(t0, t1, 0, 16); - tcg_gen_extract_tl(t1, t1, 16, 16); + tcg_gen_extract_i32(t0, t1, 0, 16); + tcg_gen_extract_i32(t1, t1, 16, 16); =20 gen_load_mxu_gpr(t3, XRc); - tcg_gen_extract_tl(t2, t3, 0, 16); - tcg_gen_extract_tl(t3, t3, 16, 16); + tcg_gen_extract_i32(t2, t3, 0, 16); + tcg_gen_extract_i32(t3, t3, 16, 16); =20 switch (optn2) { case MXU_OPTN2_WW: /* XRB.H+XRC.H =3D=3D lop, XRB.L+XRC.L =3D=3D rop */ - tcg_gen_mov_tl(t4, t1); - tcg_gen_mov_tl(t5, t0); + tcg_gen_mov_i32(t4, t1); + tcg_gen_mov_i32(t5, t0); break; case MXU_OPTN2_LW: /* XRB.L+XRC.H =3D=3D lop, XRB.L+XRC.L =3D=3D rop */ - tcg_gen_mov_tl(t4, t0); - tcg_gen_mov_tl(t5, t0); + tcg_gen_mov_i32(t4, t0); + tcg_gen_mov_i32(t5, t0); break; case MXU_OPTN2_HW: /* XRB.H+XRC.H =3D=3D lop, XRB.H+XRC.L =3D=3D rop */ - tcg_gen_mov_tl(t4, t1); - tcg_gen_mov_tl(t5, t1); + tcg_gen_mov_i32(t4, t1); + tcg_gen_mov_i32(t5, t1); break; case MXU_OPTN2_XW: /* XRB.L+XRC.H =3D=3D lop, XRB.H+XRC.L =3D=3D rop */ - tcg_gen_mov_tl(t4, t0); - tcg_gen_mov_tl(t5, t1); + tcg_gen_mov_i32(t4, t0); + tcg_gen_mov_i32(t5, t1); break; } =20 switch (aptn2) { case MXU_APTN2_AA: /* lop +, rop + */ - tcg_gen_add_tl(t0, t4, t3); - tcg_gen_add_tl(t1, t5, t2); - tcg_gen_add_tl(t4, t4, t3); - tcg_gen_add_tl(t5, t5, t2); + tcg_gen_add_i32(t0, t4, t3); + tcg_gen_add_i32(t1, t5, t2); + tcg_gen_add_i32(t4, t4, t3); + tcg_gen_add_i32(t5, t5, t2); break; case MXU_APTN2_AS: /* lop +, rop + */ - tcg_gen_sub_tl(t0, t4, t3); - tcg_gen_sub_tl(t1, t5, t2); - tcg_gen_add_tl(t4, t4, t3); - tcg_gen_add_tl(t5, t5, t2); + tcg_gen_sub_i32(t0, t4, t3); + tcg_gen_sub_i32(t1, t5, t2); + tcg_gen_add_i32(t4, t4, t3); + tcg_gen_add_i32(t5, t5, t2); break; case MXU_APTN2_SA: /* lop +, rop + */ - tcg_gen_add_tl(t0, t4, t3); - tcg_gen_add_tl(t1, t5, t2); - tcg_gen_sub_tl(t4, t4, t3); - tcg_gen_sub_tl(t5, t5, t2); + tcg_gen_add_i32(t0, t4, t3); + tcg_gen_add_i32(t1, t5, t2); + tcg_gen_sub_i32(t4, t4, t3); + tcg_gen_sub_i32(t5, t5, t2); break; case MXU_APTN2_SS: /* lop +, rop + */ - tcg_gen_sub_tl(t0, t4, t3); - tcg_gen_sub_tl(t1, t5, t2); - tcg_gen_sub_tl(t4, t4, t3); - tcg_gen_sub_tl(t5, t5, t2); + tcg_gen_sub_i32(t0, t4, t3); + tcg_gen_sub_i32(t1, t5, t2); + tcg_gen_sub_i32(t4, t4, t3); + tcg_gen_sub_i32(t5, t5, t2); break; } =20 - tcg_gen_shli_tl(t0, t0, 16); - tcg_gen_extract_tl(t1, t1, 0, 16); - tcg_gen_shli_tl(t4, t4, 16); - tcg_gen_extract_tl(t5, t5, 0, 16); + tcg_gen_shli_i32(t0, t0, 16); + tcg_gen_extract_i32(t1, t1, 0, 16); + tcg_gen_shli_i32(t4, t4, 16); + tcg_gen_extract_i32(t5, t5, 0, 16); =20 - tcg_gen_or_tl(mxu_gpr[XRa - 1], t4, t5); - tcg_gen_or_tl(mxu_gpr[XRd - 1], t0, t1); + tcg_gen_or_i32(mxu_gpr[XRa - 1], t4, t5); + tcg_gen_or_i32(mxu_gpr[XRd - 1], t0, t1); } =20 /* @@ -3232,66 +3232,66 @@ static void gen_mxu_q16acc(DisasContext *ctx) XRb =3D extract32(ctx->opcode, 10, 4); XRa =3D extract32(ctx->opcode, 6, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv s3 =3D tcg_temp_new(); - TCGv s2 =3D tcg_temp_new(); - TCGv s1 =3D tcg_temp_new(); - TCGv s0 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 s3 =3D tcg_temp_new_i32(); + TCGv_i32 s2 =3D tcg_temp_new_i32(); + TCGv_i32 s1 =3D tcg_temp_new_i32(); + TCGv_i32 s0 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t1, XRb); - tcg_gen_extract_tl(t0, t1, 0, 16); - tcg_gen_extract_tl(t1, t1, 16, 16); + tcg_gen_extract_i32(t0, t1, 0, 16); + tcg_gen_extract_i32(t1, t1, 16, 16); =20 gen_load_mxu_gpr(t3, XRc); - tcg_gen_extract_tl(t2, t3, 0, 16); - tcg_gen_extract_tl(t3, t3, 16, 16); + tcg_gen_extract_i32(t2, t3, 0, 16); + tcg_gen_extract_i32(t3, t3, 16, 16); =20 switch (aptn2) { case MXU_APTN2_AA: /* lop +, rop + */ - tcg_gen_add_tl(s3, t1, t3); - tcg_gen_add_tl(s2, t0, t2); - tcg_gen_add_tl(s1, t1, t3); - tcg_gen_add_tl(s0, t0, t2); + tcg_gen_add_i32(s3, t1, t3); + tcg_gen_add_i32(s2, t0, t2); + tcg_gen_add_i32(s1, t1, t3); + tcg_gen_add_i32(s0, t0, t2); break; case MXU_APTN2_AS: /* lop +, rop - */ - tcg_gen_sub_tl(s3, t1, t3); - tcg_gen_sub_tl(s2, t0, t2); - tcg_gen_add_tl(s1, t1, t3); - tcg_gen_add_tl(s0, t0, t2); + tcg_gen_sub_i32(s3, t1, t3); + tcg_gen_sub_i32(s2, t0, t2); + tcg_gen_add_i32(s1, t1, t3); + tcg_gen_add_i32(s0, t0, t2); break; case MXU_APTN2_SA: /* lop -, rop + */ - tcg_gen_add_tl(s3, t1, t3); - tcg_gen_add_tl(s2, t0, t2); - tcg_gen_sub_tl(s1, t1, t3); - tcg_gen_sub_tl(s0, t0, t2); + tcg_gen_add_i32(s3, t1, t3); + tcg_gen_add_i32(s2, t0, t2); + tcg_gen_sub_i32(s1, t1, t3); + tcg_gen_sub_i32(s0, t0, t2); break; case MXU_APTN2_SS: /* lop -, rop - */ - tcg_gen_sub_tl(s3, t1, t3); - tcg_gen_sub_tl(s2, t0, t2); - tcg_gen_sub_tl(s1, t1, t3); - tcg_gen_sub_tl(s0, t0, t2); + tcg_gen_sub_i32(s3, t1, t3); + tcg_gen_sub_i32(s2, t0, t2); + tcg_gen_sub_i32(s1, t1, t3); + tcg_gen_sub_i32(s0, t0, t2); break; } =20 if (XRa !=3D 0) { - tcg_gen_add_tl(t0, mxu_gpr[XRa - 1], s0); - tcg_gen_extract_tl(t0, t0, 0, 16); - tcg_gen_extract_tl(t1, mxu_gpr[XRa - 1], 16, 16); - tcg_gen_add_tl(t1, t1, s1); - tcg_gen_shli_tl(t1, t1, 16); - tcg_gen_or_tl(mxu_gpr[XRa - 1], t1, t0); + tcg_gen_add_i32(t0, mxu_gpr[XRa - 1], s0); + tcg_gen_extract_i32(t0, t0, 0, 16); + tcg_gen_extract_i32(t1, mxu_gpr[XRa - 1], 16, 16); + tcg_gen_add_i32(t1, t1, s1); + tcg_gen_shli_i32(t1, t1, 16); + tcg_gen_or_i32(mxu_gpr[XRa - 1], t1, t0); } =20 if (XRd !=3D 0) { - tcg_gen_add_tl(t0, mxu_gpr[XRd - 1], s2); - tcg_gen_extract_tl(t0, t0, 0, 16); - tcg_gen_extract_tl(t1, mxu_gpr[XRd - 1], 16, 16); - tcg_gen_add_tl(t1, t1, s3); - tcg_gen_shli_tl(t1, t1, 16); - tcg_gen_or_tl(mxu_gpr[XRd - 1], t1, t0); + tcg_gen_add_i32(t0, mxu_gpr[XRd - 1], s2); + tcg_gen_extract_i32(t0, t0, 0, 16); + tcg_gen_extract_i32(t1, mxu_gpr[XRd - 1], 16, 16); + tcg_gen_add_i32(t1, t1, s3); + tcg_gen_shli_i32(t1, t1, 16); + tcg_gen_or_i32(mxu_gpr[XRd - 1], t1, t0); } } =20 @@ -3309,58 +3309,58 @@ static void gen_mxu_q16accm(DisasContext *ctx) XRb =3D extract32(ctx->opcode, 10, 4); XRa =3D extract32(ctx->opcode, 6, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t2, XRb); gen_load_mxu_gpr(t3, XRc); =20 if (XRa !=3D 0) { - TCGv a0 =3D tcg_temp_new(); - TCGv a1 =3D tcg_temp_new(); + TCGv_i32 a0 =3D tcg_temp_new_i32(); + TCGv_i32 a1 =3D tcg_temp_new_i32(); =20 - tcg_gen_extract_tl(t0, t2, 0, 16); - tcg_gen_extract_tl(t1, t2, 16, 16); + tcg_gen_extract_i32(t0, t2, 0, 16); + tcg_gen_extract_i32(t1, t2, 16, 16); =20 gen_load_mxu_gpr(a1, XRa); - tcg_gen_extract_tl(a0, a1, 0, 16); - tcg_gen_extract_tl(a1, a1, 16, 16); + tcg_gen_extract_i32(a0, a1, 0, 16); + tcg_gen_extract_i32(a1, a1, 16, 16); =20 if (aptn2 & 2) { - tcg_gen_sub_tl(a0, a0, t0); - tcg_gen_sub_tl(a1, a1, t1); + tcg_gen_sub_i32(a0, a0, t0); + tcg_gen_sub_i32(a1, a1, t1); } else { - tcg_gen_add_tl(a0, a0, t0); - tcg_gen_add_tl(a1, a1, t1); + tcg_gen_add_i32(a0, a0, t0); + tcg_gen_add_i32(a1, a1, t1); } - tcg_gen_extract_tl(a0, a0, 0, 16); - tcg_gen_shli_tl(a1, a1, 16); - tcg_gen_or_tl(mxu_gpr[XRa - 1], a1, a0); + tcg_gen_extract_i32(a0, a0, 0, 16); + tcg_gen_shli_i32(a1, a1, 16); + tcg_gen_or_i32(mxu_gpr[XRa - 1], a1, a0); } =20 if (XRd !=3D 0) { - TCGv a0 =3D tcg_temp_new(); - TCGv a1 =3D tcg_temp_new(); + TCGv_i32 a0 =3D tcg_temp_new_i32(); + TCGv_i32 a1 =3D tcg_temp_new_i32(); =20 - tcg_gen_extract_tl(t0, t3, 0, 16); - tcg_gen_extract_tl(t1, t3, 16, 16); + tcg_gen_extract_i32(t0, t3, 0, 16); + tcg_gen_extract_i32(t1, t3, 16, 16); =20 gen_load_mxu_gpr(a1, XRd); - tcg_gen_extract_tl(a0, a1, 0, 16); - tcg_gen_extract_tl(a1, a1, 16, 16); + tcg_gen_extract_i32(a0, a1, 0, 16); + tcg_gen_extract_i32(a1, a1, 16, 16); =20 if (aptn2 & 1) { - tcg_gen_sub_tl(a0, a0, t0); - tcg_gen_sub_tl(a1, a1, t1); + tcg_gen_sub_i32(a0, a0, t0); + tcg_gen_sub_i32(a1, a1, t1); } else { - tcg_gen_add_tl(a0, a0, t0); - tcg_gen_add_tl(a1, a1, t1); + tcg_gen_add_i32(a0, a0, t0); + tcg_gen_add_i32(a1, a1, t1); } - tcg_gen_extract_tl(a0, a0, 0, 16); - tcg_gen_shli_tl(a1, a1, 16); - tcg_gen_or_tl(mxu_gpr[XRd - 1], a1, a0); + tcg_gen_extract_i32(a0, a0, 0, 16); + tcg_gen_shli_i32(a1, a1, 16); + tcg_gen_or_i32(mxu_gpr[XRd - 1], a1, a0); } } =20 @@ -3379,33 +3379,33 @@ static void gen_mxu_d16asum(DisasContext *ctx) XRb =3D extract32(ctx->opcode, 10, 4); XRa =3D extract32(ctx->opcode, 6, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t2, XRb); gen_load_mxu_gpr(t3, XRc); =20 if (XRa !=3D 0) { - tcg_gen_sextract_tl(t0, t2, 0, 16); - tcg_gen_sextract_tl(t1, t2, 16, 16); - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_sextract_i32(t0, t2, 0, 16); + tcg_gen_sextract_i32(t1, t2, 16, 16); + tcg_gen_add_i32(t0, t0, t1); if (aptn2 & 2) { - tcg_gen_sub_tl(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t0); + tcg_gen_sub_i32(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t0); } else { - tcg_gen_add_tl(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t0); + tcg_gen_add_i32(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t0); } } =20 if (XRd !=3D 0) { - tcg_gen_sextract_tl(t0, t3, 0, 16); - tcg_gen_sextract_tl(t1, t3, 16, 16); - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_sextract_i32(t0, t3, 0, 16); + tcg_gen_sextract_i32(t1, t3, 16, 16); + tcg_gen_add_i32(t0, t0, t1); if (aptn2 & 1) { - tcg_gen_sub_tl(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t0); + tcg_gen_sub_i32(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t0); } else { - tcg_gen_add_tl(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t0); + tcg_gen_add_i32(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t0); } } } @@ -3428,10 +3428,10 @@ static void gen_mxu_d32add(DisasContext *ctx) XRb =3D extract32(ctx->opcode, 10, 4); XRa =3D extract32(ctx->opcode, 6, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv cr =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 cr =3D tcg_temp_new_i32(); =20 if (unlikely(addc > 1)) { /* opcode incorrect -> do nothing */ @@ -3445,14 +3445,14 @@ static void gen_mxu_d32add(DisasContext *ctx) gen_load_mxu_gpr(t1, XRc); gen_load_mxu_cr(cr); if (XRa !=3D 0) { - tcg_gen_extract_tl(t2, cr, 31, 1); - tcg_gen_add_tl(t0, t0, t2); - tcg_gen_add_tl(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t0); + tcg_gen_extract_i32(t2, cr, 31, 1); + tcg_gen_add_i32(t0, t0, t2); + tcg_gen_add_i32(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t0); } if (XRd !=3D 0) { - tcg_gen_extract_tl(t2, cr, 30, 1); - tcg_gen_add_tl(t1, t1, t2); - tcg_gen_add_tl(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t1); + tcg_gen_extract_i32(t2, cr, 30, 1); + tcg_gen_add_i32(t1, t1, t2); + tcg_gen_add_i32(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t1); } } } else if (unlikely(XRa =3D=3D 0 && XRd =3D=3D 0)) { @@ -3460,7 +3460,7 @@ static void gen_mxu_d32add(DisasContext *ctx) } else { /* common case */ /* FIXME ??? What if XRa =3D=3D XRd ??? */ - TCGv carry =3D tcg_temp_new(); + TCGv_i32 carry =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t0, XRb); gen_load_mxu_gpr(t1, XRc); @@ -3468,27 +3468,27 @@ static void gen_mxu_d32add(DisasContext *ctx) if (XRa !=3D 0) { if (aptn2 & 2) { tcg_gen_sub_i32(t2, t0, t1); - tcg_gen_setcond_tl(TCG_COND_GTU, carry, t0, t1); + tcg_gen_setcond_i32(TCG_COND_GTU, carry, t0, t1); } else { tcg_gen_add_i32(t2, t0, t1); - tcg_gen_setcond_tl(TCG_COND_GTU, carry, t0, t2); + tcg_gen_setcond_i32(TCG_COND_GTU, carry, t0, t2); } - tcg_gen_andi_tl(cr, cr, 0x7fffffff); - tcg_gen_shli_tl(carry, carry, 31); - tcg_gen_or_tl(cr, cr, carry); + tcg_gen_andi_i32(cr, cr, 0x7fffffff); + tcg_gen_shli_i32(carry, carry, 31); + tcg_gen_or_i32(cr, cr, carry); gen_store_mxu_gpr(t2, XRa); } if (XRd !=3D 0) { if (aptn2 & 1) { tcg_gen_sub_i32(t2, t0, t1); - tcg_gen_setcond_tl(TCG_COND_GTU, carry, t0, t1); + tcg_gen_setcond_i32(TCG_COND_GTU, carry, t0, t1); } else { tcg_gen_add_i32(t2, t0, t1); - tcg_gen_setcond_tl(TCG_COND_GTU, carry, t0, t2); + tcg_gen_setcond_i32(TCG_COND_GTU, carry, t0, t2); } - tcg_gen_andi_tl(cr, cr, 0xbfffffff); - tcg_gen_shli_tl(carry, carry, 30); - tcg_gen_or_tl(cr, cr, carry); + tcg_gen_andi_i32(cr, cr, 0xbfffffff); + tcg_gen_shli_i32(carry, carry, 30); + tcg_gen_or_i32(cr, cr, carry); gen_store_mxu_gpr(t2, XRd); } gen_store_mxu_cr(cr); @@ -3509,9 +3509,9 @@ static void gen_mxu_d32acc(DisasContext *ctx) XRb =3D extract32(ctx->opcode, 10, 4); XRa =3D extract32(ctx->opcode, 6, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); =20 if (unlikely(XRa =3D=3D 0 && XRd =3D=3D 0)) { /* destinations are zero register -> do nothing */ @@ -3521,19 +3521,19 @@ static void gen_mxu_d32acc(DisasContext *ctx) gen_load_mxu_gpr(t1, XRc); if (XRa !=3D 0) { if (aptn2 & 2) { - tcg_gen_sub_tl(t2, t0, t1); + tcg_gen_sub_i32(t2, t0, t1); } else { - tcg_gen_add_tl(t2, t0, t1); + tcg_gen_add_i32(t2, t0, t1); } - tcg_gen_add_tl(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t2); + tcg_gen_add_i32(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t2); } if (XRd !=3D 0) { if (aptn2 & 1) { - tcg_gen_sub_tl(t2, t0, t1); + tcg_gen_sub_i32(t2, t0, t1); } else { - tcg_gen_add_tl(t2, t0, t1); + tcg_gen_add_i32(t2, t0, t1); } - tcg_gen_add_tl(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t2); + tcg_gen_add_i32(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t2); } } } @@ -3552,9 +3552,9 @@ static void gen_mxu_d32accm(DisasContext *ctx) XRb =3D extract32(ctx->opcode, 10, 4); XRa =3D extract32(ctx->opcode, 6, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); =20 if (unlikely(XRa =3D=3D 0 && XRd =3D=3D 0)) { /* destinations are zero register -> do nothing */ @@ -3563,19 +3563,19 @@ static void gen_mxu_d32accm(DisasContext *ctx) gen_load_mxu_gpr(t0, XRb); gen_load_mxu_gpr(t1, XRc); if (XRa !=3D 0) { - tcg_gen_add_tl(t2, t0, t1); + tcg_gen_add_i32(t2, t0, t1); if (aptn2 & 2) { - tcg_gen_sub_tl(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t2); + tcg_gen_sub_i32(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t2); } else { - tcg_gen_add_tl(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t2); + tcg_gen_add_i32(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t2); } } if (XRd !=3D 0) { - tcg_gen_sub_tl(t2, t0, t1); + tcg_gen_sub_i32(t2, t0, t1); if (aptn2 & 1) { - tcg_gen_sub_tl(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t2); + tcg_gen_sub_i32(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t2); } else { - tcg_gen_add_tl(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t2); + tcg_gen_add_i32(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t2); } } } @@ -3595,8 +3595,8 @@ static void gen_mxu_d32asum(DisasContext *ctx) XRb =3D extract32(ctx->opcode, 10, 4); XRa =3D extract32(ctx->opcode, 6, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); =20 if (unlikely(XRa =3D=3D 0 && XRd =3D=3D 0)) { /* destinations are zero register -> do nothing */ @@ -3606,16 +3606,16 @@ static void gen_mxu_d32asum(DisasContext *ctx) gen_load_mxu_gpr(t1, XRc); if (XRa !=3D 0) { if (aptn2 & 2) { - tcg_gen_sub_tl(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t0); + tcg_gen_sub_i32(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t0); } else { - tcg_gen_add_tl(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t0); + tcg_gen_add_i32(mxu_gpr[XRa - 1], mxu_gpr[XRa - 1], t0); } } if (XRd !=3D 0) { if (aptn2 & 1) { - tcg_gen_sub_tl(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t1); + tcg_gen_sub_i32(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t1); } else { - tcg_gen_add_tl(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t1); + tcg_gen_add_i32(mxu_gpr[XRd - 1], mxu_gpr[XRd - 1], t1); } } } @@ -3638,13 +3638,13 @@ static void gen_mxu_d32asum(DisasContext *ctx) */ static void gen_mxu_s32extr(DisasContext *ctx) { - TCGv t0, t1, t2, t3; + TCGv_i32 t0, t1, t2, t3; uint32_t XRa, XRd, rs, bits5; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); - t2 =3D tcg_temp_new(); - t3 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); + t2 =3D tcg_temp_new_i32(); + t3 =3D tcg_temp_new_i32(); =20 XRa =3D extract32(ctx->opcode, 6, 4); XRd =3D extract32(ctx->opcode, 10, 4); @@ -3660,23 +3660,23 @@ static void gen_mxu_s32extr(DisasContext *ctx) gen_load_mxu_gpr(t0, XRd); gen_load_mxu_gpr(t1, XRa); gen_load_gpr(t2, rs); - tcg_gen_andi_tl(t2, t2, 0x1f); - tcg_gen_subfi_tl(t2, 32, t2); - tcg_gen_brcondi_tl(TCG_COND_GE, t2, bits5, l_xra_only); - tcg_gen_subfi_tl(t2, bits5, t2); - tcg_gen_subfi_tl(t3, 32, t2); - tcg_gen_shr_tl(t0, t0, t3); - tcg_gen_shl_tl(t1, t1, t2); - tcg_gen_or_tl(t0, t0, t1); + tcg_gen_andi_i32(t2, t2, 0x1f); + tcg_gen_subfi_i32(t2, 32, t2); + tcg_gen_brcondi_i32(TCG_COND_GE, t2, bits5, l_xra_only); + tcg_gen_subfi_i32(t2, bits5, t2); + tcg_gen_subfi_i32(t3, 32, t2); + tcg_gen_shr_i32(t0, t0, t3); + tcg_gen_shl_i32(t1, t1, t2); + tcg_gen_or_i32(t0, t0, t1); tcg_gen_br(l_done); gen_set_label(l_xra_only); - tcg_gen_subi_tl(t2, t2, bits5); - tcg_gen_shr_tl(t0, t1, t2); + tcg_gen_subi_i32(t2, t2, bits5); + tcg_gen_shr_i32(t0, t1, t2); gen_set_label(l_done); - tcg_gen_extract_tl(t0, t0, 0, bits5); + tcg_gen_extract_i32(t0, t0, 0, bits5); } else { /* unspecified behavior but matches tests on real hardware*/ - tcg_gen_movi_tl(t0, 0); + tcg_gen_movi_i32(t0, 0); } gen_store_mxu_gpr(t0, XRa); } @@ -3688,14 +3688,14 @@ static void gen_mxu_s32extr(DisasContext *ctx) */ static void gen_mxu_s32extrv(DisasContext *ctx) { - TCGv t0, t1, t2, t3, t4; + TCGv_i32 t0, t1, t2, t3, t4; uint32_t XRa, XRd, rs, rt; =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); - t2 =3D tcg_temp_new(); - t3 =3D tcg_temp_new(); - t4 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i32(); + t1 =3D tcg_temp_new_i32(); + t2 =3D tcg_temp_new_i32(); + t3 =3D tcg_temp_new_i32(); + t4 =3D tcg_temp_new_i32(); TCGLabel *l_xra_only =3D gen_new_label(); TCGLabel *l_done =3D gen_new_label(); TCGLabel *l_zero =3D gen_new_label(); @@ -3711,32 +3711,32 @@ static void gen_mxu_s32extrv(DisasContext *ctx) gen_load_mxu_gpr(t1, XRa); gen_load_gpr(t2, rs); gen_load_gpr(t4, rt); - tcg_gen_brcondi_tl(TCG_COND_EQ, t4, 0, l_zero); - tcg_gen_andi_tl(t2, t2, 0x1f); - tcg_gen_subfi_tl(t2, 32, t2); - tcg_gen_brcond_tl(TCG_COND_GE, t2, t4, l_xra_only); - tcg_gen_sub_tl(t2, t4, t2); - tcg_gen_subfi_tl(t3, 32, t2); - tcg_gen_shr_tl(t0, t0, t3); - tcg_gen_shl_tl(t1, t1, t2); - tcg_gen_or_tl(t0, t0, t1); + tcg_gen_brcondi_i32(TCG_COND_EQ, t4, 0, l_zero); + tcg_gen_andi_i32(t2, t2, 0x1f); + tcg_gen_subfi_i32(t2, 32, t2); + tcg_gen_brcond_i32(TCG_COND_GE, t2, t4, l_xra_only); + tcg_gen_sub_i32(t2, t4, t2); + tcg_gen_subfi_i32(t3, 32, t2); + tcg_gen_shr_i32(t0, t0, t3); + tcg_gen_shl_i32(t1, t1, t2); + tcg_gen_or_i32(t0, t0, t1); tcg_gen_br(l_extract); =20 gen_set_label(l_xra_only); - tcg_gen_sub_tl(t2, t2, t4); - tcg_gen_shr_tl(t0, t1, t2); + tcg_gen_sub_i32(t2, t2, t4); + tcg_gen_shr_i32(t0, t1, t2); tcg_gen_br(l_extract); =20 /* unspecified behavior but matches tests on real hardware*/ gen_set_label(l_zero); - tcg_gen_movi_tl(t0, 0); + tcg_gen_movi_i32(t0, 0); tcg_gen_br(l_done); =20 /* {XRa} =3D extract({tmp}, 0, rt) */ gen_set_label(l_extract); - tcg_gen_subfi_tl(t4, 32, t4); - tcg_gen_shl_tl(t0, t0, t4); - tcg_gen_shr_tl(t0, t0, t4); + tcg_gen_subfi_i32(t4, 32, t4); + tcg_gen_shl_i32(t0, t0, t4); + tcg_gen_shr_i32(t0, t0, t4); =20 gen_set_label(l_done); gen_store_mxu_gpr(t0, XRa); @@ -3762,33 +3762,33 @@ static void gen_mxu_s32lui(DisasContext *ctx) /* destination is zero register -> do nothing */ } else { uint32_t s16; - TCGv t0 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); =20 switch (optn3) { case 0: - tcg_gen_movi_tl(t0, s8); + tcg_gen_movi_i32(t0, s8); break; case 1: - tcg_gen_movi_tl(t0, s8 << 8); + tcg_gen_movi_i32(t0, s8 << 8); break; case 2: - tcg_gen_movi_tl(t0, s8 << 16); + tcg_gen_movi_i32(t0, s8 << 16); break; case 3: - tcg_gen_movi_tl(t0, s8 << 24); + tcg_gen_movi_i32(t0, s8 << 24); break; case 4: - tcg_gen_movi_tl(t0, (s8 << 16) | s8); + tcg_gen_movi_i32(t0, (s8 << 16) | s8); break; case 5: - tcg_gen_movi_tl(t0, (s8 << 24) | (s8 << 8)); + tcg_gen_movi_i32(t0, (s8 << 24) | (s8 << 8)); break; case 6: s16 =3D (uint16_t)(int16_t)(int8_t)s8; - tcg_gen_movi_tl(t0, (s16 << 16) | s16); + tcg_gen_movi_i32(t0, (s16 << 16) | s16); break; case 7: - tcg_gen_movi_tl(t0, (s8 << 24) | (s8 << 16) | (s8 << 8) | s8); + tcg_gen_movi_i32(t0, (s8 << 24) | (s8 << 16) | (s8 << 8) | s8); break; } gen_store_mxu_gpr(t0, XRa); @@ -3816,11 +3816,11 @@ static void gen_mxu_Q16SAT(DisasContext *ctx) /* destination is zero register -> do nothing */ } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); =20 - tcg_gen_movi_tl(t2, 0); + tcg_gen_movi_i32(t2, 0); if (XRb !=3D 0) { TCGLabel *l_less_hi =3D gen_new_label(); TCGLabel *l_less_lo =3D gen_new_label(); @@ -3829,32 +3829,32 @@ static void gen_mxu_Q16SAT(DisasContext *ctx) TCGLabel *l_greater_lo =3D gen_new_label(); TCGLabel *l_done =3D gen_new_label(); =20 - tcg_gen_sari_tl(t0, mxu_gpr[XRb - 1], 16); - tcg_gen_brcondi_tl(TCG_COND_LT, t0, 0, l_less_hi); - tcg_gen_brcondi_tl(TCG_COND_GT, t0, 255, l_greater_hi); + tcg_gen_sari_i32(t0, mxu_gpr[XRb - 1], 16); + tcg_gen_brcondi_i32(TCG_COND_LT, t0, 0, l_less_hi); + tcg_gen_brcondi_i32(TCG_COND_GT, t0, 255, l_greater_hi); tcg_gen_br(l_lo); gen_set_label(l_less_hi); - tcg_gen_movi_tl(t0, 0); + tcg_gen_movi_i32(t0, 0); tcg_gen_br(l_lo); gen_set_label(l_greater_hi); - tcg_gen_movi_tl(t0, 255); + tcg_gen_movi_i32(t0, 255); =20 gen_set_label(l_lo); - tcg_gen_shli_tl(t1, mxu_gpr[XRb - 1], 16); - tcg_gen_sari_tl(t1, t1, 16); - tcg_gen_brcondi_tl(TCG_COND_LT, t1, 0, l_less_lo); - tcg_gen_brcondi_tl(TCG_COND_GT, t1, 255, l_greater_lo); + tcg_gen_shli_i32(t1, mxu_gpr[XRb - 1], 16); + tcg_gen_sari_i32(t1, t1, 16); + tcg_gen_brcondi_i32(TCG_COND_LT, t1, 0, l_less_lo); + tcg_gen_brcondi_i32(TCG_COND_GT, t1, 255, l_greater_lo); tcg_gen_br(l_done); gen_set_label(l_less_lo); - tcg_gen_movi_tl(t1, 0); + tcg_gen_movi_i32(t1, 0); tcg_gen_br(l_done); gen_set_label(l_greater_lo); - tcg_gen_movi_tl(t1, 255); + tcg_gen_movi_i32(t1, 255); =20 gen_set_label(l_done); - tcg_gen_shli_tl(t2, t0, 24); - tcg_gen_shli_tl(t1, t1, 16); - tcg_gen_or_tl(t2, t2, t1); + tcg_gen_shli_i32(t2, t0, 24); + tcg_gen_shli_i32(t1, t1, 16); + tcg_gen_or_i32(t2, t2, t1); } =20 if (XRc !=3D 0) { @@ -3865,32 +3865,32 @@ static void gen_mxu_Q16SAT(DisasContext *ctx) TCGLabel *l_greater_lo =3D gen_new_label(); TCGLabel *l_done =3D gen_new_label(); =20 - tcg_gen_sari_tl(t0, mxu_gpr[XRc - 1], 16); - tcg_gen_brcondi_tl(TCG_COND_LT, t0, 0, l_less_hi); - tcg_gen_brcondi_tl(TCG_COND_GT, t0, 255, l_greater_hi); + tcg_gen_sari_i32(t0, mxu_gpr[XRc - 1], 16); + tcg_gen_brcondi_i32(TCG_COND_LT, t0, 0, l_less_hi); + tcg_gen_brcondi_i32(TCG_COND_GT, t0, 255, l_greater_hi); tcg_gen_br(l_lo); gen_set_label(l_less_hi); - tcg_gen_movi_tl(t0, 0); + tcg_gen_movi_i32(t0, 0); tcg_gen_br(l_lo); gen_set_label(l_greater_hi); - tcg_gen_movi_tl(t0, 255); + tcg_gen_movi_i32(t0, 255); =20 gen_set_label(l_lo); - tcg_gen_shli_tl(t1, mxu_gpr[XRc - 1], 16); - tcg_gen_sari_tl(t1, t1, 16); - tcg_gen_brcondi_tl(TCG_COND_LT, t1, 0, l_less_lo); - tcg_gen_brcondi_tl(TCG_COND_GT, t1, 255, l_greater_lo); + tcg_gen_shli_i32(t1, mxu_gpr[XRc - 1], 16); + tcg_gen_sari_i32(t1, t1, 16); + tcg_gen_brcondi_i32(TCG_COND_LT, t1, 0, l_less_lo); + tcg_gen_brcondi_i32(TCG_COND_GT, t1, 255, l_greater_lo); tcg_gen_br(l_done); gen_set_label(l_less_lo); - tcg_gen_movi_tl(t1, 0); + tcg_gen_movi_i32(t1, 0); tcg_gen_br(l_done); gen_set_label(l_greater_lo); - tcg_gen_movi_tl(t1, 255); + tcg_gen_movi_i32(t1, 255); =20 gen_set_label(l_done); - tcg_gen_shli_tl(t0, t0, 8); - tcg_gen_or_tl(t2, t2, t0); - tcg_gen_or_tl(t2, t2, t1); + tcg_gen_shli_i32(t0, t0, 8); + tcg_gen_or_i32(t2, t2, t0); + tcg_gen_or_i32(t2, t2, t1); } gen_store_mxu_gpr(t2, XRa); } @@ -3910,11 +3910,11 @@ static void gen_mxu_q16scop(DisasContext *ctx) XRb =3D extract32(ctx->opcode, 10, 4); XRa =3D extract32(ctx->opcode, 6, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t4 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t4 =3D tcg_temp_new_i32(); =20 TCGLabel *l_b_hi_lt =3D gen_new_label(); TCGLabel *l_b_hi_gt =3D gen_new_label(); @@ -3930,47 +3930,47 @@ static void gen_mxu_q16scop(DisasContext *ctx) gen_load_mxu_gpr(t0, XRb); gen_load_mxu_gpr(t1, XRc); =20 - tcg_gen_sextract_tl(t2, t0, 16, 16); - tcg_gen_brcondi_tl(TCG_COND_LT, t2, 0, l_b_hi_lt); - tcg_gen_brcondi_tl(TCG_COND_GT, t2, 0, l_b_hi_gt); - tcg_gen_movi_tl(t3, 0); + tcg_gen_sextract_i32(t2, t0, 16, 16); + tcg_gen_brcondi_i32(TCG_COND_LT, t2, 0, l_b_hi_lt); + tcg_gen_brcondi_i32(TCG_COND_GT, t2, 0, l_b_hi_gt); + tcg_gen_movi_i32(t3, 0); tcg_gen_br(l_b_lo); gen_set_label(l_b_hi_lt); - tcg_gen_movi_tl(t3, 0xffff0000); + tcg_gen_movi_i32(t3, 0xffff0000); tcg_gen_br(l_b_lo); gen_set_label(l_b_hi_gt); - tcg_gen_movi_tl(t3, 0x00010000); + tcg_gen_movi_i32(t3, 0x00010000); =20 gen_set_label(l_b_lo); - tcg_gen_sextract_tl(t2, t0, 0, 16); - tcg_gen_brcondi_tl(TCG_COND_EQ, t2, 0, l_c_hi); - tcg_gen_brcondi_tl(TCG_COND_LT, t2, 0, l_b_lo_lt); - tcg_gen_ori_tl(t3, t3, 0x00000001); + tcg_gen_sextract_i32(t2, t0, 0, 16); + tcg_gen_brcondi_i32(TCG_COND_EQ, t2, 0, l_c_hi); + tcg_gen_brcondi_i32(TCG_COND_LT, t2, 0, l_b_lo_lt); + tcg_gen_ori_i32(t3, t3, 0x00000001); tcg_gen_br(l_c_hi); gen_set_label(l_b_lo_lt); - tcg_gen_ori_tl(t3, t3, 0x0000ffff); + tcg_gen_ori_i32(t3, t3, 0x0000ffff); tcg_gen_br(l_c_hi); =20 gen_set_label(l_c_hi); - tcg_gen_sextract_tl(t2, t1, 16, 16); - tcg_gen_brcondi_tl(TCG_COND_LT, t2, 0, l_c_hi_lt); - tcg_gen_brcondi_tl(TCG_COND_GT, t2, 0, l_c_hi_gt); - tcg_gen_movi_tl(t4, 0); + tcg_gen_sextract_i32(t2, t1, 16, 16); + tcg_gen_brcondi_i32(TCG_COND_LT, t2, 0, l_c_hi_lt); + tcg_gen_brcondi_i32(TCG_COND_GT, t2, 0, l_c_hi_gt); + tcg_gen_movi_i32(t4, 0); tcg_gen_br(l_c_lo); gen_set_label(l_c_hi_lt); - tcg_gen_movi_tl(t4, 0xffff0000); + tcg_gen_movi_i32(t4, 0xffff0000); tcg_gen_br(l_c_lo); gen_set_label(l_c_hi_gt); - tcg_gen_movi_tl(t4, 0x00010000); + tcg_gen_movi_i32(t4, 0x00010000); =20 gen_set_label(l_c_lo); - tcg_gen_sextract_tl(t2, t1, 0, 16); - tcg_gen_brcondi_tl(TCG_COND_EQ, t2, 0, l_done); - tcg_gen_brcondi_tl(TCG_COND_LT, t2, 0, l_c_lo_lt); - tcg_gen_ori_tl(t4, t4, 0x00000001); + tcg_gen_sextract_i32(t2, t1, 0, 16); + tcg_gen_brcondi_i32(TCG_COND_EQ, t2, 0, l_done); + tcg_gen_brcondi_i32(TCG_COND_LT, t2, 0, l_c_lo_lt); + tcg_gen_ori_i32(t4, t4, 0x00000001); tcg_gen_br(l_done); gen_set_label(l_c_lo_lt); - tcg_gen_ori_tl(t4, t4, 0x0000ffff); + tcg_gen_ori_i32(t4, t4, 0x0000ffff); =20 gen_set_label(l_done); gen_store_mxu_gpr(t3, XRa); @@ -3991,62 +3991,62 @@ static void gen_mxu_s32sfl(DisasContext *ctx) XRa =3D extract32(ctx->opcode, 6, 4); ptn2 =3D extract32(ctx->opcode, 24, 2); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t0, XRb); gen_load_mxu_gpr(t1, XRc); =20 switch (ptn2) { case 0: - tcg_gen_andi_tl(t2, t0, 0xff000000); - tcg_gen_andi_tl(t3, t1, 0x000000ff); - tcg_gen_deposit_tl(t3, t3, t0, 8, 8); - tcg_gen_shri_tl(t0, t0, 8); - tcg_gen_shri_tl(t1, t1, 8); - tcg_gen_deposit_tl(t3, t3, t0, 24, 8); - tcg_gen_deposit_tl(t3, t3, t1, 16, 8); - tcg_gen_shri_tl(t0, t0, 8); - tcg_gen_shri_tl(t1, t1, 8); - tcg_gen_deposit_tl(t2, t2, t0, 8, 8); - tcg_gen_deposit_tl(t2, t2, t1, 0, 8); - tcg_gen_shri_tl(t1, t1, 8); - tcg_gen_deposit_tl(t2, t2, t1, 16, 8); + tcg_gen_andi_i32(t2, t0, 0xff000000); + tcg_gen_andi_i32(t3, t1, 0x000000ff); + tcg_gen_deposit_i32(t3, t3, t0, 8, 8); + tcg_gen_shri_i32(t0, t0, 8); + tcg_gen_shri_i32(t1, t1, 8); + tcg_gen_deposit_i32(t3, t3, t0, 24, 8); + tcg_gen_deposit_i32(t3, t3, t1, 16, 8); + tcg_gen_shri_i32(t0, t0, 8); + tcg_gen_shri_i32(t1, t1, 8); + tcg_gen_deposit_i32(t2, t2, t0, 8, 8); + tcg_gen_deposit_i32(t2, t2, t1, 0, 8); + tcg_gen_shri_i32(t1, t1, 8); + tcg_gen_deposit_i32(t2, t2, t1, 16, 8); break; case 1: - tcg_gen_andi_tl(t2, t0, 0xff000000); - tcg_gen_andi_tl(t3, t1, 0x000000ff); - tcg_gen_deposit_tl(t3, t3, t0, 16, 8); - tcg_gen_shri_tl(t0, t0, 8); - tcg_gen_shri_tl(t1, t1, 8); - tcg_gen_deposit_tl(t2, t2, t0, 16, 8); - tcg_gen_deposit_tl(t2, t2, t1, 0, 8); - tcg_gen_shri_tl(t0, t0, 8); - tcg_gen_shri_tl(t1, t1, 8); - tcg_gen_deposit_tl(t3, t3, t0, 24, 8); - tcg_gen_deposit_tl(t3, t3, t1, 8, 8); - tcg_gen_shri_tl(t1, t1, 8); - tcg_gen_deposit_tl(t2, t2, t1, 8, 8); + tcg_gen_andi_i32(t2, t0, 0xff000000); + tcg_gen_andi_i32(t3, t1, 0x000000ff); + tcg_gen_deposit_i32(t3, t3, t0, 16, 8); + tcg_gen_shri_i32(t0, t0, 8); + tcg_gen_shri_i32(t1, t1, 8); + tcg_gen_deposit_i32(t2, t2, t0, 16, 8); + tcg_gen_deposit_i32(t2, t2, t1, 0, 8); + tcg_gen_shri_i32(t0, t0, 8); + tcg_gen_shri_i32(t1, t1, 8); + tcg_gen_deposit_i32(t3, t3, t0, 24, 8); + tcg_gen_deposit_i32(t3, t3, t1, 8, 8); + tcg_gen_shri_i32(t1, t1, 8); + tcg_gen_deposit_i32(t2, t2, t1, 8, 8); break; case 2: - tcg_gen_andi_tl(t2, t0, 0xff00ff00); - tcg_gen_andi_tl(t3, t1, 0x00ff00ff); - tcg_gen_deposit_tl(t3, t3, t0, 8, 8); - tcg_gen_shri_tl(t0, t0, 16); - tcg_gen_shri_tl(t1, t1, 8); - tcg_gen_deposit_tl(t2, t2, t1, 0, 8); - tcg_gen_deposit_tl(t3, t3, t0, 24, 8); - tcg_gen_shri_tl(t1, t1, 16); - tcg_gen_deposit_tl(t2, t2, t1, 16, 8); + tcg_gen_andi_i32(t2, t0, 0xff00ff00); + tcg_gen_andi_i32(t3, t1, 0x00ff00ff); + tcg_gen_deposit_i32(t3, t3, t0, 8, 8); + tcg_gen_shri_i32(t0, t0, 16); + tcg_gen_shri_i32(t1, t1, 8); + tcg_gen_deposit_i32(t2, t2, t1, 0, 8); + tcg_gen_deposit_i32(t3, t3, t0, 24, 8); + tcg_gen_shri_i32(t1, t1, 16); + tcg_gen_deposit_i32(t2, t2, t1, 16, 8); break; case 3: - tcg_gen_andi_tl(t2, t0, 0xffff0000); - tcg_gen_andi_tl(t3, t1, 0x0000ffff); - tcg_gen_shri_tl(t1, t1, 16); - tcg_gen_deposit_tl(t2, t2, t1, 0, 16); - tcg_gen_deposit_tl(t3, t3, t0, 16, 16); + tcg_gen_andi_i32(t2, t0, 0xffff0000); + tcg_gen_andi_i32(t3, t1, 0x0000ffff); + tcg_gen_shri_i32(t1, t1, 16); + tcg_gen_deposit_i32(t2, t2, t1, 0, 16); + tcg_gen_deposit_i32(t3, t3, t0, 16, 16); break; } =20 @@ -4067,30 +4067,30 @@ static void gen_mxu_q8sad(DisasContext *ctx) XRb =3D extract32(ctx->opcode, 10, 4); XRa =3D extract32(ctx->opcode, 6, 4); =20 - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); - TCGv t4 =3D tcg_temp_new(); - TCGv t5 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); + TCGv_i32 t4 =3D tcg_temp_new_i32(); + TCGv_i32 t5 =3D tcg_temp_new_i32(); =20 gen_load_mxu_gpr(t2, XRb); gen_load_mxu_gpr(t3, XRc); gen_load_mxu_gpr(t5, XRd); - tcg_gen_movi_tl(t4, 0); + tcg_gen_movi_i32(t4, 0); =20 for (int i =3D 0; i < 4; i++) { - tcg_gen_andi_tl(t0, t2, 0xff); - tcg_gen_andi_tl(t1, t3, 0xff); - tcg_gen_sub_tl(t0, t0, t1); - tcg_gen_abs_tl(t0, t0); - tcg_gen_add_tl(t4, t4, t0); + tcg_gen_andi_i32(t0, t2, 0xff); + tcg_gen_andi_i32(t1, t3, 0xff); + tcg_gen_sub_i32(t0, t0, t1); + tcg_gen_abs_i32(t0, t0); + tcg_gen_add_i32(t4, t4, t0); if (i < 3) { - tcg_gen_shri_tl(t2, t2, 8); - tcg_gen_shri_tl(t3, t3, 8); + tcg_gen_shri_i32(t2, t2, 8); + tcg_gen_shri_i32(t3, t3, 8); } } - tcg_gen_add_tl(t5, t5, t4); + tcg_gen_add_i32(t5, t5, t4); gen_store_mxu_gpr(t4, XRa); gen_store_mxu_gpr(t5, XRd); } @@ -4196,8 +4196,8 @@ static void gen_mxu_S32ALNI(DisasContext *ctx) /* XRa */ /* */ =20 - TCGv_i32 t0 =3D tcg_temp_new(); - TCGv_i32 t1 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); =20 tcg_gen_andi_i32(t0, mxu_gpr[XRb - 1], 0x00FFFFFF); tcg_gen_shli_i32(t0, t0, 8); @@ -4219,8 +4219,8 @@ static void gen_mxu_S32ALNI(DisasContext *ctx) /* XRa */ /* */ =20 - TCGv_i32 t0 =3D tcg_temp_new(); - TCGv_i32 t1 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); =20 tcg_gen_andi_i32(t0, mxu_gpr[XRb - 1], 0x0000FFFF); tcg_gen_shli_i32(t0, t0, 16); @@ -4242,8 +4242,8 @@ static void gen_mxu_S32ALNI(DisasContext *ctx) /* XRa */ /* */ =20 - TCGv_i32 t0 =3D tcg_temp_new(); - TCGv_i32 t1 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); =20 tcg_gen_andi_i32(t0, mxu_gpr[XRb - 1], 0x000000FF); tcg_gen_shli_i32(t0, t0, 24); @@ -4290,13 +4290,13 @@ static void gen_mxu_S32ALN(DisasContext *ctx) /* destination is zero register -> do nothing */ } else if (unlikely((XRb =3D=3D 0) && (XRc =3D=3D 0))) { /* both operands zero registers -> just set destination to all 0s = */ - tcg_gen_movi_tl(mxu_gpr[XRa - 1], 0); + tcg_gen_movi_i32(mxu_gpr[XRa - 1], 0); } else { /* the most general case */ - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); - TCGv t2 =3D tcg_temp_new(); - TCGv t3 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); + TCGv_i32 t2 =3D tcg_temp_new_i32(); + TCGv_i32 t3 =3D tcg_temp_new_i32(); TCGLabel *l_exit =3D gen_new_label(); TCGLabel *l_b_only =3D gen_new_label(); TCGLabel *l_c_only =3D gen_new_label(); @@ -4304,20 +4304,20 @@ static void gen_mxu_S32ALN(DisasContext *ctx) gen_load_mxu_gpr(t0, XRb); gen_load_mxu_gpr(t1, XRc); gen_load_gpr(t2, rs); - tcg_gen_andi_tl(t2, t2, 0x07); + tcg_gen_andi_i32(t2, t2, 0x07); =20 /* do nothing for undefined cases */ - tcg_gen_brcondi_tl(TCG_COND_GE, t2, 5, l_exit); + tcg_gen_brcondi_i32(TCG_COND_GE, t2, 5, l_exit); =20 - tcg_gen_brcondi_tl(TCG_COND_EQ, t2, 0, l_b_only); - tcg_gen_brcondi_tl(TCG_COND_EQ, t2, 4, l_c_only); + tcg_gen_brcondi_i32(TCG_COND_EQ, t2, 0, l_b_only); + tcg_gen_brcondi_i32(TCG_COND_EQ, t2, 4, l_c_only); =20 - tcg_gen_shli_tl(t2, t2, 3); - tcg_gen_subfi_tl(t3, 32, t2); + tcg_gen_shli_i32(t2, t2, 3); + tcg_gen_subfi_i32(t3, 32, t2); =20 - tcg_gen_shl_tl(t0, t0, t2); - tcg_gen_shr_tl(t1, t1, t3); - tcg_gen_or_tl(mxu_gpr[XRa - 1], t0, t1); + tcg_gen_shl_i32(t0, t0, t2); + tcg_gen_shr_i32(t1, t1, t3); + tcg_gen_or_i32(mxu_gpr[XRa - 1], t0, t1); tcg_gen_br(l_exit); =20 gen_set_label(l_b_only); @@ -4359,8 +4359,8 @@ static void gen_mxu_s32madd_sub(DisasContext *ctx, bo= ol sub, bool uns) } else if (unlikely(XRa =3D=3D 0 && XRd =3D=3D 0)) { /* do nothing because result just dropped */ } else { - TCGv t0 =3D tcg_temp_new(); - TCGv t1 =3D tcg_temp_new(); + TCGv_i32 t0 =3D tcg_temp_new_i32(); + TCGv_i32 t1 =3D tcg_temp_new_i32(); TCGv_i64 t2 =3D tcg_temp_new_i64(); TCGv_i64 t3 =3D tcg_temp_new_i64(); =20 @@ -4368,18 +4368,18 @@ static void gen_mxu_s32madd_sub(DisasContext *ctx, = bool sub, bool uns) gen_load_gpr(t1, Rc); =20 if (uns) { - tcg_gen_extu_tl_i64(t2, t0); - tcg_gen_extu_tl_i64(t3, t1); + tcg_gen_extu_i32_i64(t2, t0); + tcg_gen_extu_i32_i64(t3, t1); } else { - tcg_gen_ext_tl_i64(t2, t0); - tcg_gen_ext_tl_i64(t3, t1); + tcg_gen_ext_i32_i64(t2, t0); + tcg_gen_ext_i32_i64(t3, t1); } tcg_gen_mul_i64(t2, t2, t3); =20 gen_load_mxu_gpr(t0, XRa); gen_load_mxu_gpr(t1, XRd); =20 - tcg_gen_concat_tl_i64(t3, t1, t0); + tcg_gen_concat_i32_i64(t3, t1, t0); if (sub) { tcg_gen_sub_i64(t3, t3, t2); } else { @@ -4388,8 +4388,8 @@ static void gen_mxu_s32madd_sub(DisasContext *ctx, bo= ol sub, bool uns) gen_move_low32(t1, t3); gen_move_high32(t0, t3); =20 - tcg_gen_mov_tl(cpu_HI[0], t0); - tcg_gen_mov_tl(cpu_LO[0], t1); + tcg_gen_mov_i32(cpu_HI[0], t0); + tcg_gen_mov_i32(cpu_LO[0], t1); =20 gen_store_mxu_gpr(t1, XRd); gen_store_mxu_gpr(t0, XRa); @@ -4936,12 +4936,12 @@ bool decode_ase_mxu(DisasContext *ctx, uint32_t ins= n) } =20 { - TCGv t_mxu_cr =3D tcg_temp_new(); + TCGv_i32 t_mxu_cr =3D tcg_temp_new_i32(); TCGLabel *l_exit =3D gen_new_label(); =20 gen_load_mxu_cr(t_mxu_cr); - tcg_gen_andi_tl(t_mxu_cr, t_mxu_cr, MXU_CR_MXU_EN); - tcg_gen_brcondi_tl(TCG_COND_NE, t_mxu_cr, MXU_CR_MXU_EN, l_exit); + tcg_gen_andi_i32(t_mxu_cr, t_mxu_cr, MXU_CR_MXU_EN); + tcg_gen_brcondi_i32(TCG_COND_NE, t_mxu_cr, MXU_CR_MXU_EN, l_exit); =20 switch (opcode) { case OPC_MXU_S32MADD: --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076571; cv=none; d=zohomail.com; s=zohoarc; b=Sps5EGtKZkOV/b3dPXVx00Xjd+C086McK83Qtuzsi1fiye+UzFJv5S9BPpOIVvCBgrW16lqBtfmbZ7pYni6ya3IIaBeHTIjreZqaVnOm4o0qhPpwkTXIKvIWf5VOENsRnM8YujakFVuYDKtUJWQ8QWGMA2DLYMLpWPgXLu0QdWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076571; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=5H6M3QI6haiUuGnj8K05NXZuhEnZFAU6DI7IQxSyklk=; b=CbUH2ZkaJrnMoi0G19uSaS8s/xtjfNtO9bSzO/kSxjDuw+vA9IGX4awxTqsn55/duhGF/2nLv8HS/3XoZUd2zF099jN5FswGfmRvjxGb6fkqN7YizGV8I3HmURLPMlOHAU+ZeYmd0A5BCgw2Lg2qH50gwUfmz6hNgb2oOSoM+Cc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076571910229.96977440449962; Wed, 6 May 2026 07:09:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcsZ-0004RN-HY; Wed, 06 May 2026 10:05:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcrz-0002SE-Vf for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:00 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcrx-0001LA-Du for qemu-devel@nongnu.org; Wed, 06 May 2026 10:04:59 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-43d77f6092eso4074122f8f.2 for ; Wed, 06 May 2026 07:04:55 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45052a488d8sm12620606f8f.12.2026.05.06.07.04.51 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076293; x=1778681093; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5H6M3QI6haiUuGnj8K05NXZuhEnZFAU6DI7IQxSyklk=; b=ffxGRaCvEADj9fqGWKD1XvTx0WUHmrMactBg+pXSnKc0t5nhZN4PWTxZTZPOqQ9ty1 Z4SKaPrWcegZcl9qpNRInTusmTJsvFyjWYTyh/5FbLa43lLPLCxDGJ7lwTOIu/CVnJZ8 501XUqNtRz7AU36wjjlQS/ZMHdycvDBjH/ZH5jxnebLmuzVUrtjLRv7g6THFovCfQ+sQ qDhV/RWFpxl7oYiQYfoEwlRjel+LdSzl4XmdhQiciowJ+hihafw1zF/Inj88nx+CjWnm DCV1sCre+SGhbBjQ2pKeyxmdkZ3E266HV/G/VjFn/bgSJT2l7rK2hmLwxc3tpndTZxAE vrjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076293; x=1778681093; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=5H6M3QI6haiUuGnj8K05NXZuhEnZFAU6DI7IQxSyklk=; b=QKBedteCygfX5x7k+DXL01cYXwYorslEziTevkwYK89HhPNWKBR7uDOyx0RBHTyZKi Xkq3nvT1Y449309JJgf2/jxeTRZMr4Z18HmEuDg9ZpTfANmuK1CeBaNG1jOuJ545tfMv 23BHFPXFcmCkz/nkQjVz5YMDWaSg3JUf5IY9ktcK3r8vlNnl1o4TwlTahV6sjv0xrHDR Aim0LFKTbtlJ//ZhjGHYCi/zPnUHlR9Hkb5bHlkoUcPj+eBk3wULvCYXG37VtOZaIyOz GmarSwO4RrQNILDMOq8u8dd6PS+UuNfRZ/7ghD4M+mFv3oIlT+t5qd+NKBb5zg7MfJ6c eUAw== X-Gm-Message-State: AOJu0YyL/jVSRg5ng0Hu6Gm6IptGE9tKdy1g4f80SyEsr5NcdUqn0/UM 7KvyM9EkW65w9aci6Pn3gPUN2K0/GuUktTmiwfIcZtHMzKZZzUOjpT3twfkEUuazO8J54UZ6oJn CJwDgYOI= X-Gm-Gg: AeBDieuwKgBtHC+CkZccz5rs4bdWczJ5af4xp7a4UNrBTHTO3TY23yKj1HZgOv/Wr6k xWrY4DMmZzsonM4JB00J4+eHLJzQL5aHVErhCj4wis7W5Up3gX4nD3S2sS/Wn6sVeq5Mb/bqGKk 3qqQn63Lhhud6B1Ql/TLFpnjrubTHod5Yl9PZeE1LJJo5flC5CJPpqjlai0r3iZVccoANyeBWBw GBBC1JqZURq/40G53Bo0mg6/E4Sp6t3YVpzRiva5z2gkFz4XR2M9q8ou65x/j9K42wdX++s1OWy jo5J/AGGEc8x10kcfhouUV72/CiBtz4j/cak7yTVfcEr5yoRXpa0HqB9PEzstP8yMlv8KVpAFgR kkrWm3Kv2lwDdTH1Xhceo3l2Jhxl/Py8WcNWbJcJkqrgGDdDshxFyb1uWV1r5Cy422/EyT+/mEP t2/Uk5BNtShp67rACvfZ+PYbnoc6RwjaIw6sDAbCn5D9b2lVYMz36Q7N7KTghhJx5FsVacgfKzg 6M8RWtHwRQmlDFvvgPHNg== X-Received: by 2002:a05:6000:4010:b0:441:1fa5:457c with SMTP id ffacd0b85a97d-4515a6c2a13mr6227876f8f.5.1778076293288; Wed, 06 May 2026 07:04:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 072/110] target/mips: Expand TCGv type for 64-bit extensions Date: Wed, 6 May 2026 15:54:44 +0200 Message-ID: <20260506135524.20617-73-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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: 1778076573604158500 These TX79, Octeon and Loongarch extensions are only built as 64-bit, so TCGv expands to TCGv_i64. Use the latter which is more explicit. Mechanical changes. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260401144503.80510-3-philmd@linaro.org> --- target/mips/tcg/lcsr_translate.c | 16 +++--- target/mips/tcg/loong_translate.c | 92 +++++++++++++++--------------- target/mips/tcg/octeon_translate.c | 60 +++++++++---------- target/mips/tcg/tx79_translate.c | 14 ++--- 4 files changed, 91 insertions(+), 91 deletions(-) diff --git a/target/mips/tcg/lcsr_translate.c b/target/mips/tcg/lcsr_transl= ate.c index 352b0f43282..128c17a9181 100644 --- a/target/mips/tcg/lcsr_translate.c +++ b/target/mips/tcg/lcsr_translate.c @@ -18,8 +18,8 @@ =20 static bool trans_CPUCFG(DisasContext *ctx, arg_CPUCFG *a) { - TCGv dest =3D tcg_temp_new(); - TCGv src1 =3D tcg_temp_new(); + TCGv_i64 dest =3D tcg_temp_new_i64(); + TCGv_i64 src1 =3D tcg_temp_new_i64(); =20 gen_load_gpr(src1, a->rs); gen_helper_lcsr_cpucfg(dest, tcg_env, src1); @@ -30,10 +30,10 @@ static bool trans_CPUCFG(DisasContext *ctx, arg_CPUCFG = *a) =20 #ifndef CONFIG_USER_ONLY static bool gen_rdcsr(DisasContext *ctx, arg_r *a, - void (*func)(TCGv, TCGv_ptr, TCGv)) + void (*func)(TCGv_i64, TCGv_ptr, TCGv_i64)) { - TCGv dest =3D tcg_temp_new(); - TCGv src1 =3D tcg_temp_new(); + TCGv_i64 dest =3D tcg_temp_new_i64(); + TCGv_i64 src1 =3D tcg_temp_new_i64(); =20 check_cp0_enabled(ctx); gen_load_gpr(src1, a->rs); @@ -44,10 +44,10 @@ static bool gen_rdcsr(DisasContext *ctx, arg_r *a, } =20 static bool gen_wrcsr(DisasContext *ctx, arg_r *a, - void (*func)(TCGv_ptr, TCGv, TCGv)) + void (*func)(TCGv_ptr, TCGv_i64, TCGv_i64)) { - TCGv val =3D tcg_temp_new(); - TCGv addr =3D tcg_temp_new(); + TCGv_i64 val =3D tcg_temp_new_i64(); + TCGv_i64 addr =3D tcg_temp_new_i64(); =20 check_cp0_enabled(ctx); gen_load_gpr(addr, a->rs); diff --git a/target/mips/tcg/loong_translate.c b/target/mips/tcg/loong_tran= slate.c index 7d74cc34f8a..797e3b5f721 100644 --- a/target/mips/tcg/loong_translate.c +++ b/target/mips/tcg/loong_translate.c @@ -28,7 +28,7 @@ static bool gen_lext_DIV_G(DisasContext *s, int rd, int rs, int rt, bool is_double) { - TCGv t0, t1; + TCGv_i64 t0, t1; TCGLabel *l1, *l2, *l3; =20 if (rd =3D=3D 0) { @@ -36,8 +36,8 @@ static bool gen_lext_DIV_G(DisasContext *s, int rd, int r= s, int rt, return true; } =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); + t1 =3D tcg_temp_new_i64(); l1 =3D gen_new_label(); l2 =3D gen_new_label(); l3 =3D gen_new_label(); @@ -46,23 +46,23 @@ static bool gen_lext_DIV_G(DisasContext *s, int rd, int= rs, int rt, gen_load_gpr(t1, rt); =20 if (!is_double) { - tcg_gen_ext32s_tl(t0, t0); - tcg_gen_ext32s_tl(t1, t1); + tcg_gen_ext32s_i64(t0, t0); + tcg_gen_ext32s_i64(t1, t1); } - tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); + tcg_gen_brcondi_i64(TCG_COND_NE, t1, 0, l1); + tcg_gen_movi_i64(cpu_gpr[rd], 0); tcg_gen_br(l3); gen_set_label(l1); =20 - tcg_gen_brcondi_tl(TCG_COND_NE, t0, is_double ? LLONG_MIN : INT_MIN, l= 2); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, -1LL, l2); - tcg_gen_mov_tl(cpu_gpr[rd], t0); + tcg_gen_brcondi_i64(TCG_COND_NE, t0, is_double ? LLONG_MIN : INT_MIN, = l2); + tcg_gen_brcondi_i64(TCG_COND_NE, t1, -1LL, l2); + tcg_gen_mov_i64(cpu_gpr[rd], t0); =20 tcg_gen_br(l3); gen_set_label(l2); - tcg_gen_div_tl(cpu_gpr[rd], t0, t1); + tcg_gen_div_i64(cpu_gpr[rd], t0, t1); if (!is_double) { - tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); + tcg_gen_ext32s_i64(cpu_gpr[rd], cpu_gpr[rd]); } gen_set_label(l3); =20 @@ -82,7 +82,7 @@ static bool trans_DDIV_G(DisasContext *s, arg_muldiv *a) static bool gen_lext_DIVU_G(DisasContext *s, int rd, int rs, int rt, bool is_double) { - TCGv t0, t1; + TCGv_i64 t0, t1; TCGLabel *l1, *l2; =20 if (rd =3D=3D 0) { @@ -90,8 +90,8 @@ static bool gen_lext_DIVU_G(DisasContext *s, int rd, int = rs, int rt, return true; } =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); + t1 =3D tcg_temp_new_i64(); l1 =3D gen_new_label(); l2 =3D gen_new_label(); =20 @@ -99,17 +99,17 @@ static bool gen_lext_DIVU_G(DisasContext *s, int rd, in= t rs, int rt, gen_load_gpr(t1, rt); =20 if (!is_double) { - tcg_gen_ext32u_tl(t0, t0); - tcg_gen_ext32u_tl(t1, t1); + tcg_gen_ext32u_i64(t0, t0); + tcg_gen_ext32u_i64(t1, t1); } - tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); + tcg_gen_brcondi_i64(TCG_COND_NE, t1, 0, l1); + tcg_gen_movi_i64(cpu_gpr[rd], 0); =20 tcg_gen_br(l2); gen_set_label(l1); - tcg_gen_divu_tl(cpu_gpr[rd], t0, t1); + tcg_gen_divu_i64(cpu_gpr[rd], t0, t1); if (!is_double) { - tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); + tcg_gen_ext32s_i64(cpu_gpr[rd], cpu_gpr[rd]); } gen_set_label(l2); =20 @@ -129,7 +129,7 @@ static bool trans_DDIVU_G(DisasContext *s, arg_muldiv *= a) static bool gen_lext_MOD_G(DisasContext *s, int rd, int rs, int rt, bool is_double) { - TCGv t0, t1; + TCGv_i64 t0, t1; TCGLabel *l1, *l2, *l3; =20 if (rd =3D=3D 0) { @@ -137,8 +137,8 @@ static bool gen_lext_MOD_G(DisasContext *s, int rd, int= rs, int rt, return true; } =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); + t1 =3D tcg_temp_new_i64(); l1 =3D gen_new_label(); l2 =3D gen_new_label(); l3 =3D gen_new_label(); @@ -147,19 +147,19 @@ static bool gen_lext_MOD_G(DisasContext *s, int rd, i= nt rs, int rt, gen_load_gpr(t1, rt); =20 if (!is_double) { - tcg_gen_ext32u_tl(t0, t0); - tcg_gen_ext32u_tl(t1, t1); + tcg_gen_ext32u_i64(t0, t0); + tcg_gen_ext32u_i64(t1, t1); } - tcg_gen_brcondi_tl(TCG_COND_EQ, t1, 0, l1); - tcg_gen_brcondi_tl(TCG_COND_NE, t0, is_double ? LLONG_MIN : INT_MIN, l= 2); - tcg_gen_brcondi_tl(TCG_COND_NE, t1, -1LL, l2); + tcg_gen_brcondi_i64(TCG_COND_EQ, t1, 0, l1); + tcg_gen_brcondi_i64(TCG_COND_NE, t0, is_double ? LLONG_MIN : INT_MIN, = l2); + tcg_gen_brcondi_i64(TCG_COND_NE, t1, -1LL, l2); gen_set_label(l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); + tcg_gen_movi_i64(cpu_gpr[rd], 0); tcg_gen_br(l3); gen_set_label(l2); - tcg_gen_rem_tl(cpu_gpr[rd], t0, t1); + tcg_gen_rem_i64(cpu_gpr[rd], t0, t1); if (!is_double) { - tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); + tcg_gen_ext32s_i64(cpu_gpr[rd], cpu_gpr[rd]); } gen_set_label(l3); =20 @@ -179,7 +179,7 @@ static bool trans_DMOD_G(DisasContext *s, arg_muldiv *a) static bool gen_lext_MODU_G(DisasContext *s, int rd, int rs, int rt, bool is_double) { - TCGv t0, t1; + TCGv_i64 t0, t1; TCGLabel *l1, *l2; =20 if (rd =3D=3D 0) { @@ -187,8 +187,8 @@ static bool gen_lext_MODU_G(DisasContext *s, int rd, in= t rs, int rt, return true; } =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); + t1 =3D tcg_temp_new_i64(); l1 =3D gen_new_label(); l2 =3D gen_new_label(); =20 @@ -196,16 +196,16 @@ static bool gen_lext_MODU_G(DisasContext *s, int rd, = int rs, int rt, gen_load_gpr(t1, rt); =20 if (!is_double) { - tcg_gen_ext32u_tl(t0, t0); - tcg_gen_ext32u_tl(t1, t1); + tcg_gen_ext32u_i64(t0, t0); + tcg_gen_ext32u_i64(t1, t1); } - tcg_gen_brcondi_tl(TCG_COND_NE, t1, 0, l1); - tcg_gen_movi_tl(cpu_gpr[rd], 0); + tcg_gen_brcondi_i64(TCG_COND_NE, t1, 0, l1); + tcg_gen_movi_i64(cpu_gpr[rd], 0); tcg_gen_br(l2); gen_set_label(l1); - tcg_gen_remu_tl(cpu_gpr[rd], t0, t1); + tcg_gen_remu_i64(cpu_gpr[rd], t0, t1); if (!is_double) { - tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); + tcg_gen_ext32s_i64(cpu_gpr[rd], cpu_gpr[rd]); } gen_set_label(l2); =20 @@ -225,22 +225,22 @@ static bool trans_DMODU_G(DisasContext *s, arg_muldiv= *a) static bool gen_lext_MULT_G(DisasContext *s, int rd, int rs, int rt, bool is_double) { - TCGv t0, t1; + TCGv_i64 t0, t1; =20 if (rd =3D=3D 0) { /* Treat as NOP. */ return true; } =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); + t1 =3D tcg_temp_new_i64(); =20 gen_load_gpr(t0, rs); gen_load_gpr(t1, rt); =20 - tcg_gen_mul_tl(cpu_gpr[rd], t0, t1); + tcg_gen_mul_i64(cpu_gpr[rd], t0, t1); if (!is_double) { - tcg_gen_ext32s_tl(cpu_gpr[rd], cpu_gpr[rd]); + tcg_gen_ext32s_i64(cpu_gpr[rd], cpu_gpr[rd]); } =20 return true; diff --git a/target/mips/tcg/octeon_translate.c b/target/mips/tcg/octeon_tr= anslate.c index b2eca29e06c..e1f52d444aa 100644 --- a/target/mips/tcg/octeon_translate.c +++ b/target/mips/tcg/octeon_translate.c @@ -15,7 +15,7 @@ =20 static bool trans_BBIT(DisasContext *ctx, arg_BBIT *a) { - TCGv p; + TCGv_i64 p; =20 if (ctx->hflags & MIPS_HFLAG_BMASK) { LOG_DISAS("Branch in delay / forbidden slot at PC 0x%" VADDR_PRIx = "\n", @@ -25,14 +25,14 @@ static bool trans_BBIT(DisasContext *ctx, arg_BBIT *a) } =20 /* Load needed operands */ - TCGv t0 =3D tcg_temp_new(); + TCGv_i64 t0 =3D tcg_temp_new_i64(); gen_load_gpr(t0, a->rs); =20 - p =3D tcg_constant_tl(1ULL << a->p); + p =3D tcg_constant_i64(1ULL << a->p); if (a->set) { - tcg_gen_and_tl(bcond, p, t0); + tcg_gen_and_i64(bcond, p, t0); } else { - tcg_gen_andc_tl(bcond, p, t0); + tcg_gen_andc_i64(bcond, p, t0); } =20 ctx->hflags |=3D MIPS_HFLAG_BC; @@ -43,34 +43,34 @@ static bool trans_BBIT(DisasContext *ctx, arg_BBIT *a) =20 static bool trans_BADDU(DisasContext *ctx, arg_BADDU *a) { - TCGv t0, t1; + TCGv_i64 t0, t1; =20 if (a->rt =3D=3D 0) { /* nop */ return true; } =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); + t1 =3D tcg_temp_new_i64(); gen_load_gpr(t0, a->rs); gen_load_gpr(t1, a->rt); =20 - tcg_gen_add_tl(t0, t0, t1); + tcg_gen_add_i64(t0, t0, t1); tcg_gen_andi_i64(cpu_gpr[a->rd], t0, 0xff); return true; } =20 static bool trans_DMUL(DisasContext *ctx, arg_DMUL *a) { - TCGv t0, t1; + TCGv_i64 t0, t1; =20 if (a->rt =3D=3D 0) { /* nop */ return true; } =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); + t1 =3D tcg_temp_new_i64(); gen_load_gpr(t0, a->rs); gen_load_gpr(t1, a->rt); =20 @@ -80,97 +80,97 @@ static bool trans_DMUL(DisasContext *ctx, arg_DMUL *a) =20 static bool trans_EXTS(DisasContext *ctx, arg_EXTS *a) { - TCGv t0; + TCGv_i64 t0; =20 if (a->rt =3D=3D 0) { /* nop */ return true; } =20 - t0 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); gen_load_gpr(t0, a->rs); - tcg_gen_sextract_tl(t0, t0, a->p, a->lenm1 + 1); + tcg_gen_sextract_i64(t0, t0, a->p, a->lenm1 + 1); gen_store_gpr(t0, a->rt); return true; } =20 static bool trans_CINS(DisasContext *ctx, arg_CINS *a) { - TCGv t0; + TCGv_i64 t0; =20 if (a->rt =3D=3D 0) { /* nop */ return true; } =20 - t0 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); gen_load_gpr(t0, a->rs); - tcg_gen_deposit_z_tl(t0, t0, a->p, a->lenm1 + 1); + tcg_gen_deposit_z_i64(t0, t0, a->p, a->lenm1 + 1); gen_store_gpr(t0, a->rt); return true; } =20 static bool trans_POP(DisasContext *ctx, arg_POP *a) { - TCGv t0; + TCGv_i64 t0; =20 if (a->rd =3D=3D 0) { /* nop */ return true; } =20 - t0 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); gen_load_gpr(t0, a->rs); if (!a->dw) { tcg_gen_andi_i64(t0, t0, 0xffffffff); } - tcg_gen_ctpop_tl(t0, t0); + tcg_gen_ctpop_i64(t0, t0); gen_store_gpr(t0, a->rd); return true; } =20 static bool trans_SEQNE(DisasContext *ctx, arg_SEQNE *a) { - TCGv t0, t1; + TCGv_i64 t0, t1; =20 if (a->rd =3D=3D 0) { /* nop */ return true; } =20 - t0 =3D tcg_temp_new(); - t1 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); + t1 =3D tcg_temp_new_i64(); =20 gen_load_gpr(t0, a->rs); gen_load_gpr(t1, a->rt); =20 if (a->ne) { - tcg_gen_setcond_tl(TCG_COND_NE, cpu_gpr[a->rd], t1, t0); + tcg_gen_setcond_i64(TCG_COND_NE, cpu_gpr[a->rd], t1, t0); } else { - tcg_gen_setcond_tl(TCG_COND_EQ, cpu_gpr[a->rd], t1, t0); + tcg_gen_setcond_i64(TCG_COND_EQ, cpu_gpr[a->rd], t1, t0); } return true; } =20 static bool trans_SEQNEI(DisasContext *ctx, arg_SEQNEI *a) { - TCGv t0; + TCGv_i64 t0; =20 if (a->rt =3D=3D 0) { /* nop */ return true; } =20 - t0 =3D tcg_temp_new(); + t0 =3D tcg_temp_new_i64(); =20 gen_load_gpr(t0, a->rs); =20 /* Sign-extend to 64 bit value */ target_ulong imm =3D a->imm; if (a->ne) { - tcg_gen_setcondi_tl(TCG_COND_NE, cpu_gpr[a->rt], t0, imm); + tcg_gen_setcondi_i64(TCG_COND_NE, cpu_gpr[a->rt], t0, imm); } else { - tcg_gen_setcondi_tl(TCG_COND_EQ, cpu_gpr[a->rt], t0, imm); + tcg_gen_setcondi_i64(TCG_COND_EQ, cpu_gpr[a->rt], t0, imm); } return true; } diff --git a/target/mips/tcg/tx79_translate.c b/target/mips/tcg/tx79_transl= ate.c index ae3f5e19c43..e071c867631 100644 --- a/target/mips/tcg/tx79_translate.c +++ b/target/mips/tcg/tx79_translate.c @@ -241,8 +241,8 @@ static bool trans_parallel_compare(DisasContext *ctx, a= rg_r *a, return true; } =20 - c0 =3D tcg_constant_tl(0); - c1 =3D tcg_constant_tl(0xffffffff); + c0 =3D tcg_constant_i64(0); + c1 =3D tcg_constant_i64(0xffffffff); ax =3D tcg_temp_new_i64(); bx =3D tcg_temp_new_i64(); t0 =3D tcg_temp_new_i64(); @@ -322,7 +322,7 @@ static bool trans_PCEQW(DisasContext *ctx, arg_r *a) static bool trans_LQ(DisasContext *ctx, arg_i *a) { TCGv_i64 t0; - TCGv addr; + TCGv_i64 addr; =20 if (a->rt =3D=3D 0) { /* nop */ @@ -330,14 +330,14 @@ static bool trans_LQ(DisasContext *ctx, arg_i *a) } =20 t0 =3D tcg_temp_new_i64(); - addr =3D tcg_temp_new(); + addr =3D tcg_temp_new_i64(); =20 gen_base_offset_addr(ctx, addr, a->base, a->offset); /* * Clear least-significant four bits of the effective * address, effectively creating an aligned address. */ - tcg_gen_andi_tl(addr, addr, ~0xf); + tcg_gen_andi_i64(addr, addr, ~0xf); =20 /* Lower half */ tcg_gen_qemu_ld_i64(t0, addr, ctx->mem_idx, mo_endian(ctx) | MO_UQ); @@ -353,14 +353,14 @@ static bool trans_LQ(DisasContext *ctx, arg_i *a) static bool trans_SQ(DisasContext *ctx, arg_i *a) { TCGv_i64 t0 =3D tcg_temp_new_i64(); - TCGv addr =3D tcg_temp_new(); + TCGv_i64 addr =3D tcg_temp_new_i64(); =20 gen_base_offset_addr(ctx, addr, a->base, a->offset); /* * Clear least-significant four bits of the effective * address, effectively creating an aligned address. */ - tcg_gen_andi_tl(addr, addr, ~0xf); + tcg_gen_andi_i64(addr, addr, ~0xf); =20 /* Lower half */ gen_load_gpr(t0, a->rt); --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076570; cv=none; d=zohomail.com; s=zohoarc; b=JdrQX+eGKYxYz1Rrnk3N8psttm7A1rsGidmUN0mTnTHeujs0CDXab5zM0KMB370xH2fPyYAiA9dMBSBthm5PnG4b9ySuv2E9pqbkONbiFO7fKsDTb3udRfKByolpHehRU8geQu2rkxkCqfowavBxjHfKZLa1u+/0sFmE5TAKkQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076570; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Tvq+099Ewmsxo5/FLHJHRAl7PF0Oc4kiXLP6AKah8Jw=; b=MIIa2Xyx4RdFjuH+8NQZ/ZAgTQMY8YLeqiwv2RQDRQU6X6e3wJFY+qujpuCXhH+J1w8tU9L5VdRz+5AZj8Mo/6XmzOrdALpkaqW8T57IueTBjdENDTj7gd7SIaviX5TBbLOTnV8a61AMLTxcSY5nzXsoz0BAn2tRSq+SaUS0VBs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076570939245.46311984538704; Wed, 6 May 2026 07:09:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcsV-00043F-23; Wed, 06 May 2026 10:05:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcs5-0002wE-Pd for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:06 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcs3-0001Mn-Sw for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:05 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-488a14c31eeso48843405e9.0 for ; Wed, 06 May 2026 07:05:03 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538fb19csm47117065e9.11.2026.05.06.07.04.59 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076301; x=1778681101; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Tvq+099Ewmsxo5/FLHJHRAl7PF0Oc4kiXLP6AKah8Jw=; b=QGVacd4b4tyx5zXgAEfVie6HksNNZ4MvTU33hhg8GmqcTorvRpO2d55rqFZyI0dbuo jo0Ytcd+t7LeBheS4y+wiUIsFW2WJMdA82d/nkopb/apPINty3ElcQIvQ5aPdMaZVjOM mXxuBUlLhLwHDOqAdouqvPLR8UyPeT1JN/B5zAdQmdzcmUN+EXzXGtGxdHE37FuuP6pT qtIvxvo41RYRoTvFbhLsdM9TpuSRUJQVOqIOFuQU0F13BLe/FSLxgONarHXMny5AT1RU HEjooWlKvC5Vv7Wy66vMBxcsabE3aTfxTZvIlE2Hxp16389+xMAH1KkZyXvfETZIpuL7 sCKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076301; x=1778681101; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Tvq+099Ewmsxo5/FLHJHRAl7PF0Oc4kiXLP6AKah8Jw=; b=oTGwPEhBh6uQDZNZT/Uq6pnaYfYErnQLeab/Z7gQs6w1HvzRthWuJwvdGeKJMfm624 MRyEB4RxLC3HnakohUBmQdUZBQ4/6qHqhiBN7W3UyS8SX3jZdJvZQNnkndBzWX/FGWwx 3Z7W1XYFxE+IISPIWA3zzY80/DS8fjl8tM0JQUJFwsx4cIad763i3a2NyBWpZ5epb30r 9I+VeFLPp3/4cxPt/dqsmubPuK1l3myKEQ1SrCq13vRbH5DO5NWeoHaSFssWRXE6PL2C ygpiZMRXQpabBlm4cXLlqInpii2M4cLQSA0ATGjXL8FHHHsz/kvsIb0G3lQmoGN6bq4G 98iQ== X-Gm-Message-State: AOJu0Yw9WaZLKIuokUg+ktALAvRQ39kLxQvcpFeP3AWuh9gYm9xPYG7K ZBNMAnhxfiBLG1h6HzA7RFl5EY783IjvTAhRv1BJzv3qYSUuhzzj9m66jlILnCBmpyPb94wU5ha ApZ9YQBE= X-Gm-Gg: AeBDietOjxUXe+vfnGuuifaqjQxcwZ4R0VX+22Gc7RqV7gFzuAKSsFK+OnIIqHfHtiX AVQD/h6KhCGzmzSIcm51k89IdqTck7l+dei7cU0qGoDoJntNACfxGoZ46blKLMgoMVBHpElNAYp KvZUC6bjl9RmnmifCuBVt+VMB9d1Hk48FY0vR2ajC4xW/uQDHg2UeBvquNvohQE6vZtaWBpbesj RPOiQcOTDcZX7+szoKOpQIK/9RYY3aoV+2M8sL3sUpblZeRdHSjtBZahdNeV4rPODitSS2Z6dS3 cbA3Fi38wBO+ONE3FZNT7s1c9wWqNrUGC73cDgluWXjA5dFQcBd1FdsOH/QlxfoSJERfVMXMGXV +SF7Ka7UDJieB0ASbvruKUcZDNAjaIikLGTM7Vet4vVzM35N1ImxORRQi8u9v6CKJ2X76lHLsqD LFgzaPEd0dPKakWZ4X6sqSojESGxMjvC1dOYKWmN0NSpIxTZz039M0V/gKeOxHuPOzkIxK9VYY6 YAFja4rxk0= X-Received: by 2002:a05:600c:4256:b0:48e:51f8:eb39 with SMTP id 5b1f17b1804b1-48e51f8eb5amr35596455e9.28.1778076301020; Wed, 06 May 2026 07:05:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 073/110] target/mips: Pass MemOpIdx argument to Linked Load/Store helpers Date: Wed, 6 May 2026 15:54:45 +0200 Message-ID: <20260506135524.20617-74-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1778076572397154100 In preparation of using the MemOp content in the next commit (thus stopping ignoring it), pass it as MemOpIdx. The helper prototype declaration always took a TCGv_i32 as last argument, correct that. Rename the ignored 'mem_idx' argument on user emulation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260417042620.35329-2-philmd@linaro.org> --- target/mips/helper.h | 4 ++-- target/mips/tcg/ldst_helper.c | 5 ++++- target/mips/tcg/translate.c | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/target/mips/helper.h b/target/mips/helper.h index b6cd53c8538..e2b83a1d19d 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -10,9 +10,9 @@ DEF_HELPER_4(swl, void, env, tl, tl, int) DEF_HELPER_4(swr, void, env, tl, tl, int) =20 #ifndef CONFIG_USER_ONLY -DEF_HELPER_3(ll, tl, env, tl, int) +DEF_HELPER_3(ll, tl, env, tl, i32) #ifdef TARGET_MIPS64 -DEF_HELPER_3(lld, tl, env, tl, int) +DEF_HELPER_3(lld, tl, env, tl, i32) #endif #endif =20 diff --git a/target/mips/tcg/ldst_helper.c b/target/mips/tcg/ldst_helper.c index 537f3e87bc0..b36b12d87d6 100644 --- a/target/mips/tcg/ldst_helper.c +++ b/target/mips/tcg/ldst_helper.c @@ -30,8 +30,11 @@ #ifndef CONFIG_USER_ONLY =20 #define HELPER_LD_ATOMIC(name, insn, almask, do_cast) = \ -target_ulong helper_##name(CPUMIPSState *env, target_ulong arg, int mem_id= x) \ +target_ulong helper_##name(CPUMIPSState *env, target_ulong arg, = \ + uint32_t memop_idx) = \ { = \ + MemOpIdx oi =3D memop_idx; \ + unsigned mem_idx =3D get_mmuidx(oi); \ if (arg & almask) { = \ if (!(env->hflags & MIPS_HFLAG_DM)) { = \ env->CP0_BadVAddr =3D arg; = \ diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index e334cf98b78..ee6199875cf 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -1922,7 +1922,7 @@ FOP_CONDNS(s, FMT_S, 32, gen_store_fpr32(ctx, fp0, fd= )) /* load/store instructions. */ #ifdef CONFIG_USER_ONLY #define OP_LD_ATOMIC(insn, memop) = \ -static inline void op_ld_##insn(TCGv ret, TCGv arg1, int mem_idx, = \ +static inline void op_ld_##insn(TCGv ret, TCGv arg1, int mem_idx_ignored, = \ DisasContext *ctx) = \ { = \ TCGv t0 =3D tcg_temp_new(); = \ @@ -1932,11 +1932,12 @@ static inline void op_ld_##insn(TCGv ret, TCGv arg1= , int mem_idx, \ tcg_gen_st_tl(ret, tcg_env, offsetof(CPUMIPSState, llval)); = \ } #else -#define OP_LD_ATOMIC(insn, ignored_memop) = \ +#define OP_LD_ATOMIC(insn, memop) = \ static inline void op_ld_##insn(TCGv ret, TCGv arg1, int mem_idx, = \ DisasContext *ctx) = \ { = \ - gen_helper_##insn(ret, tcg_env, arg1, tcg_constant_i32(mem_idx)); = \ + MemOpIdx oi =3D make_memop_idx(memop, mem_idx); = \ + gen_helper_##insn(ret, tcg_env, arg1, tcg_constant_i32(oi)); = \ } #endif OP_LD_ATOMIC(ll, mo_endian(ctx) | MO_SL); --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076438; cv=none; d=zohomail.com; s=zohoarc; b=NKpR/LtOEag/1wDIEtYsC65k9grJTi8xwuv3fGvCFiKWktSlIYO3Cp3kriZWvjAp4SEoDktwBSKO1lPbpm/9s4MrNrTHPmrY+2RLLg87htu3JXFJzNgRrqqO4Cdzwf7G0aU7boZ+yAyr9U5oiUkguhchjUkflW19DHstbaatSFY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076438; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=UMTtObmWf9r4iW1RVL81w+CpGum6ZcXVBlqRYE3xnws=; b=LGUer5REIOet7zolyv81XPk8FBylEADv/eBxxZMbHRKe41kyXR3SfdRjPSg7MfOs6oUYoEKPKzeJRrp342bxJRWKBsE7gSxfT7k1WANWqDosrP8khSn1TB0yAd4Q1k4iaiQF9sWH/6IzsP16HW3cfnmUWGl/ZjDYPkRIvTztyqM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076438738813.3487352471141; Wed, 6 May 2026 07:07:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcsb-0004Vg-4w; Wed, 06 May 2026 10:05:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcsE-0003hd-7p for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:14 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcsC-0001bx-2c for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:13 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-43d73422431so6095287f8f.2 for ; Wed, 06 May 2026 07:05:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055f2203csm12943555f8f.37.2026.05.06.07.05.06 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076309; x=1778681109; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UMTtObmWf9r4iW1RVL81w+CpGum6ZcXVBlqRYE3xnws=; b=WX+2TPMk6dnWd3cYlHVnyhLWqvOHJREX8lFC1IN/vE7fR0H70e+SxfvTTk2ZVgmW3D a7p69oKbIBfpgfzZM0Bu9dH3IUG8abxev3/dxJSqa91v4iCCW7gswz+x/HsHYxpAZgM0 RTtaoz67wtbMJTOAE/yXJf36RtM7NDUw3QfIERK0H7wxyESFOVukpmB0/FgKB/9zcvR2 tf9QEBFPiaudbjyZaREnvfTh48mRqquqm3xekZE8uWOJx9ShLgS+FPOZtQCebg5E092T +AGibvUbfqW2Qwoa3Vr1XjB0jVeMQr/o2XzZXWZ3Rdep4fdq4LrooY/2vL6M0N9WI+WV j8vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076309; x=1778681109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=UMTtObmWf9r4iW1RVL81w+CpGum6ZcXVBlqRYE3xnws=; b=jVXj/+szUYeL7q0Pdk9lrkd45aLAecdw2kkGNpriV9TUIMfDdMYHqlN5eDlqdi7UK2 cAtEFq0dv0ONnmHH4ho/d4vksfEUWM3MZVQhnyd0UOrHvkVbXkXpZzdVXQJybeAm2/DN GAxV0V3nofZgTUzuF1KG1F7xO0m9TIAoegJX3Rxuigt+y1FMN9EzdUi6ePNLYQMOIi2M sQGsV6jym4ouS70xVQ59/fAIVoxdXi+kxPiFdjBaOYjjEYveNOaa6eDLdvg+IQosVEzt clDnv2WU2LBVj1rTxNbR7JkWPA26Ec99UuBvrcVU7sBAN9j1d9LHkRkQkh488wNnqiCY nvZQ== X-Gm-Message-State: AOJu0YyAVXOrWhsdjskB3vnh40n/bLN7P713ya8U9sN0O6jJO398k7X4 Uys/GRwUeaQLyTwXmEyWLm7G2OgUrGTpt1bLC2T9r+z78IUo2xJ1m70RLo6U/Oz6kr5C7k4Eqkp Ju3v/vOQ= X-Gm-Gg: AeBDietoh9FQ1sHEs9y7LOU1dyA5V0MEAjChf6mCPgFKiKhMcuEY91BosDLCx0FBoMh Cs7uEQQLDIsPF5nVw0iSDyORA41vJE+TooOBcR2wZ+HcCh6X0OuA57uYU+NMpEopxzQWqX4yFf7 bdsKY+hi1gum80LltdJ/PvX/zGadeE61B+L2k/07FEdjJXTGSekTYNbT5XfL3mbj3CaP3Im72Dd rNDAIarjyejn9AtSSgMribrb8ARHll09mXqRGgZpa95ixypLPzlTr1dp/nNg9hKcY86G36iq4xD /yVnQoWIhSe0y8mIdj1+PNOyb9rFzeeLooron9lp/nKuAFTImd98JbhmXZxDtT8CvUWwC/Jj05m bVUbwNkwOaBPCB9XfFuLhCx6EwkkEoot7krUVlXWMxQ5M56/lADOMTObI4JHR3PV5sQSIPO52xr QBgFOuWKbURAYWqyM5hFbJweqFjNoObqMBlrObHaLnwRHFOLNaJ0OkFGmdlDWzUWmO1XUmkYxe2 bTW05LvvdE= X-Received: by 2002:a05:6000:2386:b0:43d:6fb7:fedb with SMTP id ffacd0b85a97d-4515d99ddf3mr6133468f8f.36.1778076308521; Wed, 06 May 2026 07:05:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 074/110] target/mips: Inline cpu_ld/st_mmuidx_ra() calls in Atomic LD/ST helpers Date: Wed, 6 May 2026 15:54:46 +0200 Message-ID: <20260506135524.20617-75-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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: 1778076440003154100 Have callers set MO_ALIGN in the MemOp bits. Perform the access first, filling the TLB in the process. If the tlb cannot be filled, access is not permitted, and an exception is raised. Thus remove the now unnecessary do_raise_exception() call. Since the TLB is filled, use probe_access() to get CP0_LLAddr. Move env->CP0_LLAddr and env->lladdr assignments so we don't update them when an alignment fault occurs. Since we have a handy MemOpIdx, replace the legacy cpu_ld*_mmuidx_ra() calls by cpu_ld*_mmu() equivalent. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260417042620.35329-3-philmd@linaro.org> --- target/mips/tcg/ldst_helper.c | 26 +++++++++++++++----------- target/mips/tcg/translate.c | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/target/mips/tcg/ldst_helper.c b/target/mips/tcg/ldst_helper.c index b36b12d87d6..1b25466b496 100644 --- a/target/mips/tcg/ldst_helper.c +++ b/target/mips/tcg/ldst_helper.c @@ -28,23 +28,27 @@ #include "internal.h" =20 #ifndef CONFIG_USER_ONLY +#include "accel/tcg/probe.h" +#include "exec/tlb-flags.h" =20 #define HELPER_LD_ATOMIC(name, insn, almask, do_cast) = \ target_ulong helper_##name(CPUMIPSState *env, target_ulong arg, = \ uint32_t memop_idx) = \ { = \ - MemOpIdx oi =3D memop_idx; \ - unsigned mem_idx =3D get_mmuidx(oi); \ - if (arg & almask) { = \ - if (!(env->hflags & MIPS_HFLAG_DM)) { = \ - env->CP0_BadVAddr =3D arg; = \ - } = \ - do_raise_exception(env, EXCP_AdEL, GETPC()); = \ - } = \ - env->CP0_LLAddr =3D cpu_mips_translate_address(env, arg, MMU_DATA_LOAD= , \ - GETPC()); = \ + MemOpIdx oi =3D memop_idx; = \ + unsigned mem_idx =3D get_mmuidx(oi); = \ + unsigned size =3D memop_size(get_memop(oi)); = \ + uintptr_t ra =3D GETPC(); = \ + CPUTLBEntryFull *full; = \ + void *host_unused; = \ + int flags; = \ + = \ + env->llval =3D do_cast cpu_##insn##_mmu(env, arg, oi, ra); = \ + flags =3D probe_access_full(env, arg, size, MMU_DATA_LOAD, mem_idx, = \ + true, &host_unused, &full, ra); = \ + assert(!(flags & TLB_INVALID_MASK)); = \ + env->CP0_LLAddr =3D full->phys_addr; = \ env->lladdr =3D arg; = \ - env->llval =3D do_cast cpu_##insn##_mmuidx_ra(env, arg, mem_idx, GETPC= ()); \ return env->llval; = \ } HELPER_LD_ATOMIC(ll, ldl, 0x3, (target_long)(int32_t)) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index ee6199875cf..fff6390f5d4 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -1936,7 +1936,7 @@ static inline void op_ld_##insn(TCGv ret, TCGv arg1, = int mem_idx_ignored, \ static inline void op_ld_##insn(TCGv ret, TCGv arg1, int mem_idx, = \ DisasContext *ctx) = \ { = \ - MemOpIdx oi =3D make_memop_idx(memop, mem_idx); = \ + MemOpIdx oi =3D make_memop_idx(memop | MO_ALIGN, mem_idx); = \ gen_helper_##insn(ret, tcg_env, arg1, tcg_constant_i32(oi)); = \ } #endif --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076373; cv=none; d=zohomail.com; s=zohoarc; b=KRCQ1/nYeUyT1eQfmxyX3ogN8ht1aX5jJtwFUPQy4bnES/e4F1/+nWgrG+rT4WpUORqLAaPWtFa7r6HL9tFXu/NztW9Sj/dgLoyj/rs+LkSf7MIMITVehSDBCgj8LwmuIngaAMlsvSfs7P8CixhiNN86JM7xz24W9IcTxu0Fico= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076373; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=nPoouT4hN+v1hCR0z87gIclFS+UQS3pcQ1N1wJ6ZGJ8=; b=YwstzP2nHuCD4zNVvkZga1bz9PUh5EQMm7RGz9rhiNOnlVUrjIniV/AyuPT8iiWvUW0gT3aoR8L/2wXACWI48F099X023ODhVcerb4svK2+cv9ae9E/laomfw1kM3rHzjwKUZphECm0XJzdEb4LET+qEJLHEkk5q0eOIoG4+tgQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076373213882.7742370280364; Wed, 6 May 2026 07:06:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcss-0004oj-5N; Wed, 06 May 2026 10:05:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcsL-0004CV-Cq for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:27 -0400 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 1wKcsJ-0001eX-3R for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:21 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso62734285e9.2 for ; Wed, 06 May 2026 07:05:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538a5486sm52602525e9.6.2026.05.06.07.05.14 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:05:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076317; x=1778681117; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=nPoouT4hN+v1hCR0z87gIclFS+UQS3pcQ1N1wJ6ZGJ8=; b=WtGWF5vlOEQqvSI+s6woOee1vFX0q9hKNIz/IKynC3h1VS7kxVZT0CFozj93MS0kJK Q5N35oW782l2uPvgelaEmyq2EQ9gfqk76MvVaMmKnTpye+YqskierC95rzjKP+vW/0VK xO0dmLuYlVIHUnsrKDh0nFYn0p+fWLuKbYJfWeocaMyPSxMQ3C57hnY+mXq/JgbBawwY gzZSWSVFP2I/rJSd+Y7w3BPa+P6j6uqueWSDSHU3MnijcLerSlWq4P3zEtJ1BwjVDEf8 utwCiu5eIlYZ6ib+IqmacQJL9XeFNLmMSd6aDsG7rJy399qF97rwaTqWF4XC4KiignPP adNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076317; x=1778681117; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=nPoouT4hN+v1hCR0z87gIclFS+UQS3pcQ1N1wJ6ZGJ8=; b=HZR5HPccCw/kMu3S0Bqt9hnHB1OD8Vo7Yz+mt4UEAdzCSs8R7N8W/NwjMhv1uVBda0 4lOMIJt+4hTKby1e74W1e2J5ocoMoO2K6sTNGrRFL47v2Qn8owRZKz/++2+hSvmBJzMH FAX/G7e2URcngoRSbgW1YcGv73/qtEax71EMYRNlvVm3CMBhTDqLy1hx0xu4NXI+BgmM VLo4TyOIYBiL/90WsBUv+LXcc5nAsBZX+a+eTfozNm+YiHqaSbqegvPDoHi3wPKctuOb 7NJnVLsNf+W1m+TE2BZWDILjl/x0wYouoBuIe434GLqovqxFIphA90LP+NC0DEodmB3T /a7g== X-Gm-Message-State: AOJu0YwY1kHmmGhCIqXvIPxl3IQ8UXhSCrx9QXjpB40CpYHgPuJigS26 VL92QFCGjJ7hyG63BBOTG+6oOM9cjlJ/9Zb309YmGZwZXyyp41Fuqt0v5+46MhMLb7PkZsDRrzS OCxC0xGk= X-Gm-Gg: AeBDietN7I2vtgW2sA/xzdCUYuZc/0nmwJiMnx2Cb+rN4GrWlkRRuEPkIG4BVWQJZIb knxeK3fxXwYbtrngVDc+pYOpdU8dqvXGe1atq/0qU+lu1xGGUkhwDLJuj+F9eI+0zvbxcVSdqW2 3Jbha2NVKaFVAmwXu1gzN0M0uH5GKJVtZ+EEkOQbDBLBagAMBq0JVK1+IFF3u7QTT/6COt6Y6Ya U7P7LQSiIGboAv+aKcOETHZVKinQsXnqHW6UkgJl+2oSAtsDAVz22SPmj/Rm6oMPO4kXOUIuPTN KxTo2fB2A48YQVmv6Sq6wVjodLeS3n8+UxpiYWHreBQK3MfSHxVmblh5Kc1FYW0tEadhfwQAdgb GzoWAf9z398fjwzjmcmxuXRYym5zK2d+c+o9WKI52hdISRGi9EIWU8hCTzrz2sM+FoTA9tYV2GZ gotKC9SStRNXft72hZssGjVqppFrs391EgsyxyGnZMQQ9kussB6c+qluZmKxOOaACbUxxew4+Iv Ygs+TKaCoA= X-Received: by 2002:a05:600c:c082:b0:488:c40b:c8bf with SMTP id 5b1f17b1804b1-48e51e0971dmr47302655e9.2.1778076315997; Wed, 06 May 2026 07:05:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 075/110] target/mips: Inline translator_ld[uw,l,q]() calls Date: Wed, 6 May 2026 15:54:47 +0200 Message-ID: <20260506135524.20617-76-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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: 1778076374790154100 In preparation of removing the translator_ld[uw,l,q]() methods, inline them for the MIPS target, expanding MO_TE by a runtime check on mo_endian(ctx). Mechanical change using the following Coccinelle 'spatch' script: @@ expression env, db, pc; @@ ( - translator_lduw(env, db, pc) + translator_lduw_end(env, db, pc, mo_endian(ctx)) | - translator_ldl(env, db, pc) + translator_ldl_end(env, db, pc, mo_endian(ctx)) | - translator_ldq(env, db, pc) + translator_ldq_end(env, db, pc, mo_endian(ctx)) ) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260417042620.35329-4-philmd@linaro.org> --- target/mips/tcg/translate.c | 12 ++++++++---- target/mips/tcg/micromips_translate.c.inc | 2 +- target/mips/tcg/mips16e_translate.c.inc | 6 ++++-- target/mips/tcg/nanomips_translate.c.inc | 5 +++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index fff6390f5d4..54ed253a7d0 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -15149,17 +15149,21 @@ static void mips_tr_translate_insn(DisasContextBa= se *dcbase, CPUState *cs) =20 is_slot =3D ctx->hflags & MIPS_HFLAG_BMASK; if (ctx->insn_flags & ISA_NANOMIPS32) { - ctx->opcode =3D translator_lduw(env, &ctx->base, ctx->base.pc_next= ); + ctx->opcode =3D translator_lduw_end(env, &ctx->base, ctx->base.pc_= next, + mo_endian(ctx)); insn_bytes =3D decode_isa_nanomips(env, ctx); } else if (!(ctx->hflags & MIPS_HFLAG_M16)) { - ctx->opcode =3D translator_ldl(env, &ctx->base, ctx->base.pc_next); + ctx->opcode =3D translator_ldl_end(env, &ctx->base, ctx->base.pc_n= ext, + mo_endian(ctx)); insn_bytes =3D 4; decode_opc(env, ctx); } else if (ctx->insn_flags & ASE_MICROMIPS) { - ctx->opcode =3D translator_lduw(env, &ctx->base, ctx->base.pc_next= ); + ctx->opcode =3D translator_lduw_end(env, &ctx->base, ctx->base.pc_= next, + mo_endian(ctx)); insn_bytes =3D decode_isa_micromips(env, ctx); } else if (ctx->insn_flags & ASE_MIPS16) { - ctx->opcode =3D translator_lduw(env, &ctx->base, ctx->base.pc_next= ); + ctx->opcode =3D translator_lduw_end(env, &ctx->base, ctx->base.pc_= next, + mo_endian(ctx)); insn_bytes =3D decode_ase_mips16e(env, ctx); } else { gen_reserved_instruction(ctx); diff --git a/target/mips/tcg/micromips_translate.c.inc b/target/mips/tcg/mi= cromips_translate.c.inc index da2419792eb..07172a6c7fe 100644 --- a/target/mips/tcg/micromips_translate.c.inc +++ b/target/mips/tcg/micromips_translate.c.inc @@ -1629,7 +1629,7 @@ static void decode_micromips32_opc(CPUMIPSState *env,= DisasContext *ctx) uint32_t op, minor, minor2, mips32_op; uint32_t cond, fmt, cc; =20 - insn =3D translator_lduw(env, &ctx->base, ctx->base.pc_next + 2); + insn =3D translator_lduw_end(env, &ctx->base, ctx->base.pc_next + 2, m= o_endian(ctx)); ctx->opcode =3D (ctx->opcode << 16) | insn; =20 rt =3D (ctx->opcode >> 21) & 0x1f; diff --git a/target/mips/tcg/mips16e_translate.c.inc b/target/mips/tcg/mips= 16e_translate.c.inc index 97da3456ea5..beb5b04ea29 100644 --- a/target/mips/tcg/mips16e_translate.c.inc +++ b/target/mips/tcg/mips16e_translate.c.inc @@ -453,7 +453,8 @@ static void decode_i64_mips16(DisasContext *ctx, =20 static int decode_extended_mips16_opc(CPUMIPSState *env, DisasContext *ctx) { - int extend =3D translator_lduw(env, &ctx->base, ctx->base.pc_next + 2); + int extend =3D translator_lduw_end(env, &ctx->base, ctx->base.pc_next = + 2, + mo_endian(ctx)); int op, rx, ry, funct, sa; int16_t imm, offset; =20 @@ -686,7 +687,8 @@ static int decode_ase_mips16e(CPUMIPSState *env, DisasC= ontext *ctx) /* No delay slot, so just process as a normal instruction */ break; case M16_OPC_JAL: - offset =3D translator_lduw(env, &ctx->base, ctx->base.pc_next + 2); + offset =3D translator_lduw_end(env, &ctx->base, ctx->base.pc_next = + 2, + mo_endian(ctx)); offset =3D (((ctx->opcode & 0x1f) << 21) | ((ctx->opcode >> 5) & 0x1f) << 16 | offset) << 2; diff --git a/target/mips/tcg/nanomips_translate.c.inc b/target/mips/tcg/nan= omips_translate.c.inc index 9d4e0bee81f..4b0b01ba37a 100644 --- a/target/mips/tcg/nanomips_translate.c.inc +++ b/target/mips/tcg/nanomips_translate.c.inc @@ -3551,7 +3551,7 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *en= v, DisasContext *ctx) int offset; int imm; =20 - insn =3D translator_lduw(env, &ctx->base, ctx->base.pc_next + 2); + insn =3D translator_lduw_end(env, &ctx->base, ctx->base.pc_next + 2, m= o_endian(ctx)); ctx->opcode =3D (ctx->opcode << 16) | insn; =20 rt =3D extract32(ctx->opcode, 21, 5); @@ -3665,7 +3665,8 @@ static int decode_nanomips_32_48_opc(CPUMIPSState *en= v, DisasContext *ctx) break; case NM_P48I: { - insn =3D translator_lduw(env, &ctx->base, ctx->base.pc_next + = 4); + insn =3D translator_lduw_end(env, &ctx->base, ctx->base.pc_nex= t + 4, + mo_endian(ctx)); target_long addr_off =3D extract32(ctx->opcode, 0, 16) | insn = << 16; switch (extract32(ctx->opcode, 16, 5)) { case NM_LI48: --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076446; cv=none; d=zohomail.com; s=zohoarc; b=bBa1fP7JGQ7B6JZHAjCaG4nQebqvK9hO0yomZ1rXne/LOFQFRzLgtaDO3JYsKVkxPG7KylN3l7jVbDkRNR2ImtHoyPD3J3HGAMidM25nFWJ8cqVqBMPZ9Ww0PyxgfZwo1FR7x76GuG8MZ4/bG4m4/cZ2zHgfHGKoJRILs6e7cDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076446; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=ub397WlAj5cZllR/Tmzri5mPQ8B8Ii7hkS/oyqyErps=; b=Y4yvEIv0RDRcpldUY/ETIKx8pBbUgFitRy5AYFiyj/sZiYyATuoprPIMHkEnOK1UFiwW+Co7h1kmANVGDg1hdQ+7fkkigvG9z3CD3kBD/1f0+RjlfkbWtIm7Yr5pQ09ay2qY0mfanZxyenbHpY7v86KIQGggIuE6KAhMX0Ndg4E= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076446506788.6810566118272; Wed, 6 May 2026 07:07:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcsu-0004xr-Pr; Wed, 06 May 2026 10:05:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcsS-0004Ok-MP for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:34 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcsR-0001fd-49 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:28 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-488b150559bso44944585e9.1 for ; Wed, 06 May 2026 07:05:26 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538aca14sm46641165e9.7.2026.05.06.07.05.22 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076324; x=1778681124; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ub397WlAj5cZllR/Tmzri5mPQ8B8Ii7hkS/oyqyErps=; b=LKGau0UIMBb068uNt7HLFGEhN03QkfMEWWiu7dDEmtwlvcpnfGrRlAv27crK2OIUWg g6Bm7lSQEZLxPsSz/9fZneexbEXg3SxVAgmkI5jBlRzy/UoTa3WEGe7v5R/liGApkU1D 0lbH+LrDYCEzLxIarGsY/f4/Fjv5WyABULWU1MAtbRO6NWwEyualfw3msPv6LszbyS9J q6K77ckER5KleBE3J/52Cov2VvKbazrujXNel7RS2/8qmxcSvsZD1NANqWbmRlGzfx1Z /Ab8HHeNDSmLFTP8GuQURcVUsJl1nhvXNA8dHki4mTxdQjQmuvNPMMTMoycLXkt6I9aX dhdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076324; x=1778681124; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ub397WlAj5cZllR/Tmzri5mPQ8B8Ii7hkS/oyqyErps=; b=rJ6UBpp1teISBicTeQqPpjC+ylZwHZ35d/V8jNZgNVLiO+4uI5SlkOvxuFcLNFNZMR JyXaacqDTOAkeVLK92bYO6ocRTZ4cIG1Do53K6KyaYpxiw48oyDqCfvuzagwo1LMu5c5 EYMMmNlpKjr3BMOUqQHN3VQhLGI75MKC8NM6d/05XF/JONucN/KnmI3rNwxfDGuRQPDq fmeB0P0HAR362ZPKFDv3Y3MCN08uovg6CpqZwMn4SzwCTd6gxEHW5FbifxGSW6pEoVAw RMc/BXfAgducgcvhb6Ek24dCwdRhJ95MJRSUh+FcmXOv+6wz3zUlxyj3mx2IsdlaGisu 9b/Q== X-Gm-Message-State: AOJu0YxWg04tq5KqxDxzL9Nq79rjma6VclWHeaO+D8PL6Dm/ysJG+XXE xooHXG1cadgmdDa95i/1pVZRd/cP+mahv69oEHVuG2vG0Tcmwb0qUebge6CYByKm5SpulQU8Tpa +mwIt4ew= X-Gm-Gg: AeBDieuxGyV6pW0gVjoskZF8VnSw9uQJsd1e5ErxSvm2kkCtAB+JjMJ3mtiwkjSwJKB SIrDrW8U/PaReyVjmIXNXa+g3M7pXXePawKhzggHDL2IPAhAQPlrQL92h7cxID/NfCk+YPIqeS1 n/On2ViyracfKoGzbgXLkWAbWWd1JxsFufKmcCCVc7gmS0brw1mKVOYpfPdQATCm/SeTuafBYdN Hmev9FVn94lv7XEVn5ys+IMB8mIg8aqQmn2tGvnOO7dQ2yfFawDEoej5t5dtlGIrUvojnnhW1KW v58mB8yjOSug7rNa/NqTdkfSdy3xeqWJlcbmcD5Qytg46Zax/SRxNBBRfDD2cm48HVgTWmticr7 PZvM3XIGlAvNQstaOnWp8LQe8H0Pu4DId8BBlhf0PTG2oHIxamuAk3ymln00I3ynRltBsUK146L GT7Q4mR7E5VrbXYrkxsaekkAdiDRiFMUOYW5hhmw/KOvzeRtGPgyCo+ot2aEjHuSNcLG8/sLmJl 2P/BINkKJM= X-Received: by 2002:a05:600c:3e8d:b0:488:bc6a:528d with SMTP id 5b1f17b1804b1-48e51f40b12mr67329625e9.22.1778076324303; Wed, 06 May 2026 07:05:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 076/110] target/mips: Remove last MO_TE use Date: Wed, 6 May 2026 15:54:48 +0200 Message-ID: <20260506135524.20617-77-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1778076448201154100 Unfortunately commit 54821ff6e90 ("target/mips: Convert mips16e decr_and_load/store() macros to functions") got rebased on top of commit 2803e24694c ("target/mips: Replace MO_TE by mo_endian") and we missed the replacement. Fix that. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20260417042620.35329-5-philmd@linaro.org> --- target/mips/tcg/mips16e_translate.c.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/mips/tcg/mips16e_translate.c.inc b/target/mips/tcg/mips= 16e_translate.c.inc index beb5b04ea29..e83587971d4 100644 --- a/target/mips/tcg/mips16e_translate.c.inc +++ b/target/mips/tcg/mips16e_translate.c.inc @@ -293,7 +293,7 @@ static void decr_and_load(DisasContext *ctx, unsigned r= egidx, TCGv t0) =20 tcg_gen_movi_tl(t2, -4); gen_op_addr_add(ctx, t0, t0, t2); - tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, MO_TE | MO_SL | + tcg_gen_qemu_ld_tl(t1, t0, ctx->mem_idx, mo_endian(ctx) | MO_SL | ctx->default_tcg_memop_mask); gen_store_gpr(t1, regidx); } --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076704; cv=none; d=zohomail.com; s=zohoarc; b=eO/+InMyBOeLPjwKom2SCrpZ4KVkF1T7z4dpbsRmIkws7SNvl8GcHIg4j2YdnGdRxhSrNbIWNx1s2IxUdFVD6a+MvZ11JHPqGVhSM/k4wsi6668pwAxlZQjOVdu+9hTFYAVF2X23rgTA/w+/rnYCmzkjUslIoWYvEWaYRSiQNz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076704; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=qW84427DTcBCLrenghzAgnxBgq52ewVVKhGxkzWvkog=; b=Asf7xRtGY5YMZ1Pny2f7z838qM6+95x+4IGmyfd1qnp8cBFt8wsbL3F1J8FWAuEz3OdY0t4bVxhR7v2Ex+ToSmsJT/aw9cdyb4Wc0GDjlSqJPWJw9xVMI9D+HPXO/DM0rp4tUw5pO0Ud57QMqxqWOvSsR2daCEZk2fJSwSZSREM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17780767048181021.3524995334461; Wed, 6 May 2026 07:11:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKctJ-0005Zr-4N; Wed, 06 May 2026 10:06:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcsa-0004Yd-Iu for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:37 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcsY-0001gS-U8 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:36 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-44c4cc7c1cfso3164474f8f.0 for ; Wed, 06 May 2026 07:05:34 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e539109b7sm46156995e9.15.2026.05.06.07.05.30 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076332; x=1778681132; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qW84427DTcBCLrenghzAgnxBgq52ewVVKhGxkzWvkog=; b=OhKMzxyXru2CiMjTRsk1AiqolMKNoDpIKM8L8Qja2MtZC716GoS38qb56m3Zmyt+P1 t59ftKP97WHr20jUfLL1rtVF2TXElN9fJKFzaDfAvgXyltwIyitWfaTPQXHX2QbZizoI X/qfC+mfbX5lRgt5nj9voxFy8SP12coaQAXVWe78yxd8fa6CGjS9Lh0FFUWoRNAiBsOB Z6s/7zn+GMUKU+NnsTn1xDb5QW3frXtVqHfG3wtEjMBU08X5XJx7OVLDtLEqJyIMGUUp OcAAe33xmhrvojSRRkV4helIeTnw0/EOpbAhcNJJLTButQCQTPl6NebmodQiNI+RLbC4 GBug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076332; x=1778681132; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=qW84427DTcBCLrenghzAgnxBgq52ewVVKhGxkzWvkog=; b=N7G7ixjx0IwDEwM+XNVccelRIw2jR4suIP4fZzvOMtmu8dsbdlgCwmvkbwgaoR1hMH tmNJ+YUJfzOVxgHnyxP7pDSjJTnVcOuWz/bcWpJiBUWqcTTqIfM3PbtatH6B4gkM5s96 xBQvC2BctgPQaEWgNc2NW39QL77PKM/dv1BWhqy+a5ro7RGQUO+Wseqhebykyl2IP88m ef2k5BOnaca7wCsarBINYE/WMVUNfPl7mMDgdU2CQxOr2qRuXRLY2sMHB5+s3Lg2gOFE aATo6h470OFn/+tzAF0H7VEW32E6Kn1ETWP4PkXCiheIS2giQndj7HCynkwxbdnoDd2p ZkGw== X-Gm-Message-State: AOJu0YyC2Afp9+7X+/ogbPbl7rDk8z90DOa6XGmT+oA4CY+T3qubi33L h/f9kxb/oob5YIPuZc+IvRmp/RbqKW4E/mDRtwOEBpo4keNVDMUYwo3/gQsOkQhSU2IxeMzPxQ9 5rxEyiKA= X-Gm-Gg: AeBDiesrCPg8+6m+XViq53Z9pRsmOvCH+BkGO2PWCZSqtpaVX/vx+a8uy4lxZYeCJND gg11oHrc9o5s/HPw4oYszxxsGx1mNTSMvhb3IwT6UXQvAdwbBCOoQa3RYwJQbgpeJSHTf7fsoB5 4yEsPo5q6OKa/lIAL2Lk+lgqQCLB50QDMHdR/p9cAzN3Zs9AnWjcszxHq1a9OtYtCRSe6gMRjqa jWpgaFrxWGjERzJIlC6RjLnbZW1TWXPGcxK1vklxFkAikVQUbgo6G6/AOlRSwrLlRiLxrd5PNT2 UWYaJ9xHYEyUlVHbfzCJiG1KgXHHqwX+DcrnW3GrI+NeQ5je/AACOTnf9R1LOAzn7np3mCkNKC3 mBO5ImrsBv4DUKyBx80uWiEyvFV4DbWmvpQOH4cli8EMUmSX25KIDxy8rAbub9F+qmpTYJWhWQQ ilqIuIZ/qYPduRJeMsxrgct5OBkhV0siIpETD6wgK3wdSxdlyitiCBbyXTOr72gudv2MZzr/0Pv YVDB3MN5dk= X-Received: by 2002:a05:600c:1e8a:b0:488:fd7e:1063 with SMTP id 5b1f17b1804b1-48e51f4cdcdmr62798465e9.29.1778076332216; Wed, 06 May 2026 07:05:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 077/110] meson: Allow building with empty target_arch[] source set Date: Wed, 6 May 2026 15:54:49 +0200 Message-ID: <20260506135524.20617-78-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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: 1778076706559158500 Complete commit 83d5db95d38 ("meson: Allow system binaries to not have target-specific units") with yet another guard, allowing empty target_arch[] source sets for some targets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Message-Id: <20260506133216.18730-1-philmd@linaro.org> --- meson.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 4176d020c21..987f33bacee 100644 --- a/meson.build +++ b/meson.build @@ -4332,9 +4332,11 @@ foreach target : target_dirs arch_srcs +=3D files('target-info-stub.c') endif =20 - t =3D target_arch[target_base_arch].apply(config_target, strict: false) - arch_srcs +=3D t.sources() - arch_deps +=3D t.dependencies() + if target_base_arch in target_arch + t =3D target_arch[target_base_arch].apply(config_target, strict: false) + arch_srcs +=3D t.sources() + arch_deps +=3D t.dependencies() + endif =20 target_common =3D common_ss.apply(config_target, strict: false) objects =3D [common_all.extract_objects(target_common.sources())] --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076519; cv=none; d=zohomail.com; s=zohoarc; b=AQ/EEbR9f2cfxF+O5K8nka+xI1KSrM5wZrQGUpmKgqcf7k6ZQA4OpZ8z9ajcmyu0wP1Zy6ARwXO8YypmYbwy9/TImtrOr8nJsJrLTqXRNOHGcQyqeAQklL/eRMxCBxTlj+6dj4zi71dP1aSf1s9W61dXPWnquJ7U81yCJhL3quc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076519; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=wOtErwW0lTtn2AM7UlvNYjNCtCRetlbY5MBnk9eUwmo=; b=PkhJ5fdnjUllz5EPIxGpR/wWbTcOxB/Os9EcRGToJulzvtCmtcSQs1cUslQ6CAS//KlpCp9uCcD/BLqgPTcfCbJc0Rv/SorWTq905uv6dpwqBtwKUgyafdF8dANNVFCcsY9lr/LpcfVofhJf/mRoEm5lHS6ZLj0zHVHvOcr+Xs4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076519630357.22762874438524; Wed, 6 May 2026 07:08:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKctO-0005pB-N1; Wed, 06 May 2026 10:06:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcsl-0004hw-Ir for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:50 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcsi-0001hW-JG for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:46 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-44985f4ab0fso3093600f8f.0 for ; Wed, 06 May 2026 07:05:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45054b03df9sm12424062f8f.24.2026.05.06.07.05.37 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076341; x=1778681141; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wOtErwW0lTtn2AM7UlvNYjNCtCRetlbY5MBnk9eUwmo=; b=uRlVIgKYi9I1X+siHOakKvePrgNXGBL/ZqGgOhCKHOxOi6D4T2irRRMOstbrjUiSDB hKfyy6nKCZkHm3KvWI+7wekze03abkZKayAYf9Su5zGD+pn+Bqc8WjnfBwSuq8j2ZK1e 81zmUWIs6bSIUaS7vKy2KnRE81lcpR4QKNgYLAo+Wm2ZCSO1s4YFJBv2ibGaL0jR0umA zgzlt7QqrN1IOc0/6Lp6goiBvXz6p5dzV8TtL4WM8nEtTUXLx55A9zpSO3jstNbOn4RD 6tlH9SzRGuatOG/hCe4TRj8Xt8WqHJVZV/c54rd4BMmVxxegvj78XnnczjTNugvGdS6B N0yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076341; x=1778681141; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=wOtErwW0lTtn2AM7UlvNYjNCtCRetlbY5MBnk9eUwmo=; b=evESlISqTIwIID8XRmlzEEYKhuXkdng886B+qEl/Bq9vUo1W+W4MzUq66fe7Wvxk4p gVOFdyJyYTOS6vK20BkRc+X72lHithS2/7n9JxzI2wZSOqsH/1mf+LVx81F/5xBGBFY9 vN8HbFXxgZlQXhdedULkC/ATwa4oFg0kfePMhsj+GvTB1+4vjinwdAM1xpE+hURiTkS2 0B9Guh+nC1hoXu67H7VxfVeQPB0ai+QZiOYlWn0xrBp9mkb0KFUQSYqndSHxCYqVr75F Y6DwwOBoqKYBODi3CD7p79WQJftrqlFGAgIEHxcuMERTnXqswJ9mcreOiYdwIOEG62gR fR4g== X-Gm-Message-State: AOJu0YynF4MNDtBETFAio8jC75qCSadB/oks2as34V74mqIhNC3Nf+L1 /ZkNpKPpF1mYpBUZbjuLY8FCFdfPcktkTPYi3h95rPXbB++p96SGJ31vav9jTfMqTSyzXzSpFbG UzTiBkkA= X-Gm-Gg: AeBDiesEEFzI+hoCCunI4d2CHwJTc1CYJcgWP7hA59iFELTo1v/Vg8lDohzDurghBQz yIcfn2dxYbiUUxbDppyzcb398ONNiKQ1EjcOWmCcwLv9VUYIyGeASsQLHqlz0+Xi4VcowSsERU3 JdPvTcj8ItVZ+GeBwlsOAuvml5T6a9Bp8WJjwm+JNSOwJ/7mTkvROV1xAGE7haPIFJzdhRclHoV o/EAS3QFOoJCrY9zi91RUaUH3iNuCdkkAsU0qTg5O7J5v6STxLoQ/EWQTsOR+M0F8mE55WgVYPY TWXR7lyqlF7OFzGwu/uMDH3XY8mMPzt3Tcm4BRexHt9ZysP4uZOLyEdNm62S+Xp16VIotfkw2pm n2ktfJByqCy9dhAZAnAOSlLRCmMfeDuDn2XDvEu2btmSxIoKxf+jA28piyE7RdCPgb0q03kRXz1 xnRSK7VqiCXz8Hld5QKap5hAlA9JNG6pyZKtu789AQWKkS73zToq0C5xcDO2wQkznIQu/fzoYI7 hzZBiqObD0= X-Received: by 2002:a05:6000:200e:b0:43d:781d:37b9 with SMTP id ffacd0b85a97d-4515dc80a95mr6161729f8f.42.1778076340998; Wed, 06 May 2026 07:05:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 078/110] meson.build: define stubs library per target base architecture Date: Wed, 6 May 2026 15:54:50 +0200 Message-ID: <20260506135524.20617-79-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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: 1778076521289158500 From: Pierrick Bouvier QEMU stubs (from stubs folder) have a unique feature: they emulate weak symbols. Weak symbols are not supported on Windows with gcc. This is achieved by defining a static library, so the linker can pick a file only when one of its symbol is needed. The problem is that common stubs are embedded in qemuutil, which is defined and created before any target code. Thus, to benefit from the same feature for target code, we need to create stub static libraries for each target architecture. To keep things simple, we declare one library per target base architecture. This implies that stubs are compiled only once, and we choose them to be system common files. This is not a big issue, since stubs definition have no specific behaviour, out of returning a default value, or stopping execution, which makes this safe to link them in user binaries also. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260424230103.1579600-2-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 987f33bacee..5fbdc75a0fc 100644 --- a/meson.build +++ b/meson.build @@ -3738,6 +3738,7 @@ target_user_arch =3D {} hw_common_arch =3D {} target_common_arch =3D {} target_common_system_arch =3D {} +target_stubs_arch =3D {} =20 # NOTE: the trace/ subdirectory needs the qapi_trace_events variable # that is filled in by qapi/. @@ -4143,6 +4144,7 @@ common_all =3D static_library('common', # construct common libraries per base architecture target_common_arch_libs =3D {} target_common_system_arch_libs =3D {} +target_stubs_arch_libs =3D {} foreach target_base_arch, config_base_arch : config_base_arch_mak target_inc =3D [include_directories('target' / target_base_arch)] inc =3D [common_user_inc + target_inc] @@ -4202,6 +4204,15 @@ foreach target_base_arch, config_base_arch : config_= base_arch_mak dependencies: src.all_dependencies() + common_deps + system_deps) target_common_system_arch_libs +=3D {target_base_arch: lib} endif + + if target_base_arch in target_stubs_arch + src =3D target_stubs_arch[target_base_arch] + lib =3D static_library('stubs_' + target_base_arch, + sources: src.all_sources() + genh, + include_directories: inc, + c_args: target_system_c_args) + target_stubs_arch_libs +=3D {target_base_arch: lib} + endif endforeach =20 if have_rust @@ -4363,6 +4374,11 @@ foreach target : target_dirs objects +=3D lib.extract_objects(src.sources()) arch_deps +=3D src.dependencies() endif + lib_target_stubs =3D [] + if target_base_arch in target_stubs_arch_libs + lib_target_stubs =3D [target_stubs_arch_libs[target_base_arch]] + endif + target_stubs =3D declare_dependency(link_with: lib_target_stubs) =20 target_specific =3D specific_ss.apply(config_target, strict: false) arch_srcs +=3D target_specific.sources() @@ -4408,14 +4424,14 @@ foreach target : target_dirs 'name': 'qemu-system-' + target_name, 'win_subsystem': 'console', 'sources': [main_rs, files('system/main.c')], - 'dependencies': [sdl] + 'dependencies': [sdl, target_stubs], }] if host_os =3D=3D 'windows' and (sdl.found() or gtk.found()) execs +=3D [{ 'name': 'qemu-system-' + target_name + 'w', 'win_subsystem': 'windows', 'sources': [main_rs, files('system/main.c')], - 'dependencies': [sdl] + 'dependencies': [sdl, target_stubs], }] endif if get_option('fuzzing') @@ -4432,7 +4448,7 @@ foreach target : target_dirs 'name': 'qemu-' + target_name, 'win_subsystem': 'console', 'sources': [], - 'dependencies': [] + 'dependencies': [target_stubs] }] endif foreach exe: execs --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076440; cv=none; d=zohomail.com; s=zohoarc; b=gUFAQS8pdlv7EDZmxaGUkSNyjuvELl5S/f+iwc2D/3tc7HXfxwGjI7noZrPDjfntNrZvXwAMuDknnT3o3Zq3SZmonNGX7UhDaABYU1iCJSDsGt0Lej0D7Jvfy2BYlm7O+PRc981ovpcsBYMMpjaQlFG8Be/D9iDNZZ6aZdjbOHA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076440; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=pVWa7HWZcWALpqfD4g2BMHRotgfjymp5ZOIdJK0YkHM=; b=I8oaq3JxnUVstk9CdddXusS6Ir7cdQMksyX88vsrvs0S8algK3iNZuMSrihLzLVbsVXVj14dYMHgRRwOnAOuDZnQqjYJqSUEpPgZHwpgJEpi7JKkJHjGobMP5h/C1fvynO0YldYNo8maksWZHLIFTK3XP8zyYOL2HJ9koOlfcoU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807644035626.016236759278968; Wed, 6 May 2026 07:07:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcu4-00069G-3s; Wed, 06 May 2026 10:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcsr-0004te-9I for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:53 -0400 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 1wKcsp-0001jL-Hg for qemu-devel@nongnu.org; Wed, 06 May 2026 10:05:52 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-488ba840146so57432735e9.1 for ; Wed, 06 May 2026 07:05:51 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538d2878sm81005545e9.15.2026.05.06.07.05.46 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076349; x=1778681149; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pVWa7HWZcWALpqfD4g2BMHRotgfjymp5ZOIdJK0YkHM=; b=DrbOs2quAqmCvR4w9qIH1UnKipbETZ+nKObM1X9QibqA3jh/Ghp47QGfS63MnAv4M6 gMcCpG4/yaNGXhSgQgIOddARGIyqOD1wh+eEnAdF7Z/cA2YXpO9fD07NHbWFSaTIQp+7 O/HKfrUT3bV7L9BOeLlH+W0Mi+Rdpd9OmuQ1QOooaGX0JfVZTp3W1/r3BnkF59B0VFEm R4zduiVn4pGUzFzJFXhAjQ/Kr83KBBpy6HUEMN17gX2pIWU6ic/pSW0JtDLFVxnFzufU DaF6MZaW2p1dSH83y/GTFhZEqGeKTHSTGOmL3Kp4l6g6hnN8D00egrbE9UNIqTsY9XTC GCKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076349; x=1778681149; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=pVWa7HWZcWALpqfD4g2BMHRotgfjymp5ZOIdJK0YkHM=; b=oSkg3OKbtqc/LwZRa5jB3FH6cHuB7/Ue3rSi1Lsrfhkvsx5oXH1VXjptYGpzdtSi6U lTxeNXCoXQe7gPxIdDXJfNsK9fiYmw3A8ir1rDYymab8nw97lX0Eyzq5MQrJ7y3+1/HV PeVxP8v9ZoXWgUic2ccqvwQ4+VAVsROPnoaEOdx3cN1YJDJfUfsPzdhZMMnABcXPhiYt AYZSOs6PHJ8AkHFaGqS0WjttPT/6yF3L7DwwdmiQpGA32iYgKo1Cpcv6rIW1ER1XrZGV 20b4eWcu8z2+1jj+1amDwoZ4FcsvejYnqmXjabMp91kjaKgSoo5AFvpqHYQ8Pj1khysp NGJA== X-Gm-Message-State: AOJu0YxS3ce6Iaiy8rvJwTRCU4m9hbQgxO54zSit7CX158z6dhpk0j7E KL/KTepRYDmFMnAQ7Lzd57/MQA1bVwtp+BBPpZ00zdQ9HSTk+RmVVzVCbHgsyxoFT/QqGckYxgD fnauPzY4= X-Gm-Gg: AeBDiesbhHVkTZgTdbF6aO+HWvnKs3IlfpajkGOAkzzH8GjpMUZzcOFEKaUYw41BqL1 2c2vvsS5SWQRW1y4KBsGWKIrXn28QBxWA36u8/TmgSMRUKhwMrzXSvi0+QpauXHO8100nDV+SEs wKyiba5qypPhpHdQsvg/G+BQKMFOsA4J/Hf3u279SQ/T4RDZOLBlsUdixzwSOHURKPblCSIp6xP SZ0eYl/1dv2kfKZLuQ6pWcKBgXbj/9wE4229ZmsvIZQ8W0DmU1QAJL4HC6ruaAeZT+IyUZKfpEg 91SG2eaff6/K+hARcFNANHVGtVaELHLapoqB+JwzjV3gMo3/+qjOI+EcnWQ3HopT74XfZgFIw7/ BPMhCukAAvaSeQ5dtI3AshYypvJdEjVgHe5X4ZlTovwCuDaTtgaxHcsKYQG0oglXwDaOZhWIMXr p2F8jJq8P71H4X3WFXh7xyeED9YL3sHdy4xpBIx/5cFaFFyYqXXv/PwBeVG7pgytjS9/KEEvwTN FaAwTh5guUtOUQYnOAi6g== X-Received: by 2002:a05:600c:1d18:b0:489:149a:f9e6 with SMTP id 5b1f17b1804b1-48e51f46dcfmr58859745e9.28.1778076349037; Wed, 06 May 2026 07:05:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 079/110] tcg: Include missing 'tcg/tcg-op-common.h' header in 'tcg-op-mem.h' Date: Wed, 6 May 2026 15:54:51 +0200 Message-ID: <20260506135524.20617-80-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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: 1778076440760158500 "tcg-op-mem.h" uses methods declared in "tcg/tcg-op-common.h". Include the latter to avoid when including the former: include/tcg/tcg-op-mem.h:34:5: error: call to undeclared function 'tcg_ge= n_qemu_ld_i32_chk' 34 | tcg_gen_qemu_ld_i32_chk(v, tcgv_va_temp(a), i, m, TCG_TYPE_VA); | ^ $ git grep -w tcg_gen_qemu_ld_i32_chk include/tcg/tcg-op-common.h:328:void tcg_gen_qemu_ld_i32_chk(TCGv_i32, TC= GTemp *, TCGArg, MemOp, TCGType); include/tcg/tcg-op-mem.h:35: tcg_gen_qemu_ld_i32_chk(v, tcgv_va_temp(a= ), i, m, TCG_TYPE_VA); tcg/tcg-op-ldst.c:286:void tcg_gen_qemu_ld_i32_chk(TCGv_i32 val, TCGTemp = *addr, TCGArg idx, Cc: qemu-stable@nongnu.org Fixes: a8af0fb24da ("include/tcg/tcg-op: extract memory operations to tcg-o= p-mem.h") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich Message-Id: <20260423135035.50126-2-philmd@linaro.org> --- include/tcg/tcg-op-mem.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/tcg/tcg-op-mem.h b/include/tcg/tcg-op-mem.h index 36931d1dd57..ea35a02fb40 100644 --- a/include/tcg/tcg-op-mem.h +++ b/include/tcg/tcg-op-mem.h @@ -12,6 +12,8 @@ #error TCG_ADDRESS_BITS must be defined #endif =20 +#include "tcg/tcg-op-common.h" + #if TCG_ADDRESS_BITS =3D=3D 32 typedef TCGv_i32 TCGv_va; #define TCG_TYPE_VA TCG_TYPE_I32 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076781; cv=none; d=zohomail.com; s=zohoarc; b=C39Y54guzOWDK1lcCcTJzp+3YH8YgjTUoudL+aUho1uLO8ftkzdWwoO4sM9CMyDGuEWlrooBPkJSF//z7zsRiOF6WKU0RMWffJaEvYjvSeWN1uPmaCDxIQyT6Ncpxk7qw/FDWXy8sAQL4fbhrhlAS/hsbCrulV8j1Vy/k4lFp3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076781; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=XEy5qmOgT5jPONcPwspPTaFki8owjZYQ9y+oaKY0q6Q=; b=A2jFFcOARQBe4OHtERQZjRi2iUWerBlTUEizPB2yiG8Ft8mqXIVlr5mG8zsLTD0zJ0hTESTIDPr3orzDIYAAA4n1jSZ5LIzD52btUmgm+ogO4qFjnqC2hDhhJlXlPJ0fig37GCViOfd5gsRfYg9bhKIedcIEkAH8Qo3+9RsS7I0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076781174254.10180868828184; Wed, 6 May 2026 07:13:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuB-0006dh-NS; Wed, 06 May 2026 10:07:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKct0-0005TH-K4 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:04 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcsy-0001k6-Og for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:02 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488ad135063so61615775e9.0 for ; Wed, 06 May 2026 07:05:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e530b212esm23820875e9.1.2026.05.06.07.05.54 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:05:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076357; x=1778681157; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=XEy5qmOgT5jPONcPwspPTaFki8owjZYQ9y+oaKY0q6Q=; b=ai9i8S7CtdKGIkKeTmuAz6twmcYjXhRjTZq00OaCvkeoSCcSPWoFPm1r4KawfLIdJS RGo0teaBYc65MDCLKc4soZJpj5+n4++c2j6lSa5Y2fvayWwW4xryem8GLcJ/wZh171fU icmSpW+6pmtPtb41APukJRsN9TS2JRr75reo4JKFsPx8WvBZs8fW8Iw3mB2JEiHA4uHr cm80xk/nwGT9M4gTJAhldWa9hY60G7JRI38H9E12w40ICWJ7r1vw+URJFUYzI8xzx1h2 R6bR30UMEmEBYverzhJsUtdso6XjqPH3ScHWUppW8C5eG6BP5z9/YtbBmij+BT8WCNj1 5HMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076357; x=1778681157; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=XEy5qmOgT5jPONcPwspPTaFki8owjZYQ9y+oaKY0q6Q=; b=q0hjusSilF41cTO510eEZgB9P9WoYJfwnmZHZpFLM2rLRDAa4AU5gpMsAKp04A1g/m IGK9OgTpr6yqHqwEqzt1xG3HvG67L2XBX3ZNXyVbTUS7/xFhXy2l1XcYhqgbfGOvNNDY geo0T+nMhFZj2PFAwOAZ2Dbkrd7gr5YtmezJsHvqCXswsCuoFosXUhH/CYajf7GcVoEw DPVSCB+B+z58g7exTtVMzRiVi09inEtqC25e8ZUcRsFWOT7Nh3mEmL7w8Wek29xAgmEX rm35kHhFaYg53VLXiQak0amulR2BR16u2tHdTqH3/ivvQZntLaw1cYQgufc0gj5faDkQ bRqA== X-Gm-Message-State: AOJu0YxaZFaDgVnlf62ntQnfopOT/nFIewj2Ozbv1Bh3APm662eWgA5N ixT2SrF3JWOLtenSTThv3cND1o6a9Ji2qfhxAGZptprsOK7e3zHMqygHaIGbWdl2In+q7AQYNvQ jLJiePMQ= X-Gm-Gg: AeBDieta22bxCF+E07yx9E46iT6DSV0DaDCnQ/NoHvUhEU2Aj20q3o/YlNJTthUmUzJ USR5FktN4EqasrVzVbfVHzSUVBJJ5KnVC3NK90B2rFZFAlans0QNW72mioyG6YuDvzRK3utEjrQ KYX7tjtGT62iau05+WJs0iKNcDZdvt94m93OGeldwzpviU+rBq+LmA9vqq106A7zK71zjIJt12A eu7aVlXswZNdMtLmf580+gjiALNeMtDggZBRxfYRGKjYpxvTHzURq+KQosVNwe+tgFD0N8Y6Vuc 4V+O5okyzONHjNrar9uO4apEKCFMfg4+GmMzATzAtRXNpnPf1uADCxAQYTy+W5d40HetZLabP6K pW8qLyCilkUyQL4tlWUMt6m2S0uyng11kE83BnrY8WdnH6Kv4kPv0gqanZF9iyVm6+J0F3lXB6V r2xULEpHz8HqsZ7HCv03dOuew1C1ao0FVmxtvk0/Vw+WCm3utIdySF7dqiEFT/VF4kc6DSvui27 0ETBpQfrR4= X-Received: by 2002:a05:600c:354b:b0:486:f634:ef1 with SMTP id 5b1f17b1804b1-48e51f32a7amr64175305e9.17.1778076356583; Wed, 06 May 2026 07:05:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 080/110] target/arm: define stub library Date: Wed, 6 May 2026 15:54:52 +0200 Message-ID: <20260506135524.20617-81-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1778076783682154100 From: Pierrick Bouvier We use the mechanic introduced in previous commit to define a arm stubs library. With this, we are able to eliminate symbol conflicts when linking arm and aarch64 targets, and get one step closer to having a single-binary. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20260424230103.1579600-3-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/meson.build | 8 +++----- target/arm/tcg/meson.build | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/target/arm/meson.build b/target/arm/meson.build index 192ac7c31ee..4723f9f170a 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -2,6 +2,7 @@ arm_ss =3D ss.source_set() arm_common_ss =3D ss.source_set() arm_common_system_ss =3D ss.source_set() arm_system_ss =3D ss.source_set() +arm_stubs_ss =3D ss.source_set() arm_user_ss =3D ss.source_set() =20 arm_common_system_ss.add(files('gdbstub.c')) @@ -23,9 +24,7 @@ arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp= _gdbstub.c', 'kvm.c')) arm_system_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c')) =20 arm_user_ss.add(files('cpu.c')) -arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files( - 'cpu32-stubs.c', -)) +arm_stubs_ss.add(files('cpu32-stubs.c')) arm_user_ss.add(files( 'cpregs-gcs.c', 'cpregs-pmu.c', @@ -39,8 +38,6 @@ arm_user_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', if_true: files('common-semi-target.c')) =20 arm_common_system_ss.add(files('cpu.c')) -arm_common_system_ss.add(when: 'TARGET_AARCH64', if_false: files( - 'cpu32-stubs.c')) arm_common_system_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) arm_common_system_ss.add(when: 'CONFIG_ARM_COMPATIBLE_SEMIHOSTING', if_true: files('common-semi-target.c')) @@ -73,3 +70,4 @@ target_system_arch +=3D {'arm': arm_system_ss} target_user_arch +=3D {'arm': arm_user_ss} target_common_arch +=3D {'arm': arm_common_ss} target_common_system_arch +=3D {'arm': arm_common_system_ss} +target_stubs_arch +=3D {'arm': arm_stubs_ss} diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build index 02774409e56..d2364aa39c4 100644 --- a/target/arm/tcg/meson.build +++ b/target/arm/tcg/meson.build @@ -28,7 +28,7 @@ translate32_d =3D [ ] =20 arm_ss.add(when: 'TARGET_AARCH64', if_true: gen_a64) -arm_ss.add(when: 'TARGET_AARCH64', if_false: files('stubs32.c')) +arm_stubs_ss.add(files('stubs32.c')) =20 arm_ss.add(files( 'cpu32.c', --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076592; cv=none; d=zohomail.com; s=zohoarc; b=goxvQxnoMSlnyp9bj7+B1jw1YfGc95yhqe6/W45RHWykQnCIKsRwq5h9lDtYs1DlB/afskt/ppQR77evJPiEESk2UqNNYYqYdoLaI8aJRnDQShv9YsdmzkrS5prY74+LKVGyQjfsDZTVpFKnCf26RsovhZDbH4Q5R9bAu2p0V5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076592; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Q7JoIcCA8qNl17AS9UcDFI607F3aol8TFPBvdZnjpeQ=; b=Xit65k4KgEgrIMODL1StnEYhOIcYCkdaDzuLnuUJaV2zcYtgwT91wFyP9snaZKwya5I002HEpoq4OpEvO919plW/osx3ITY9YNbXe3bHpYfEP9pRbfQjxaKrDV77m8ouFg6EF+hDa4osKmZQKKkOU4+425Eh35U5k1d8U4kOfvs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076592377995.5426043147094; Wed, 6 May 2026 07:09:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuN-0008Gv-23; Wed, 06 May 2026 10:07:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKct7-0005Yl-QG for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:11 -0400 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 1wKct5-0001l6-Oo for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:09 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso46487695e9.1 for ; Wed, 06 May 2026 07:06:07 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538bc9bdsm60504185e9.11.2026.05.06.07.06.02 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076365; x=1778681165; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Q7JoIcCA8qNl17AS9UcDFI607F3aol8TFPBvdZnjpeQ=; b=PUXKEuhrhIfhQbKuDCjLKSwMmJngAFsOX0zXH8Uy8CDk6yNFXXs2Mza1oMMsh95N7m efyGon2yxNJFWEqW8Fk/2IZpIbBzVqz5h03fTHWU0R5qWUR/l5Rx8H+XdEZje4G2iGZ1 X8L530CSZZR+5IPs8pP4ciAIvyzCuCEKQ6BIB7OSRy0VruWppVZtm+xKio1j1m0Yf1R+ xDQU/iCT8Ig4g/KxAq0s2JWQWJ4sfpCa2SonaotMckTyxAIlgqNh+iHwsPd/L3g1BD54 qZ+2d2GU6uZUyeYUwnCA2uGImpesFYMfXNjpQof60sVc4GOX6kTH5ncf3uVgbplvj5Of Gs1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076365; x=1778681165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Q7JoIcCA8qNl17AS9UcDFI607F3aol8TFPBvdZnjpeQ=; b=BYTV+XxngNNQPjUbTTmkSDDpN7S1CwjG+dEwl96QwaIyWRFwkfOEWMJ7q4yuaGhYvo 8JZQISgDfugb0J0CUocAJLy5pEvHa3gLWDUzCOVNyFepUrwLddxk8XuJOwCLOdpdZn66 b7NAaVJdHJiiY6is0njHbevYeybsUBqbpIi9o5fM5EzFw60MJyQ/ehEJtwUK3NhMRWzD I6FdFugL8y/dImz6dyr7zW6eYfmaj2pXqLhMUxePKsiyEWblRi+sQZzE/DR4BFuDIH2G 3pIWEO0trBJPqh4arcmS7pZhhI2ul+W4P58T7aHgsHhkatQ8e4oI5Zj0kz+95FnwbOID 0Rxw== X-Gm-Message-State: AOJu0Yyo84LYogWNWFoDiziCPcOGYxuxWyPVbI4/phR5GBgWtS6afItd lCHld79MFpFDLKYoKQAGVkSPp5/l4oeJRoJ4i2YLOqDyzELdkRjBxfWfPppDLcaqwyvkP5vtb22 LKNhWjVE= X-Gm-Gg: AeBDieuqLSn3jKBmp+imB+LrCDqtvSiDda+JjXP0ndOIDroCbes3B5MYtWA93Z1Tshz BVbIz+2BKomwbOJYjtCwKxTlBYtqwsZGH6/XZQ3QP7xWqtXaXy+ABY0mgxNyKmmw/Y+OW/F3/Sv uX4i7nB20ZB+Rf1sfJR+1LEiQGKTboKigkwascV28iJLanwY9wFwgDZNyy5FaCwOXeY5uRQyLy9 d0LEX7s32jS6NfYTxj+UZ8b8Ao8P360V5FKDeBQ9iNtWL+1JxzyTzlSDs8lzc+GqkqeIrKjo2xL NbzTHLYsSfIIb1SttBXDqPqZK1dLPOgN3MKYCU1gwvQnqOYLEY6MlUceD9Wt8WFfaGhU7MzVOQm nZSPhXLX/hJuCNPZzORa2s/AbRO7psC6XHsIuF17Qobn3CItcWQTiGQASb0+yJBqxbpSJrAJF9Q usrClp7Mq0LjrLk8Ol4HemOvlcW/yNpi6CvyIaY599SJ2hBCv9DyWEdkys2P6w9nJf0WcmBV2tl 4Rj6IPe7eE= X-Received: by 2002:a05:600c:b8a:b0:48a:56de:d620 with SMTP id 5b1f17b1804b1-48e51f32ac3mr65522115e9.14.1778076364501; Wed, 06 May 2026 07:06:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 081/110] target/microblaze: Fix endianness used to disassemble Date: Wed, 6 May 2026 15:54:53 +0200 Message-ID: <20260506135524.20617-82-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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: 1778076593759158500 MicroBlaze CPU model has a "little-endian" property, pointing to the @endi internal field. Commit c36ec3a9655 ("hw/microblaze: Explicit CPU endianness") took care of having all MicroBlaze boards with an explicit default endianness (similarly with commit 91fc6d8101d for linux-user binaries), so later commit 415aae543ed ("target/microblaze: Consider endianness while translating code") could infer the endianness at runtime from the @endi field, and not a compile time via the TARGET_BIG_ENDIAN definition. Doing so, we forgot to propagate that runtime change to the disassemble_info structure. Do it now to display the opcodes in correct endianness order. Cc: qemu-stable@nongnu.org Fixes: 415aae543ed ("target/microblaze: Consider endianness while translati= ng code") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20260423100612.27278-3-philmd@linaro.org> --- target/microblaze/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index ec513ae82d4..639f46b525e 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -237,8 +237,8 @@ static void mb_disas_set_info(const CPUState *cpu, disa= ssemble_info *info) { info->mach =3D bfd_arch_microblaze; info->print_insn =3D print_insn_microblaze; - info->endian =3D TARGET_BIG_ENDIAN ? BFD_ENDIAN_BIG - : BFD_ENDIAN_LITTLE; + info->endian =3D MICROBLAZE_CPU(cpu)->cfg.endi ? BFD_ENDIAN_LITTLE + : BFD_ENDIAN_BIG; } =20 static void mb_cpu_realizefn(DeviceState *dev, Error **errp) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076488; cv=none; d=zohomail.com; s=zohoarc; b=VIhawDFa1E/nf5CKR7vhPx/wrmqjisaXX0gSAQDWciEJrkx8xRC5Jq1Cycro01VcXH8DolN394oXZyvBCXoTysjXK/QoB/TwLFk6IGmuE60XsnB79x98tdYboqLGx06Or+ziePwoB4XAUJEca2q3hi/ffnU7V1YvYbIJK4Gqbig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076488; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=ivFnlR9eWQsRMPs6/PVT5snQ5D0F0dv4qOp7SGIUiJw=; b=WvIiBXPqIWoB8/Cp3L9uXOwZRsoOWuEvpguQdJbkmoXWG9MHLBzV7LlVfkgbXy2P71Wc7Mk9C8Vj+l/CZpDYPd9jBXgsFPKEaLO9m0QMU3tCVEMFNZ50QD2VNK1lfbKb20lkRuBopyWax3oeElSf5p1zqPaby+3Iia2VVzIsm+o= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076488152726.8825442683161; Wed, 6 May 2026 07:08:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuE-0007pH-RC; Wed, 06 May 2026 10:07:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKctI-0005f6-QL for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:21 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKctC-0001m1-Uk for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:20 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-488b150559bso44952635e9.1 for ; Wed, 06 May 2026 07:06:14 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055d36dacsm12685450f8f.32.2026.05.06.07.06.10 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:06:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076372; x=1778681172; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ivFnlR9eWQsRMPs6/PVT5snQ5D0F0dv4qOp7SGIUiJw=; b=FNNoM/Th3Oin2WnYZoxCwkHPUVc48fHXPdEzt1DEx1Vn1UfgYkdgzUdciGAap2Qnwa nLFSx1IQ8SWAhKBEKglstMyXxMCuyXf57nq4Jyl2uqFSgOBUCwGsbCHKn6Z7/Zk4I0Kk G+cwnrK185OxxDw5sIGN4q6xwUGN+vfZfgcUpN10rsdDIbq1bzBKD5AXQ9mhxg9uepC1 OBbPOlRgWgdtrudSWV7spsvb2uJakuXtgybYDyMaTYTII9hDavcp578ZqmSaMoDffa1H LkavfRSVLc5ckoFsDSKLlaM4sLyQQ92rBFnFIR9Rl2jL+Q+VUIv3QW0cs6yz6X9Ee4LE gsiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076372; x=1778681172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ivFnlR9eWQsRMPs6/PVT5snQ5D0F0dv4qOp7SGIUiJw=; b=QbE1tAEVe8ijDMG+4Xc6MhzjAHskOqSPCKxs1U1q1UVUvGdcXm6zKDGgW2ExxLqZC8 jrFtFZSBfntk2KJ9XhIvcK4P34aQrRa1lwtIQZmzDDxZ6xKGi+zHvUGwINaiuUauxmDy pJYpQ7jjSTh0T/QycfrItHi7QpwwgJdbpUEYQtXyrjA5xataXmVuLZtvYZbUP/WNRGdn UZH5XU+UOQuEBE+Zznz+DutVOpUQ23dFETaeU1TNPVcgrLFLziPCK79aOuwFcBBcMF6D ZCuUUYecO9CmyWfymruAREiEXhiXo0z1zdXsoH9ZUto7svia5evaR//MdaXkdEPVeNqZ CK8g== X-Gm-Message-State: AOJu0YysXc7XBexZBDqIngGwcxPCCsu4ekjefTkA9MzRDuTlKO7D52Mb +ZkweeKrV3MEJWB4UboShWCvLs8QpIsmHPaJu0DP6kv3fjYDI+GG/hYOmmtKAkuF44KsfP9JGGF svD30UYQ= X-Gm-Gg: AeBDievBWRhDXyoW8SSbYuD66RKlT6jApr2IkLp/cUkEOGhFqhDYaGhnt33vlQElvJ6 r6d0aANuN5U4WWWOvxhRlwYZRSN72L+CoA1e+TUgkSlQH3agc8jnaMX3u58Jl9VH2QdQjKTnylw kmisAUuwYRS3bHo3txQwECQLIWELLHJWvY/uL2sVsKq9Jao84f+UbnW1z/M+UVrWRUx0/Vlxkn3 +CffMwh5s6vAWuOUkviEcBbMN/gK2H3VkBzgWQfqJi8Pl8uKIxxXapyEvX0aGXsPVsR+e/Y5LPn FYZAHDQ/wDeoLvjIoxce+dQYsM7ruMXp4v6QZnOCsuxfeBZDbHYb6ztaXALITXTlBFGfmxtUzmy bRFf9A9IA/dLbGr0WRwMtLKbf8ovS/1UX8TAgXmKMPtDSOnaFtSRflneXpK1LI24Yr7nZ0H3ocO vNz40Q4803O/y9tPOTF71YSpaQxFOMmca5Zd05jRaduA7Ulc8AskeuFJyfz9hp+UEJQzxaYPrZg vrsdWrZFu4= X-Received: by 2002:a05:600c:47d3:b0:48a:9428:5522 with SMTP id 5b1f17b1804b1-48e51f37358mr38066405e9.16.1778076372115; Wed, 06 May 2026 07:06:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 082/110] target/microblaze: Replace translator_ldl_swap() -> translator_ldl_end() Date: Wed, 6 May 2026 15:54:54 +0200 Message-ID: <20260506135524.20617-83-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1778076496636154100 In preparation of removing the translator_ld[uw,l,q]() methods, inline them for the microblaze targets, using mo_endian(ctx) -- which we introduced in commit 2c9e8ddd7699 -- instead of MO_TE. Remove mb_cpu_is_big_endian() which is now unused. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20260423100612.27278-4-philmd@linaro.org> --- target/microblaze/cpu.h | 7 ------- target/microblaze/translate.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 5765786e6dc..ad5a4a8e7bf 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -412,13 +412,6 @@ void mb_translate_code(CPUState *cs, TranslationBlock = *tb, /* Ensure there is no overlap between the two masks. */ QEMU_BUILD_BUG_ON(MSR_TB_MASK & IFLAGS_TB_MASK); =20 -static inline bool mb_cpu_is_big_endian(CPUState *cs) -{ - MicroBlazeCPU *cpu =3D MICROBLAZE_CPU(cs); - - return !cpu->cfg.endi; -} - #if !defined(CONFIG_USER_ONLY) bool mb_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 5e8bb4ed77b..8fee5dbc337 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -1646,8 +1646,8 @@ static void mb_tr_translate_insn(DisasContextBase *dc= b, CPUState *cs) =20 dc->tb_flags_to_set =3D 0; =20 - ir =3D translator_ldl_swap(cpu_env(cs), &dc->base, dc->base.pc_next, - mb_cpu_is_big_endian(cs) !=3D TARGET_BIG_ENDI= AN); + ir =3D translator_ldl_end(cpu_env(cs), &dc->base, dc->base.pc_next, + mo_endian(dc)); if (!decode(dc, ir)) { trap_illegal(dc, true); } --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076591; cv=none; d=zohomail.com; s=zohoarc; b=SHq/LPCypn/YuiXnpoWf2n2QWUhvD2/rS9hzE/mBRuqxg/11LYbhXco9u9sawRFCGTbVORNiwdh0sJChrBC4OckL95HNygxk7nK3lV/1UdYpy/dJ8/GcpK2nGjvPW1A/PDWMu4V0uO64oYV3UWGRInWAsTdjWgprEEBdi6bvpdQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076591; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=g8o9bUnJ4HHQm9EVnHH7pclzgrawaWQlQJgn4JYf1qY=; b=mFx2iU2lMMxDrLZLcKp84g8IFMhSCzaaTtuwM9jqDr1bC8amWtqDDdSbV5zNd+8NogAAuxyciOjK/vmpVnkaCTbeUhqPu6cmfaRn89t/BE3aX6k5nuKwoiZpCh2050zowbJHYlvaunXDTZxbK5KdlHJoxW3V3tm9sYy8y698kXY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807659146489.6057481337167; Wed, 6 May 2026 07:09:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuI-000821-RA; Wed, 06 May 2026 10:07:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKctM-0005s7-B8 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:26 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKctK-0001mt-9V for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:23 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488d2079582so67352185e9.2 for ; Wed, 06 May 2026 07:06:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5312daf8sm18159875e9.20.2026.05.06.07.06.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076380; x=1778681180; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=g8o9bUnJ4HHQm9EVnHH7pclzgrawaWQlQJgn4JYf1qY=; b=amidFVevMYqUs7EllD5I9H9fnOe4UDXKz68KjZNmo734ZXJzV40uqMOCCLW1RN9R6a 0XLBYbl9EDwY0+hc6LIexHWJkmFZ04iZIY6brbJBR2GuJF/YcxdBhm+iGag/56lfG/fa uh69JtQqZdDTqbCv0dUCIZKTCRmw4YKRKr3ra/8aYeC1lMpC072Kfg1TuBpOaWQ1xDPL j86BsIN3nDDAqfc1vyhBjDUtk9B61ZTZ1YAo3m0QxfwdX5e9XmNfcJfDwDgnhauC4tPW tz40HVQAXQxXVxIhtDE3tOpvineXGmrWorb9rJ7zr/u/nEbKz+Zp/UYyXuxPHKbo8EgX t2dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076380; x=1778681180; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=g8o9bUnJ4HHQm9EVnHH7pclzgrawaWQlQJgn4JYf1qY=; b=ATGt0Tb2JK+FVgFzTma67xDMGbUPJiMIoFyJIDs0mw4matL6Tv6X5o9C6sEMDmbKIx YEcHvGHj3gc3qa0uUeDhS+QvvW+6jM0Bg+gCw/5FEiJM6SLQRS7Hzv9yVU5cTCN1u8Fc 0b8eGHKxoyy9e91yHqhuIhCigCp7ODk+3RmmIDg3p1pqySjzSnugN1Bh8yQZyqTSosQK MptYQhWyjUl2lu6lhaxtfOlYDls5l96QrOHHSlJ87BZVAQxCxH/3TyjdhvknKnNPM70p 8VAiDHLhywVTMERQqCjuV+1uqnMbSdH/tBE+j0FWYEyU0QJfzz0dERT2VZi5z35zVAde JjtA== X-Gm-Message-State: AOJu0YxkyFDZj/HhKIFVXN/47DdSBmh0nxRWW84K2N2XZU1oeNZoyB+C kPSXCtcv7N/fRCoGPGY9otxstRM0jCeHMIbiStqCsHy8RM3pTYqvK2pqZmeqenYhxlHsD4RfE7g qk/VTiPQ= X-Gm-Gg: AeBDieso+xAh9CZWwV81tZuztXrVpWX6QYEZg8rT5nHg7UIVHKloJhA0RJ6t8xQ/6OA /bMIkfSkYM5eso4gk51UITYUGBs7/bCLvXJFDDk7nK81JYqP7fJQvqq2NJ5qvEK3YdRCH4Nle0o V8B6leXHozB5pAi92F8YPuLrytOyeHItFGzztHRcGDqPe9qfr7h/KcTDDpk0t4CspWgAVWTALX+ 1ZQYThdrSbnGuPGu+m1Kw3LHw2bS84abThav3DNdBoi/b2o1D6I/VYNvlr4oAVy3mdAsGv2wGvL 0ZQFYsXksTPZZWaQjmOuRhb1s7VnknGbS4NcccVPJ5QbWnq45Bkp3Q88HWRUJ3DlRG8u9YSyUyi r9SFkLTJvYMD2Fup0NsK8Jk3oP5a3zaNQD2SrTsDoYvDMBV2Y/WfMV6aWZRYgJqh4E2LyLDRPHQ 2wXws7CBMWDO43gIxtSh27Exn8QyNBFQFMFo3K2nkHh78rpaW8Kyb+AIdFYvPTqEVuQok9QjzdS lhfPBfBvaM= X-Received: by 2002:a05:600c:3b17:b0:489:e696:836f with SMTP id 5b1f17b1804b1-48e51e15718mr58381085e9.10.1778076379704; Wed, 06 May 2026 07:06:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 083/110] target/microblaze: Introduce common system/user meson source set Date: Wed, 6 May 2026 15:54:55 +0200 Message-ID: <20260506135524.20617-84-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1778076591751158500 Introduce a source set common to system / user. No logical change intended. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20260423100612.27278-5-philmd@linaro.org> --- target/microblaze/meson.build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build index b86b37d9238..7f7d27d4efa 100644 --- a/target/microblaze/meson.build +++ b/target/microblaze/meson.build @@ -1,5 +1,10 @@ gen =3D decodetree.process('insns.decode') =20 +microblaze_common_ss =3D ss.source_set() +microblaze_common_ss.add(files( + 'gdbstub.c', +)) + microblaze_ss =3D ss.source_set() microblaze_ss.add(gen) microblaze_ss.add(files( @@ -10,10 +15,10 @@ microblaze_ss.add(files( )) =20 microblaze_user_ss =3D ss.source_set() -microblaze_user_ss.add(files('gdbstub.c')) +microblaze_user_ss.add_all(microblaze_common_ss) =20 microblaze_common_system_ss =3D ss.source_set() -microblaze_common_system_ss.add(files('gdbstub.c')) +microblaze_common_system_ss.add_all(microblaze_common_ss) =20 microblaze_system_ss =3D ss.source_set() microblaze_system_ss.add(files( --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076556; cv=none; d=zohomail.com; s=zohoarc; b=DdnkqtAY01YI+778bxH5OgOiUQ6Zgwf8vVxxYq6REiZ+zjJvDXjtbS00UIVFlLgrO34Fl6xoH329yBvZ/GD81XCd+WOpUHw6qHeGubM2qKL6z4ETBI1MjjR0J787AaFWUhWJ1SyVFVrPluiQrfXrcQQ6SLvBnMeZQWgFYC3scps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076556; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=2EaMnP2+uXFrom5NkOg4tiM6HPN2Cv1EUyzsXJZXsUs=; b=LTU/8xOR/o13jQEN3fdSBxmdnr+fIG2EFNIwkf73bY0BoF+y1XU7kLXpaWNx0jKPhYhCmwjqMGeSSifBuzwSoLT1LriBbUf42gTCbrQd9v2/KmN62yysdRl8rcwsIozOHzgV1GbCy54vy2VhsTC+M4K6M00z64IUFdYjVO+0EDQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17780765564341008.3180127021272; Wed, 6 May 2026 07:09:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuJ-00082q-JG; Wed, 06 May 2026 10:07:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKctU-00066q-Vg for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:35 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKctS-0001ne-AW for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:31 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-488ff90d6c7so61636285e9.2 for ; Wed, 06 May 2026 07:06:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5311f891sm28758155e9.4.2026.05.06.07.06.25 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:06:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076387; x=1778681187; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2EaMnP2+uXFrom5NkOg4tiM6HPN2Cv1EUyzsXJZXsUs=; b=AV2HG9M78VqssaeQQgKxBYxpmyX0KTeAyhzYx0vcikLIxMB+zaSiXjrfx6F/LX8/k1 LYSq23mxfGjDOXa29dQ+oLvYu4u1iBbElhTT11S9Wt32rNjveDipfUdPL79Rv4sLxekW 7K4FWy4lhGAc07yX7CeBuH7QnkpLFMDrC1zsW5/S71JAKI7dRtl3LGOeRoO3d6bsc72T lCMZvGmp2bvCOoyIH8xYqBwOgQeRk1bUrsod8UcrXpy4Gc90Gb4TcDse7yn5Xd7fBNtq cmOSLw5Hrn+9IZHLN1pZg+9ZhZztunhW+Bc5OOxWftNebllwpEl4MSqfVBZh9L/v9fZS fowQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076387; x=1778681187; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=2EaMnP2+uXFrom5NkOg4tiM6HPN2Cv1EUyzsXJZXsUs=; b=tCp2ShHaIFJEBdMLmsB6jWZu4Nde5tQVIDhBxRNDC9XYh6ToUy/g2SDXKsw7WW57Tr 7QfO6/od/dJ7epcK6Z8uJrGw67g8tQBM/OBYaYU7OzO+E5ayMIYbRmVreEVGxEMmbxMl d98dPdUJnZj/fdSY8ql8ZdfIEuLmCFpaOcOtWWplIVv57LoiF/4qIkdrBlplaD9NW1w/ 0agd0sTRx73XzquA6kZe4EH1U3Ujmf8WYJVg6gpflmKxB/TiQROtSFuvpOZjQVcUYwJ2 C6EgiTnkm88iJr7K3AcVFIh8HYoeg5QTVsPu9rLfHzOqN1vremUp+mAeU009neFpUKw4 lV8g== X-Gm-Message-State: AOJu0Yw2gd6WPO8nK0wLpCiMLaahcSF0HxTsZcvysvdL+/RAed9rBpqz RZ2zwC1ZmklwT/wCi9cB/i4fqfU4wA5sIsr4PNEEIhyBSMT2QVnh4U4IhIRHLwR+d2oBaU+sCLL z7NHuBHE= X-Gm-Gg: AeBDievJyMe9Kv1MQbvZvykC8WidXoDjAGBcqDMsl4Nr6HG8y3ZWqvZBuvb9eRvayP+ dJlx7W2ZVXiYe4f3UA+NL5x237vXkuwkJ2U8JFZbiZ9cO/hglWUMUlHXDCcjguY04e6mPgWUhYI ICW5r68EAcPvOqexDtHspw38zJUC3IhMAYZsCNa+wv+x1f4euQWSYz492D7WTcCCXWCoBmz7A6A ErCTkGLHr4+j1v9uFDuKjrS/6GzouJfM3fxUYfnQlq9TJeR97ygqQ60wsHE+g0QUqJNtrko5MEx bjVdtiaIr3Qeb2L6DWCG78ztUfcdPbCPExJqlIxNv2rGaTfjkvKBkvz3uFyjIHkEufZlnD2OM/3 okDqYQV5pqG8uHfruzexAvrybE67tZrq0myjwp01K5XZ3vnHt/yFciAenUJUdNhKSDFsbY+xGMn tVEItwaeKztQ8vmmLxjTy748Di17udBKrzyZ6XFtv7I8CD5YP2Yg7i1OUWIQG0N5UU9Cr83x0E6 5dL5ezUZbs= X-Received: by 2002:a05:600c:1d18:b0:48a:8cb6:88b9 with SMTP id 5b1f17b1804b1-48e51f44621mr62106925e9.22.1778076387447; Wed, 06 May 2026 07:06:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 084/110] target/microblaze: Compile helper.c as common unit Date: Wed, 6 May 2026 15:54:56 +0200 Message-ID: <20260506135524.20617-85-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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: 1778076557973154100 Nothing in helper.c prevents it to be built as common unit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20260423100612.27278-6-philmd@linaro.org> --- target/microblaze/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build index 7f7d27d4efa..94c76de39bd 100644 --- a/target/microblaze/meson.build +++ b/target/microblaze/meson.build @@ -3,13 +3,13 @@ gen =3D decodetree.process('insns.decode') microblaze_common_ss =3D ss.source_set() microblaze_common_ss.add(files( 'gdbstub.c', + 'helper.c', )) =20 microblaze_ss =3D ss.source_set() microblaze_ss.add(gen) microblaze_ss.add(files( 'cpu.c', - 'helper.c', 'op_helper.c', 'translate.c', )) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076478; cv=none; d=zohomail.com; s=zohoarc; b=ZbG01qbt7Oh025m+Lv26vxjA1qTvMiNCSTVRygGRZPI/RW38smyrXWXWrY0J115qMduJ0wcArW+CzrkV7e3fAmb989GuoV8B7sxLJLX3erBFTldp2klxOiz6uHVlWwLgFqfPK52P3z+XQ3i7rbShtO23qoV+m8jDKN+q19z7ZFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076478; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Ox57tRe7cloUuWsftSDPkfC9DCnim7Tis7+4yAuGV2Y=; b=VMakn1mUMge32IcdyWcMfnEnec5bfXbC24QJgdpWU+onbDDdh2YIS1KeMumWbGi1YeoUZwxEKCAjlZBeIODWWSY9xnsjONnnh/H0SM9+eJJW/C9+F2AjMa6juaG8Ft9AGmJn2Bhx440zKNtq/Gko8dN0h0VHxGV6Vi7Ir6XGg0k= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807647853844.24828536819314; Wed, 6 May 2026 07:07:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuC-0006ti-6o; Wed, 06 May 2026 10:07:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKctd-000677-H1 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:41 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKctZ-0001oV-LY for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:39 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-48909558b3aso71359865e9.0 for ; Wed, 06 May 2026 07:06:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45054b02c5asm12749011f8f.19.2026.05.06.07.06.33 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076395; x=1778681195; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Ox57tRe7cloUuWsftSDPkfC9DCnim7Tis7+4yAuGV2Y=; b=VPt2SVy57/BvWuOAQwXlhXSPEMd6dweLRZuFEFo3040mp2/NIJpJpFJDynqB5kqibb rAUrSTLUGvJ/CxlgklkAw0ruPZ40voVRRt7q7LCvb1QQY4ZIxtQkWhi43HzD3jL2aTUi RBEey6NCR/beZIbJ5cYPCa84wGFhOn+S0slMNLIung3LfgKk4An9UfZA0nE+CehQurED CtZTzY6Xr1ritxg4io01BlBN2Cj3WF6ZmD/thjoQm8lLLYYWYQVRvm1XNhe2oL3L7BGD 7fXbMubTEZ6a24jZ3ZmtfgVDBKt1zTc2fEN+VzDcLA3BJ1HUfaxRyc8DlwtsIDxVtd4+ ZtEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076395; x=1778681195; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Ox57tRe7cloUuWsftSDPkfC9DCnim7Tis7+4yAuGV2Y=; b=nvlpaX68nZX5JsU89IhdBj9QduaELrxYjPmEN7NeH6coB8+jFujbGiBH7otSrSFOnZ 09b4Pyn0rZGj3FSA8Qq5Rkxh2Vh3zucVlrUZt8pgndx+SjnOvfGzdgfLiXkKI7cfxyaK GnYMyPUV0WWyG1MIjuOMLttb5OcNe7vFM+ym3NnwSwekED980NwV1KAc8sq1lF5wAnmL 1xq/jKFQuYUeWpbVyWyjsOHSLEcr9BWaUSXCCvykOgFifGhSYKCqBcYLFowdso4FbxbS 9kbpgEeSIK5az88KmppisZdv+vp+7+G8Qplg6InFLGoqe+Chr5hwk8rEMH3rXIRHL++z 9rMw== X-Gm-Message-State: AOJu0YwU5g8al1zLadlyQe9DjI5AEs2UcW24NmeR/ZC/fU1Clv63uqeR PSOT4fZdjllCj5cKbSWPUKkRkE4pyz8Bj6X0aHTq8A7WEHoQf3S9GJ61RihqOytVmltO9P3X9kf 8gNGelKg= X-Gm-Gg: AeBDietZEaV6ttDOLY3Zd0TEPBEiIMq3sWMdf1kILCZpt2BYmAe8bw0e3otVgaFelv9 ysNAifDSnVYgyekRdbBoMRA5D3GI4DrBKr0/Mrs50cYNvm+JcYXtc8HF3Oln18RWB84qnVdRuek Inx9oyHJmXCneD69GLnGDbcDO6Aqa2IdgaHZLP2zc6wcwdcYjx/REp008je7nlluBwk0vuuf0WV IJFSl3agijP9fhj6nAQaL9AKxEYAm5jcJx1ebT3v1p5tvQslgbGReXe4NwIFTYPCL2qZfqj+7AV ZBdrgklLraelAcjghWZxeSdzWJjzYfTmHEzvD9gyXgxDFZF2g/PQ6RP94kvnTWEYg9qULzwg3cA bIRUrxP2+ORsV98jRPfc0A3egM6EheQJqr9vyxzqmGenOjwVtbe1KcUFCtCzilu858cqEq3W8LO UltL0290nbK6f7Xn/RfH1K7qhDIEyLS2HRotfw4N9gNvfzzzMNuDSLSV21jBwHgYlxiYx6PtbtB gPgt6ZSJVg= X-Received: by 2002:a05:6000:2dc6:b0:43d:740:fb37 with SMTP id ffacd0b85a97d-4515ce1c977mr6306917f8f.24.1778076394862; Wed, 06 May 2026 07:06:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 085/110] target/microblaze: Compile op_helper.c as common unit Date: Wed, 6 May 2026 15:54:57 +0200 Message-ID: <20260506135524.20617-86-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1778076478920158500 In order do build op_helper.c as a common unit we simply need to use the common version of "accel/tcg/cpu-ldst.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20260423100612.27278-7-philmd@linaro.org> --- target/microblaze/op_helper.c | 2 +- target/microblaze/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index 31da2c7c3ae..84c60c2636e 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -23,7 +23,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" -#include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-ldst-common.h" #include "fpu/softfloat.h" =20 void helper_put(uint32_t id, uint32_t ctrl, uint32_t data) diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build index 94c76de39bd..add3e6ca9f9 100644 --- a/target/microblaze/meson.build +++ b/target/microblaze/meson.build @@ -4,13 +4,13 @@ microblaze_common_ss =3D ss.source_set() microblaze_common_ss.add(files( 'gdbstub.c', 'helper.c', + 'op_helper.c', )) =20 microblaze_ss =3D ss.source_set() microblaze_ss.add(gen) microblaze_ss.add(files( 'cpu.c', - 'op_helper.c', 'translate.c', )) =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076591; cv=none; d=zohomail.com; s=zohoarc; b=G6ME3eGgFv16wzS4yLiHlZTaR+zhyVHC+sC8TvpiBgUfUWB5jOEYD6pXM1bIm/4DlD/mC+lIuy5UCn1HLaRzJ8XZckQLpXDlohGUe/Js8nMtqkaYm+OIlsaNja9Cq5xZumTY0EVzLFG2ytw8A6HHcJV2CpyVa+RAylK3IINcJJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076591; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=oLdAnvA5IV4NNKrgMoyQHaW4IfTpZPSlRBtPBQoOFMA=; b=mSSVUe3+Hbin3Es9L2bVCW4SOFb4+qAzy8LoLHj3y5pbn/rPYqwdvzCQPKyKhD4RJxg+9jVcuNkg28nr1ytq5eW4/BJ/bHE67TRa9eTwaSuLOWcfbAYcwRva0nQvu+EVu8MCkRnGIJh3Qf1Bb0mjK5AFP8g4Wuh52C4x8MCGwps= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076591072258.31007017837896; Wed, 6 May 2026 07:09:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuX-00008x-PN; Wed, 06 May 2026 10:07:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKctp-00067p-6I for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:53 -0400 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 1wKcti-0001pw-QV for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:48 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so72974305e9.2 for ; Wed, 06 May 2026 07:06:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538fb19csm47192005e9.11.2026.05.06.07.06.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:06:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076402; x=1778681202; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oLdAnvA5IV4NNKrgMoyQHaW4IfTpZPSlRBtPBQoOFMA=; b=myzyLFncYZap+heo36756ZJGCihqfkoYMSYcNh4cJVbGFhZzcK0qJg9Tc9B7hGInsh qQojQ+GDufhnjsGspE4UXqORFnt2/l2c5N8oGM/y1ZokM7ENGsi9yeq1xwu9VL8h3a4c 1PNDPCrsdMno7NNyu6BSoU4j7/lYd6z2S5BVrEUUL9XqGwVDg2Jo2Md5lFdnoC9gI1uv FnfszjqaIGqd5r95LUbrWX+MKb6CDtlHy58T3N49I9yrFGMtLA9PLpB8P9v4ya4o4lkR EmFfBA/oryZjV7CvQHmggd2Ucs9YG58+W3u2WW+5NTluziTPU7XzNgzLofbCzKm5mVIi VrDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076402; x=1778681202; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=oLdAnvA5IV4NNKrgMoyQHaW4IfTpZPSlRBtPBQoOFMA=; b=U35gtxJ3xjTtTFkxNay7C2Dz3aniH711exPC3bmcnyGqnQg/ovUdHEvHxb1asMEFdZ Py07L86Pcf/oJct1otE3s/4WaAPP+zCJgFvfh3NhzlRxLAmYqKO1t4iU0hK9Z7q0gXJk bEnPLJAfLGozLzevbh0KznSZ1E0B8vxpHjphHvQP+Udtef56dKAvWffuvhZZpOMhMQut AuQWuZyUDEhzfuTFc624NRajrXVZASOZ1gmr1LxaHVKX7yj2EOa4xFnmP26KV6QLZ/VD rinyp4gYs70WcIdXa0erU7V+mBF1AxDsoBMtLJBK0WyKkm7sq3bkFpF4sxV2Zj+5yGCr qStg== X-Gm-Message-State: AOJu0YzGKHWJcjseyJ1uKKSEtqd88/q31u7G1WoKdyabLyKEOCg3qRsu KFLV8T7jzcZQQos6BDmKhAlIwbcNKtNTUsQsd2jsuzKXDtpFkB8fiKz7wPFPXRzinUJlygrwIAo aaD3vmC4= X-Gm-Gg: AeBDietTCykehTKeQ/pTdM0UrbSDCRj8QNtqvXiIPScxmXRGe5vpY3gKwMgEj6gaN9I YKm/rtq3nfWUYiFA5ZimKJGWDipjOetoJEKE221NDhpJd/rfSO9AjG5v+2KtWj9A6jtLBBtGRrw GFsFn0AZAKyTQQ48reNunLKYYI1/X7XubZxGSNVR4b8l2zi1h+DyadD9QWrSIttusK6rg5ppHnv tiKi7wiLi2eg5jUSB3ZEbsG/YqjpDN/dl8H9jd/1RdiX/RS7tYQbGbZNDiUK0kccf9ektfZrcln FZq5qIHNWH1IZvJTLQKzWSMpJ0l7Jrrg2DRUmFYiV20tZmCjaI0epHpWHkOazosq/hpp5Kt+I6v QptgBBbhvE8Y0ejh5rlkq3wUQvyiSilGU+ZeWgzG6iKtDdaqVcpDn7tsDITrXmb7S2a/dAhkSxH gG9t/Vk56t/fRoV+HMPUvOgdn8VhCOX4q5sGJf0VB6TaAJ39cAzsrLXFgDQbRh84aNnzRIuT9H4 3tBCXWFCT0= X-Received: by 2002:a05:600c:871b:b0:483:709e:f238 with SMTP id 5b1f17b1804b1-48e51f4652fmr65261695e9.29.1778076402189; Wed, 06 May 2026 07:06:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 086/110] target/microblaze: Compile cpu.c as common unit Date: Wed, 6 May 2026 15:54:58 +0200 Message-ID: <20260506135524.20617-87-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076591748158500 In order do build cpu.c as a common unit we simply need to use the common version of "accel/tcg/cpu-ldst.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20260423100612.27278-8-philmd@linaro.org> --- target/microblaze/cpu.c | 2 +- target/microblaze/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 639f46b525e..04d31536888 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -27,7 +27,7 @@ #include "cpu.h" #include "qemu/module.h" #include "hw/core/qdev-properties.h" -#include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-ldst-common.h" #include "exec/gdbstub.h" #include "exec/translation-block.h" #include "fpu/softfloat-helpers.h" diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build index add3e6ca9f9..2ce50f35397 100644 --- a/target/microblaze/meson.build +++ b/target/microblaze/meson.build @@ -2,6 +2,7 @@ gen =3D decodetree.process('insns.decode') =20 microblaze_common_ss =3D ss.source_set() microblaze_common_ss.add(files( + 'cpu.c', 'gdbstub.c', 'helper.c', 'op_helper.c', @@ -10,7 +11,6 @@ microblaze_common_ss.add(files( microblaze_ss =3D ss.source_set() microblaze_ss.add(gen) microblaze_ss.add(files( - 'cpu.c', 'translate.c', )) =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076493; cv=none; d=zohomail.com; s=zohoarc; b=EwqaBu3ukMcPJpFFbkHZ3iIfC2fRwbuJ/8SokKetIPOlicNYWl5ee0X2PePmgCQbrQiVeEQS/C7zfl7td3f57NTNcE5DUNwEAVeiyjVJgWb3boU6T6tbfRxDRL98NACoNndtHhBlCFgKkTLTScM3gcDt7LfOIatA0jLpC/LwYMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076493; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=a5iXLQfpWOvAV/UnU8NyG6xn/W+EexUkBDNhnuMTiJo=; b=XgTZe86xY3E14gyOJhswt9B+SqlrT3bWRnFarWONjHTWIGeXcRLkExEHinqGxD1b5DwT5SS+mCYJlVlZuWd3/rBedf3a37XVcpl8GXVbkARQqy7KEd8HpjpbVSvE0T2GStobeb+XIWL2knzseCZ/k/Ws5XLVu++wQjo+l2MkQVE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076493119518.3024615078649; Wed, 6 May 2026 07:08:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuC-0007TU-KX; Wed, 06 May 2026 10:07:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKctz-00069A-3r for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:04 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKctt-0001rU-Us for qemu-devel@nongnu.org; Wed, 06 May 2026 10:06:59 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4852a9c6309so53014675e9.0 for ; Wed, 06 May 2026 07:06:57 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538a50d0sm83933145e9.5.2026.05.06.07.06.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:06:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076415; x=1778681215; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=a5iXLQfpWOvAV/UnU8NyG6xn/W+EexUkBDNhnuMTiJo=; b=EeGqHT/naRydgXXjLfOBEuu/W1HNACH7ZLXna5CVx2hCjXcrCKd8pPAzugGP8l0DyX UoO9welkeYQrBwBJS+Ezso7hC3XOr20dN2oJxbDfdlnxfjygppsyK5Imf0f5ACHzeFXl JBZ4sR5wm3BM60tbrbqXIR4hGheVsFOmel3R5b5R5iuxEdsk7UgOyVB2S2EAGbdO5p9N vRYd9uaUqQS/OWvvBOZgpATdEIXTDjAlLeQuWJM9G+Q0Jh7orwxOr+Uhyc91+kKDsXT3 74cTmmX8mBT9z4CN2at/xXOldrtzXsNCg3sCRrlHLiLeFXhT0mRtgLvu0VrccMZIByHM wRBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076415; x=1778681215; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=a5iXLQfpWOvAV/UnU8NyG6xn/W+EexUkBDNhnuMTiJo=; b=pBLtkFsIZe1t3bxiBZ2KdsAoKMzqo68CXyq9z0D9vN70PG86yVeW4vhEXGnVEKRwXS 4vFN7iMN4pxhFOEUxtz9AYLqkMCDPH3xfI1SSQUBZrlx9ayVE6OTph691cTpdErQzKCQ A8yiap6AJRkR15aA+tgmTPlq8aKkTlavuVpPyAu6tLC59OaDr6lxovqW8hoa7PVcZBGj rRJoeOHBBjNhSmvPeuEewGcr6NRgCdYgniD7r0xPswh5zTSgVqLieQCkVRtukXcG/4D3 qzthK6HkP6Rn2ZmsIWWcfv1EYkosTOJje5fcg0wRBJTp32ZQmY0bc8Cx71VhDNVG0ZFg 30+Q== X-Gm-Message-State: AOJu0YxkzPoHDwg+oTGV8PhGN/QsKKLUR60WkChBStn0Peve7S6A5EgN u4qr3N4ffYONfxuGIjcXmCz2IfDeLGWXLDgFh4R1OHq1kyvyayMzFEgDaGmIrGA1fW+8yhoosYp mmkOYyvM= X-Gm-Gg: AeBDietfTRC5ETTRnG3O84k4+H8X2HRQ/GcAd1yboNNdEWc4+uRSPdfg1uAqsTrxsWG 46lgov4XS6zWxbiga/9Ucjhq3vDFhLgSMsp0BqMxohoNltXdw7+XEI72GFhdRz1+tBufdXXPxfK sMdk0gscGwcuH9DYmSq2m9/teTju8XuCXwKKm0sLCxqqYx5rHmyEBt4TIYe+HhhPq0Fjdaa3u6Z Ikz3OqhPWH7Toq/RqEz1CsW3Z3GRgZHnr/h6oCqon0Y5BE9aixpS/sdJWI6Q58lamVhQYoQtNGd fb3e/2xpyycaaHp8eCvh3uHt/22df9K/C3TNGM30FdgtuosaYs6u5enaHngxYIYauSTB3ZW9jWC YQ6nz3vKhu1hgH4cmSOQMFFSWm95bsyKt2C9a0Y2Egggw82iOmkYcPy0xCCjueJT/+mQ/JPJc8+ K8b1Dha5rc+Txoq+QBfDe5u9DXBridp2pYIVokwoOoXkeVhg5JG2pSxBRe72jUhsbDBq9eYlaI8 uZyBuXLqIbrUREqjvi7mg== X-Received: by 2002:a05:600c:c094:b0:48a:8b02:ae91 with SMTP id 5b1f17b1804b1-48e51e20638mr45155475e9.11.1778076414595; Wed, 06 May 2026 07:06:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 087/110] target/microblaze: Include missing cpu-mmu-index.h header in translate.c Date: Wed, 6 May 2026 15:54:59 +0200 Message-ID: <20260506135524.20617-88-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1778076495033158500 translate.c calls cpu_mmu_index(), itself defined in "accel/tcg/cpu-mmu-index.h". This header is pulled in indirectly via "accel/tcg/cpu-ldst.h", but since we'll remove the latter in the next commit, make the inclusion explicit, otherwise we'd get: ../target/microblaze/translate.c:1620:21: error: call to undeclared funct= ion 'cpu_mmu_index' 1620 | dc->mem_index =3D cpu_mmu_index(cs, false); | ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20260423100612.27278-9-philmd@linaro.org> --- target/microblaze/translate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index 8fee5dbc337..bf8f864c324 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-mmu-index.h" #include "tcg/tcg-op.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076592; cv=none; d=zohomail.com; s=zohoarc; b=hHbrBNsLHWqtUT5DRUOBXJtgFtcKBSnlclLZ7m947c3cUolRufNqeMmawvBit9hgkPkyGRly8AtehVPa4UNg85OylXT8jknWVl2gS2JWcEv9O771KX8Dh7KJkAaB3xUtAbRqsrBMD3USt/ebgsPPwtS7SSTgrEf+90dugmU9i2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076592; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=He5fI3HAK0zWkP0HykCz3DzGEmI9iL9vOVxmp5oEXGk=; b=mVLdyomv4svVe5pnMkXScZk/hTizlg+yPgOOM0lfqJvgjB/qJlTQSqKn/4K9gMg/7CiX4mDP7mDM7bU5yDzRGGlrAWYs88sAMN27o2OUBJKRXBDbW7SeCpE834HDEbYSo7DTXj2I/95R8JFjpU7t3sxU/QHVVsNv9eDyDIrtvPM= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076592187935.1959010791215; Wed, 6 May 2026 07:09:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuY-0000BJ-3V; Wed, 06 May 2026 10:07:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcu5-0006Aq-Py for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:10 -0400 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 1wKcu2-0001s6-4i for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:07 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-488e1a8ac40so63789985e9.2 for ; Wed, 06 May 2026 07:07:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53891d62sm83626985e9.1.2026.05.06.07.07.00 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:07:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076422; x=1778681222; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=He5fI3HAK0zWkP0HykCz3DzGEmI9iL9vOVxmp5oEXGk=; b=x6Mbx5n3gsxh2Nkt5GpPPmQBLaTYN7F5VOkcCJmDka9JLNC9ZKe8yvao251hZ04jGR UKPrO2y3DoHyyOfiCq8IhCqxqL6djwRCbfGJ08FRMd0MijXPfTjSpVNYVt8np8iLloZE uVTfH//V6oSkzyhVK+G3WemRIgYFpj7fP99f4ulkLA9ntr8PY9ZYaYJJuVla/VpH0yOp ESUQyMoGBpiRu16yEp0e0XLAOq/J9Mh/6hf5O3fGSekfs58jnLAcWbPizrs2pT67Qfxp OhXw0zke5mUO/QBjQsOPzVSupPOROHfdw6OqXzc8dDKY+JUZskEVNhQ8jTZoRZXaUas6 l9vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076422; x=1778681222; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=He5fI3HAK0zWkP0HykCz3DzGEmI9iL9vOVxmp5oEXGk=; b=RqXJsLs7hOaOjbwWbPcnooxtuhUL7zjpJsBZnzc2tc3uMS1Fux6Er/rwp/WcCQcCAP 1Ed/MsjEv/+1KuDfV8Pxio6mnQF7HkU0hKtvOtvpmk3V+7K8iTxZuam2YIdNaqYcUFjf z+E5yU+Bq3d0T6o6tRQl1sg5gvTNjeJE+YlsYju9vfkr9DhhTRiRGB5hJw91vHnjFjoN qAwwk2jjdoTERKcxtvltCCPpKvuGhGaN221cAhcg787Y0k8l1cjCzqhCvglfvvlOKhCn q1iFPJTN5xJkRX0rM9JLPACipqQXYZbDtZlWzZaXCL/3uWUNxJJ9GNFd4XKpHg8Swg8/ VapQ== X-Gm-Message-State: AOJu0YyK9Af7Z9WuyfD+lb7f80E5Huf1rlAGvWJILTBtg0jf1F/pCb0D AXTd9bSTzjbHHLtmSwsIav4vWz4SGlAYAtvxT3gi+Bp7YKB7EJ+mdRHYbR2YSr4UJW/Eh/jRWqS 0138Mw20= X-Gm-Gg: AeBDiesVprTmgMP/EWRXsbW8vIAHg6iRm4YMqLt6Y/wWYtMHVlCGvHcwU1YYbPwXSgT iYOBFLtf6KolGF0xwGEPeGco5FcWk96VmanXrz79+jpDiZfcEEZ+s75mJ/+O98H5PbUaY8LLdg9 6rW6dMlfWg+lbYtqcEKc2Fy9+JvV5N/Ah0zH0kCVUAqUvlJkH5zbuxtfI1MvIK469joFA5IP5jr W32eZJT6U57Pu0gUcoy1D/W/IjBhoTCEm43RA9QqtCO5I3N9aLU+VLurp9o1cvzg7epmsA4wuBY HmTZuJBpd8/74wK6kZbsG60j1fWGW8PyYAtAUnNarU+4RWcPJEOow4KUuXnWp9YAlSSG1s4R6b6 0sS0xNFrcsHHT9Xr6pCBk+WcMpXiKueiiB9qpY1lEy72rlkisKENL202j/tUa4Bln8wfhtLrhsS KbIYIZoZwKOTol8tU3uPJ2EHPkJ6AZ8aYn/hzEC2Hs5nabtARMsaia/rJen4Ttv245IwMMmRtOl WWaEj4xk7o= X-Received: by 2002:a05:600c:3b96:b0:48a:66a8:9981 with SMTP id 5b1f17b1804b1-48e51f55272mr67269415e9.27.1778076421907; Wed, 06 May 2026 07:07:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 088/110] target/microblaze: Compile translate.c as common unit Date: Wed, 6 May 2026 15:55:00 +0200 Message-ID: <20260506135524.20617-89-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076593760158500 In order do build translate.c as a common unit we need to replace: "accel/tcg/cpu-ldst.h" -> "accel/tcg/cpu-ldst-common.h" and: #include "tcg/tcg-op.h" -> #include "tcg/tcg-op-common.h" -> #include "tcg/tcg-op-mem.h" taking care to define TCG_ADDRESS_BITS, which is fixed for these 32-bit targets. Remove the now empty microblaze_ss[] source set. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-Id: <20260423100612.27278-10-philmd@linaro.org> --- target/microblaze/translate.c | 6 ++++-- target/microblaze/meson.build | 7 +------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index bf8f864c324..74b5420ed24 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -20,9 +20,11 @@ =20 #include "qemu/osdep.h" #include "cpu.h" -#include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-ldst-common.h" #include "accel/tcg/cpu-mmu-index.h" -#include "tcg/tcg-op.h" +#define TCG_ADDRESS_BITS 32 +#include "tcg/tcg-op-common.h" +#include "tcg/tcg-op-mem.h" #include "exec/helper-proto.h" #include "exec/helper-gen.h" #include "exec/translator.h" diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build index 2ce50f35397..9c1ecd1cf1c 100644 --- a/target/microblaze/meson.build +++ b/target/microblaze/meson.build @@ -1,16 +1,12 @@ gen =3D decodetree.process('insns.decode') =20 microblaze_common_ss =3D ss.source_set() +microblaze_common_ss.add(gen) microblaze_common_ss.add(files( 'cpu.c', 'gdbstub.c', 'helper.c', 'op_helper.c', -)) - -microblaze_ss =3D ss.source_set() -microblaze_ss.add(gen) -microblaze_ss.add(files( 'translate.c', )) =20 @@ -26,7 +22,6 @@ microblaze_system_ss.add(files( 'machine.c', )) =20 -target_arch +=3D {'microblaze': microblaze_ss} target_user_arch +=3D {'microblaze': microblaze_user_ss} target_system_arch +=3D {'microblaze': microblaze_system_ss} target_common_system_arch +=3D {'microblaze': microblaze_common_system_ss} --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076702; cv=none; d=zohomail.com; s=zohoarc; b=eSW2uNXfTS2G3uc/wt6vpArvamYrJKyNNijnkk37GzyHYhNmXDOF6IgB+uQj4om653ovyaaZ4DvtxcVgxfGqTfiBbJyjix06LcnnmH74XR+ZpLM5PV6h20UAGmzNWolqrO1ouZiy1Uam84u4FdlqTYyj0cc8eYweaUCpDjk/qbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076702; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=dOa6f8yuz5bo2eIZzKe9+Aig/0vO8+i13l4uPJEsyUg=; b=mDNkPwXXnckk3WLz0+pzzxO6nbqt4XqzQ57x8QBC+qrc9B1B7MyjbLmNtq11SMnvlW4CHmJ4/LgVMShKssSwQXcsbNoZ4TXIqVxrFp2uBdu9Ch5w2OaRHTIhCvlziPDtfpiOXBXUM7BC1i5nMSqTPqKewN8ceruhpy4xIoaj1Vc= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076702446314.30046166803766; Wed, 6 May 2026 07:11:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuN-0008Gy-3B; Wed, 06 May 2026 10:07:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcuB-00070v-0N for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:16 -0400 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 1wKcu8-0001tR-Fs for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:14 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-44c350a5b87so2257770f8f.3 for ; Wed, 06 May 2026 07:07:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960022sm12843724f8f.26.2026.05.06.07.07.07 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:07:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076430; x=1778681230; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dOa6f8yuz5bo2eIZzKe9+Aig/0vO8+i13l4uPJEsyUg=; b=qqvY1nhb4irpatC3f4bFiZpJuTj2NLT38jZ6cqYgGa1ol5P+U/XchN/h3Y3COmFc9R uvY0tQ2cK9HhgWZfc7zuFV9UFRYs/GjsX+0IGxF+1kXxi3FwoTWUIrCW6lbNASY1U62p c60gw9hUJI5RogkHL27oW/hKSX3LHnjUPZaqkX14ltX3h+HBrqj8eXOpQkS9MpYrGzAY pynAkXGW6QdDjQYi82Ue7Wh+QbGlJvfBd6Jx7wZFFuzxfzkuHNfKGgnWdRpLa8dM+s+J Hn88oKHyJSpvaYWmVSWnNbmeUviUI/tG7TEp3lW85A7zBn+Vl0K8AIBfC6JkcuqnPx0E BxlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076430; x=1778681230; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=dOa6f8yuz5bo2eIZzKe9+Aig/0vO8+i13l4uPJEsyUg=; b=QDL8732HVXoPgVtLgseW8Y/ZQ1YSetIuFuqFKHhFROXi4f/vCmW20Fcpk5lKk9Tsl/ E3GWknUDd3OeqdkDJ/2bYGoJ7t6zf7xIP9dU89TsDCluz95qw+gfxQBPcM9jvGYO4w53 GiecesTwhXEWXcg/fA7vs6tnJqISyJ4ra1X7H828ScYUqj4s6iSqVntgK6ortQjS0UHP 0+2EwXIzB9yGJAO+hSvhBRbd06MNP2trm6y0MTj5bWAHDgnuplCPXkXqzuytdwV/aJB2 CWw7HG3a72rsWWZ8/bZBgKw+0w6fIBl2Y6bJsi2LJCia1y72K+rMyxrJSL0O9MBdvf6p 9TVg== X-Gm-Message-State: AOJu0Ywmi2Cg4FPTmx5I+5KrqYzTVSoSC+gB6od0a9kRLBwB54ykdgJm 1f3kQK4mz/wbujb1dq0KaCjQSz6B+NeZuGYSVEUKNwqLYL8MvHY3cKKukx6MIL4DQsdrTz/nItW +y2MBOqA= X-Gm-Gg: AeBDieuaIQ3ZCMZT0WYnzpQTWorcC6d9K78Tcj4d2qYiI7E1UchQcZ1xDfA6M/szHB2 uFmQRUIsflVTqrTTD+C2QiKLmWLyPuhR0SDl0Hvpi4BFCnbiH5SAa5usdYYBTUbeIl+osEsCSvf J8Asp1LKSTmCELZCZFq+iQt0G6VRta+Ma1iwsb+SNrHWSuPf3VOjQy4SVYNEqHxQ2PDZy9pfPbW WlJ3ENp2fh5yTH5Sl3BikPAMxlDf7Qy4/0Ff0rjbgBJFxAGF+q4x/iYhzlOr48kFgnNGVZHeL5s qVn7l9GnkHYbvAKBuF5CZl/A7cbtrCrA7IjzAmqyIdHSCskzq+elg2i4zqPcnM/1k5B93+15Cre UztxaPiDCf8wIvLMg1e74u4TV5EmIJnUo5zooTFa8sUz/ZOZeSENQiLP7i2myCfEdUXHPLkbzHB jS3tAv5CZimWHtPIBb4ucl22YNMG7XASBR0OLf+JTTasMyGs/9h3vAgcW6diEvqoFlWLtk4AazA KF0ZDVtyQpQC6KhmoLD+w== X-Received: by 2002:a05:6000:40da:b0:43c:fb48:6856 with SMTP id ffacd0b85a97d-4515ad7678fmr6969865f8f.13.1778076429594; Wed, 06 May 2026 07:07:09 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 089/110] target/s390x: Introduce common system/user meson source set Date: Wed, 6 May 2026 15:55:01 +0200 Message-ID: <20260506135524.20617-90-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076704530154100 Introduce a source set common to system / user. Start it with the files built in both sets: 'cpu_models_user.c' and 'gdbstub.c' No logical change intended. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich Message-Id: <20260423135035.50126-4-philmd@linaro.org> --- target/s390x/meson.build | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/target/s390x/meson.build b/target/s390x/meson.build index 6f98ce34d73..44f58ac2919 100644 --- a/target/s390x/meson.build +++ b/target/s390x/meson.build @@ -1,4 +1,9 @@ s390x_ss =3D ss.source_set() +s390x_common_ss =3D ss.source_set() +s390x_common_system_ss =3D ss.source_set() +s390x_system_ss =3D ss.source_set() +s390x_user_ss =3D ss.source_set() + s390x_ss.add(files( 'cpu.c', 'cpu_features.c', @@ -15,15 +20,16 @@ gen_features_h =3D custom_target('gen-features.h', capture: true, command: gen_features) =20 -s390x_ss.add(gen_features_h) +s390x_common_ss.add(gen_features_h) +s390x_common_ss.add(files( + 'cpu_models_user.c', + 'gdbstub.c', +)) =20 -s390x_system_ss =3D ss.source_set() s390x_system_ss.add(files( 'ioinst.c', )) =20 -s390x_common_system_ss =3D ss.source_set() -s390x_common_system_ss.add(gen_features_h) s390x_common_system_ss.add(files( 'helper.c', 'arch_dump.c', @@ -32,19 +38,14 @@ s390x_common_system_ss.add(files( 'mmu_helper.c', 'sigp.c', 'cpu-system.c', - 'cpu_models_system.c', - 'gdbstub.c', -)) - -s390x_user_ss =3D ss.source_set() -s390x_user_ss.add(files( - 'cpu_models_user.c', - 'gdbstub.c', )) =20 subdir('tcg') subdir('kvm') =20 +s390x_common_system_ss.add_all(s390x_common_ss) +s390x_user_ss.add_all(s390x_common_ss) + target_arch +=3D {'s390x': s390x_ss} target_system_arch +=3D {'s390x': s390x_system_ss} target_common_system_arch +=3D {'s390x': s390x_common_system_ss} --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076488; cv=none; d=zohomail.com; s=zohoarc; b=EeTIj6RVcJx0LCMhZeUaUKkXUYDlY6+scli7dvia5jfJsCTyU1O9b4jJu5RGgXEDtEypaLVKFqsC/+dt1RysfVhCwGNv8xkYvW3BylDBb99FUJFgmdBKiiY0YBgkvDLIfcbiqvsfd8qoiJQsPxDp3E6jZBz0jVMYoZCduS3TXIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076488; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=tzTXng2eGHvdBSlbAlW/K/vbtwAgahERdYZnQaXODMk=; b=Hs0cfJqbjRl9aYsKkCtAq+uD33W7S5Vn9p1mYP03mNyuvrrk1RN9IXlF+F6Uxnhe4MEoy9eGu3dMnB20wdBbSn/Y5//pK5zO8+ldDKBCTYYnfGuKNYmm6QznaAp80w9TlNw7Z5anCiQojX5eJDab4avfpQujGYaWeIJWGa7u338= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076488653331.38676768940593; Wed, 6 May 2026 07:08:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuk-0000ON-SN; Wed, 06 May 2026 10:07:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcuK-000861-4w for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:24 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcuG-0001u8-KT for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:23 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-48a3e9862f0so7247085e9.1 for ; Wed, 06 May 2026 07:07:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e530a67dcsm27577715e9.2.2026.05.06.07.07.15 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:07:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076438; x=1778681238; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tzTXng2eGHvdBSlbAlW/K/vbtwAgahERdYZnQaXODMk=; b=iQEadZaw8dneZM78KLRoreBhA+dT2SxOzyVMdFM6Ql6va/dKGi/S7WD24SvA3Mjst8 pxqawy7tZ5/ubvSQ/llfkNKdqxDDiMFC2ayD3MwFmcFaWkhHR029unkAM78Kyp31USZB DmF0vdH71FauCcjM7yo7idSJFlbIWyi9e8dT4jDwgn2y1BxLLKR907j7Zp+wtWoHytO7 AeGxGUvU14xMA7unNMvna+yQvP9qqIPjBCVtsQZl5JjPPFKvXCuUeV+yeaLKZSECKbvY lezpRqKmGhe4hVvhLFyfktITMxeVoepjsfiEYr1ER0WV1rw2DkYEEMbHHGqmlLgDcuOD ecww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076438; x=1778681238; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=tzTXng2eGHvdBSlbAlW/K/vbtwAgahERdYZnQaXODMk=; b=UHrUqru7jIajSie6b4Vn33UFTzNv03QPIhe0Q16bI0Pv5WqKW3QzsWLwHb/aPg0lFT DmekQqYH3OtxO65IbjCxg5OpZxIATiX6UCpNASnSSucgGaUQf/Qb3edJLoZPaDWtotPX Qh0Tpi6xalpKhB0gv9+/uvQsQl88z3McJs60zTLu5jGpmmcMNOtLfiTGR9qcCxkTEA+x DutpwUsZWACncwS0qL3zyzO8M+l08VdpT5b4H4wVMjXJ3e22/E3QJK/58k818RKpehSZ wuV6Rg21nZPBJ3mKV3g1GIAClhgveBhZHhwSpE9+FRzF0u1Awe6y+tc3I2hwxddRSezZ 8eUg== X-Gm-Message-State: AOJu0Yx6gaAgUOCZxHSoDl7EJk56lIgyVr6VS8gBhYtLAlt+WygXFNBe RAQkOzX1/gCRsD8UZ3K3H9pChOrY0q7xMp6XJ9zcLEsYW2lbOON2gsIPOGww+OzxdqTSzEFslZW mV7opPEQ= X-Gm-Gg: AeBDietrFwXoYq7LjaicZUKhshz4BRAyXOVdI12ScQ9ib23P8YXsPr2WQ10NYu51w+j IkJL3Nfg7tKQyuA7vgJNl4D1cewhBQ+BaPHZH7JD7+jDMoNJqngNTlcy+hBfEy/y3I+aKTuWS+n y1Lp+ba+KpQ1zOhzf6hDmTC6HWNgB77xECxxfJpP93fqV1/d4sj6yyCfD3Xj4BjqOZ/H6G2efFH 7855L205CX2e0LX4QZPCVJiX4vIVXwSO9Gm0d68lg2borS3B/5iLKhOi1QQ7nrqZXl262K07gaV hu7JusKk7YRITcGbQihb7AiESIkoiqnuZIIBoNc9SehQt3rQOfxNXBkDvzjljGCsq4pYzLPjORE EqXCDa9LM4vjgn/y1luICt2vtNzdksiF7Yf0JsLnCy3XStaBW9sN8yAZQxVJkwOXHbFqcEYM/U4 FD+UvIwHU22uxuY6Jg5gNjdv6SdlcNtcyDS5Zg3jydAWzdyUgiWAlK5WaRHXH4q3eJyvI+ZhVD8 l3ahVTjs5E= X-Received: by 2002:a05:600c:c11c:b0:485:3c2e:60d5 with SMTP id 5b1f17b1804b1-48e5226c4f0mr38171165e9.2.1778076437715; Wed, 06 May 2026 07:07:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 090/110] target/s390x: Compile few files as common unit Date: Wed, 6 May 2026 15:55:02 +0200 Message-ID: <20260506135524.20617-91-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1778076489048158500 Nothing in these files prevents it to be built as common unit: - cc_helper.c - excp_helper.c - fpu_helper.c - vec_fpu_helper.c - vec_int_helper.c - vec_string_helper.c Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich Message-Id: <20260423135035.50126-5-philmd@linaro.org> --- target/s390x/tcg/meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build index 17c9374d09e..67f31bfddd4 100644 --- a/target/s390x/tcg/meson.build +++ b/target/s390x/tcg/meson.build @@ -1,14 +1,16 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( - 'cc_helper.c', 'crypto_helper.c', - 'excp_helper.c', - 'fpu_helper.c', 'int_helper.c', 'mem_helper.c', 'misc_helper.c', 'translate.c', - 'vec_fpu_helper.c', 'vec_helper.c', +)) +s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( + 'cc_helper.c', + 'excp_helper.c', + 'fpu_helper.c', + 'vec_fpu_helper.c', 'vec_int_helper.c', 'vec_string_helper.c', )) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076556; cv=none; d=zohomail.com; s=zohoarc; b=fIC0EX8ybUj33Bvaw77knXcA+6BMR2l9Ntg816OSe7xZ0qMaOGJ/fchZm5XSb+XNXEjKD2ZoYNNk6aOr8JOD5Z3xcJgNKv9dMSZmJUyRLXTlck/SLMFYbMF+tCTD+yuF+jJQ7MEl8YBeOCVcCrzB2P6JQqfZLrCiuhcip4/dgik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076556; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=IMeAevOoDKyUqweCwVF9/LSzCdA8DeT8NRzvRdckXuo=; b=LOJNBXt7wzw6B5hE5GNAek+hLDkC9ShUt1BQ7LvEoUkrPvZbjnCtPX+aErUojl0eWA0jGlzv7Ro/vlvFBxooWxCKOP49MoadK/jcELalYc14SO9P/pvw18ouyUV8l/F604vlIIMKP7DAnekjOU6AwaOgrDI/UAZWPcNxL6lWDhg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076556029844.6733302725078; Wed, 6 May 2026 07:09:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuv-0001AR-QP; Wed, 06 May 2026 10:08:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcuP-0008QH-Iw for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:30 -0400 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 1wKcuN-0001wR-Te for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:29 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4891e5b9c1fso62762645e9.2 for ; Wed, 06 May 2026 07:07:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538a547bsm55005725e9.5.2026.05.06.07.07.23 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076445; x=1778681245; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IMeAevOoDKyUqweCwVF9/LSzCdA8DeT8NRzvRdckXuo=; b=rpoAK0zeJqL/rEZdKVaTEUq7HZOY4UG9ZHwjmmpQT6S4hnWeDtbj6mNI+F1vHw0abw PwQoqlm2ah+RZ+9/PkBUEPyQauPxK1iE0SC4pbe4KMnndGsVEniKRRI6R6sqE8lHJGy0 hGqveY7ZF0ZbUyfPZF1xrJF+U43xaoC1ApDXJJJdAtDEXEUS63qRItNGhPywKMX/DTWp eDMUkEv8xrD70I52D7w7yZtj0dzDemRwEQ2MPN/Y9qkRz9LRxsxyPl9lBjpnpvjCdu9s ym775lWqqZEITlH6gyNfKU8WDdG+rMke0MDem5kG6NyDBgcwFw5UnQYz0PPcdNhdcNIW /+QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076445; x=1778681245; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=IMeAevOoDKyUqweCwVF9/LSzCdA8DeT8NRzvRdckXuo=; b=FrYrb+70e9jYbwZ1rFRh9DfTGVHdriocqd1YULuX7M+r6PFSKGCyhHW1Glw4uVhKk9 mb8c8ezd1h8XtIa+aaKUY8e12miFIJQJVkh0t0SX0ovBNXUvBl3k5tBoVXe31syZp4En JxywRHHpxK4P5LqyammYan3Ez3E9SkZzDD1CrRQOoBI+rVaFRBzXQQ6wdCUSidAph65F W8uxzN7kOl8SINztnbhsH80GxhWZnVJbFJiVWxMCiJjb0QQivnteQfSLiUB1Xk6vUcJq R1FEozSgd62skGC3dGGoH0fH+t6hKpRuabqyhHbM6EYYl6i8H7JGiB4KQ2vun7I0AQgl 1XBQ== X-Gm-Message-State: AOJu0YyMeiIylq6AoWq1OoXBKCX0KXftZUWuFdsuHCk5dg+i8NEFBHhR bJul909sbykR4sWqsGJH6WfWJj78z/KsOdZAaGZf1Lg+s3dQj62uBS8/d6URCdPxqQjScBYlF1F u1tEVHI0= X-Gm-Gg: AeBDievSzuI3epELLg3Go7LFDoimsDirpr8mmlVlJLJdjsbIbmZaa+II/lwypoPjz/Y FBMRxEV1wbc1LF3nG3coHTZyamwONsiB6q2OYmxTXM9SslU65mF8+uZjCw5QjutASyQNblazB6y 996TMos0sEEj7Rgo4zxRRw5qZLN3/O7VwSUUOqa5TUNN7WZRelbQth2GlBuMjKmHlUpSvGZun6b 9OC4W3J0Bfb3kG/Q74VOMkzKJv8fJv6Y6hrA4Od/ZA43H02tmmAJKd5flZVGfzhkY4pf7PMVzbQ p+A9WMgDBSbzTKz6zRbLIFFOyc6tA64crjfE1WA4LkNtrzLFGbGSxhqqOllSISi+z7/W+t61Ffj 4EP6mIphZd8xsmVFslXCPOtJYz+3z+RUtQQbJXyO1mWltfJTtpGouovYtuyvogcx0F9IvP9ONQr 1x0s3bbCUNDz/ywMDK5yGdvqUHUIOSYf3XvENpJPOUenC5FrC0dUANkLvAgF7xcG1+Bcc+FRFb8 4cobw2G5HQ= X-Received: by 2002:a05:600c:1d11:b0:48a:7f90:2231 with SMTP id 5b1f17b1804b1-48e51f364f3mr65959075e9.19.1778076445385; Wed, 06 May 2026 07:07:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 091/110] target/s390x: Compile translate.c as common unit Date: Wed, 6 May 2026 15:55:03 +0200 Message-ID: <20260506135524.20617-92-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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: 1778076558005154100 In order do build translate.c as a common unit we need to replace: #include "tcg/tcg-op.h" -> #include "tcg/tcg-op-common.h" -> #include "tcg/tcg-op-mem.h" and: "accel/tcg/tcg-op-gvec.h" -> "accel/tcg/tcg-op-gvec-common.h" taking care to define TCG_ADDRESS_BITS, which is fixed for this 64-bit target. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich Message-Id: <20260423135035.50126-6-philmd@linaro.org> --- target/s390x/tcg/translate.c | 6 ++++-- target/s390x/tcg/meson.build | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 0f274621e5a..82165ac1ec0 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -31,8 +31,10 @@ #include "qemu/osdep.h" #include "cpu.h" #include "s390x-internal.h" -#include "tcg/tcg-op.h" -#include "tcg/tcg-op-gvec.h" +#define TCG_ADDRESS_BITS 64 +#include "tcg/tcg-op-common.h" +#include "tcg/tcg-op-mem.h" +#include "tcg/tcg-op-gvec-common.h" #include "qemu/log.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build index 67f31bfddd4..d1c60135411 100644 --- a/target/s390x/tcg/meson.build +++ b/target/s390x/tcg/meson.build @@ -3,13 +3,13 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( 'int_helper.c', 'mem_helper.c', 'misc_helper.c', - 'translate.c', 'vec_helper.c', )) s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( 'cc_helper.c', 'excp_helper.c', 'fpu_helper.c', + 'translate.c', 'vec_fpu_helper.c', 'vec_int_helper.c', 'vec_string_helper.c', --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076751; cv=none; d=zohomail.com; s=zohoarc; b=EfxfGb8kHrk9K5u11ezy9rLXh0AMVDvthaBsau/1PUr3dCE93G8ZmEafe0aT43y3BT27vqJ8cGN4qS2VIqAgWDG0qg4Un7FI8wfIWQW/EhzQb3NWdO7JDe3TgvpuujKgciWGAkGYYNuTURV50ef3OJYmTq2ewKTP+RtsHSlrKVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076751; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=EBCpT98Uv+V2PVW74Tin5zin5w/ebNQTmy7hJrYTEJU=; b=RCJSJeRMYsiknyA2f7MSGPQYU5dFZx3jVTBn4vCJ70rfBG4ql/2H0qDXkLTphYURrzE8Om2Tme0O6Quz3h08yj3MJNP1gYcSfIHh9USj4do4jkNWrhM5M4ItC3IPpEa8/lh8yaaVomRRG1ZCx8ymmNl06GqfDP2zg0LwR+HVN44= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076751851973.7147151356568; Wed, 6 May 2026 07:12:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcux-0001IC-T2; Wed, 06 May 2026 10:08:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcuY-0000Ne-Qw for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:39 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcuW-0001xh-Nt for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:38 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-48e56c1bf5dso3309585e9.3 for ; Wed, 06 May 2026 07:07:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5312de08sm18716335e9.17.2026.05.06.07.07.31 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:07:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076454; x=1778681254; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EBCpT98Uv+V2PVW74Tin5zin5w/ebNQTmy7hJrYTEJU=; b=p6olrGVgmY2ybTXOEEYcs+pO8IkXWiq4X5NLUSnxvJprj+4sunAB+uBcNvNvn/gF0K 3iFd1wLbwgasuE/t0/IM0LFjeKG0s278HoglHnbcm7nyHwkyPNDdtpEpiWzryzYtLXXp HVUWOdOUMjESBZwCmnY5u4/9n09cMWGRyOqsqCA4ZTjestebP/bxXCHKau0uK5Djo2Wc oNz4wFXA/cgRWOArVm6xltTwN1+2DjRCDXzGniBzCfVIz0NCEU/HXvpbN1YBRQMTzka2 ErRuURbTyPT1IAOZO7bRek5FfsDe8GnJLOfqSY4K3h5BuQbZoFQU+OcEtJFWH2KMA/a+ SZNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076454; x=1778681254; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=EBCpT98Uv+V2PVW74Tin5zin5w/ebNQTmy7hJrYTEJU=; b=b3UBs/N/yj2VmvZXE3T7UksmQxGstHh1FbXOsSE3fEsY/n3OrM61zVhVvJZZcVw3/L qluA4DW4RMEzByQV751qkojRyPjZHc1mOqXmuindamtnaLGvWo3VLSIRZQOT0IWHcPwW 13It5kPxFWvwFGHkBrQSWyZJ0zLRgxWrhzXtLvlO4fu77Jxmv42QWiyxyZYNEWLx3JtP +OUBNEIL8rXTOO1r5Bcg6IB14QTU4Dw1z5mZdZREmqjXNYQuEjJMZd6x6cuu02TJNOrh wOdwqlJiMo07B+3K14egongOwMaJKbNRRW3Tp8Ya3PcoGIGonZlsG92Q9Wf1gES2Jv+S EfYg== X-Gm-Message-State: AOJu0YxBl/5HcnCE14ylQzL4qw0iCl2sYBuOkCx10VRe6+X+zOyMZlyl Bb0Lso3UjiesHweMrpB1G/zY5/9foXEjtcUoXyG/uB+IboDS3NXMABlhWJQPnUJvzzKiyryteTi COulGEt4= X-Gm-Gg: AeBDieuEVYAm11xad4u72+oXfho9+ODTCE2wUzoGZPGktNRtpV5KmxU0Vu1rRBESCl+ D+sgx+yZzepYfmK3YJtkUlUfXe0R3/sKmriSBx0NpQ1ShwWA1xSJTxquA22KlcHb8LH2T0f0tc1 LjTy2KgFsMt7yhTcmL08qGzJuc75J6A2Xun7fHWOF8HddRcdmE2glZnVB5nZeyBvJg3oOTyLkz+ HSoTYswfMlUM8L7LKVTpEuT2OoUyZOAhh1MmfKh+0FCaB/q06B8eZugS48C8XGLV5KumdMbHLQd +EpAFcDVPqdacJ3ozGAWs+79maYUY4YgLt+Gu3Km34S+6BFkDNFZKQgG8f0FWXYAbXmWk7EZvk1 9/kJ2E4wXiKXYOuZGjX0vCvazPPQnxeh8uryhXFkYtdtvwjV4PJ+iS2fqSkrhhOdfqGt8RKcGiH bbesK4TyMsShjdt4TRIYbNQ9byAZixEuUOgPSd5s+CMDAkNhkP0qlZQ8j5eKZ6e0ery34xRQWPh RGvAROTHsg= X-Received: by 2002:a05:600c:1d18:b0:489:149a:f9e7 with SMTP id 5b1f17b1804b1-48e51f483d8mr60028005e9.27.1778076453815; Wed, 06 May 2026 07:07:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 092/110] target/s390x: Compile vec_helper.c as common unit Date: Wed, 6 May 2026 15:55:04 +0200 Message-ID: <20260506135524.20617-93-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1778076753246154100 In order do build vec_helper.c as a common unit we need to replace: "accel/tcg/cpu-ldst.h" -> "accel/tcg/cpu-ldst-common.h" and update the cpu_ld/st_be_data_ra() API by cpu_ld/st_mmu() one. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich Message-Id: <20260423135035.50126-7-philmd@linaro.org> --- target/s390x/tcg/vec_helper.c | 34 +++++++++++++++++++++++----------- target/s390x/tcg/meson.build | 2 +- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/target/s390x/tcg/vec_helper.c b/target/s390x/tcg/vec_helper.c index 304745c971b..98eecd9fde6 100644 --- a/target/s390x/tcg/vec_helper.c +++ b/target/s390x/tcg/vec_helper.c @@ -16,7 +16,8 @@ #include "tcg/tcg.h" #include "tcg/tcg-gvec-desc.h" #include "exec/helper-proto.h" -#include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-ldst-common.h" +#include "accel/tcg/cpu-mmu-index.h" =20 void HELPER(gvec_vbperm)(void *v1, const void *v2, const void *v3, uint32_t desc) @@ -42,20 +43,26 @@ void HELPER(gvec_vbperm)(void *v1, const void *v2, cons= t void *v3, =20 void HELPER(vll)(CPUS390XState *env, void *v1, uint64_t addr, uint64_t byt= es) { + const int mmu_idx =3D cpu_mmu_index(env_cpu(env), false); + const uintptr_t ra =3D GETPC(); + MemOpIdx oi; + if (likely(bytes >=3D 16)) { uint64_t t0, t1; =20 - t0 =3D cpu_ldq_be_data_ra(env, addr, GETPC()); + oi =3D make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx); + t0 =3D cpu_ldq_mmu(env, addr, oi, ra); addr =3D wrap_address(env, addr + 8); - t1 =3D cpu_ldq_be_data_ra(env, addr, GETPC()); + t1 =3D cpu_ldq_mmu(env, addr, oi, ra); s390_vec_write_element64(v1, 0, t0); s390_vec_write_element64(v1, 1, t1); } else { S390Vector tmp =3D {}; - int i; =20 - for (i =3D 0; i < bytes; i++) { - uint8_t byte =3D cpu_ldub_data_ra(env, addr, GETPC()); + oi =3D make_memop_idx(MO_8, mmu_idx); + for (int i =3D 0; i < bytes; i++) { + uint8_t byte =3D cpu_ldb_mmu(env, addr, oi, ra); + =20 s390_vec_write_element8(&tmp, i, byte); addr =3D wrap_address(env, addr + 1); @@ -191,20 +198,25 @@ void HELPER(gvec_vperm)(void *v1, const void *v2, con= st void *v3, void HELPER(vstl)(CPUS390XState *env, const void *v1, uint64_t addr, uint64_t bytes) { + const int mmu_idx =3D cpu_mmu_index(env_cpu(env), false); + const uintptr_t ra =3D GETPC(); + MemOpIdx oi; + /* Probe write access before actually modifying memory */ probe_write_access(env, addr, MIN(bytes, 16), GETPC()); =20 if (likely(bytes >=3D 16)) { - cpu_stq_be_data_ra(env, addr, s390_vec_read_element64(v1, 0), GETP= C()); + oi =3D make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx); + cpu_stq_mmu(env, addr, s390_vec_read_element64(v1, 0), oi, ra); addr =3D wrap_address(env, addr + 8); - cpu_stq_be_data_ra(env, addr, s390_vec_read_element64(v1, 1), GETP= C()); + cpu_stq_mmu(env, addr, s390_vec_read_element64(v1, 1), oi, ra); } else { - int i; + oi =3D make_memop_idx(MO_8, mmu_idx); =20 - for (i =3D 0; i < bytes; i++) { + for (int i =3D 0; i < bytes; i++) { uint8_t byte =3D s390_vec_read_element8(v1, i); =20 - cpu_stb_data_ra(env, addr, byte, GETPC()); + cpu_stb_mmu(env, addr, byte, oi, ra); addr =3D wrap_address(env, addr + 1); } } diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build index d1c60135411..ed6441f6f44 100644 --- a/target/s390x/tcg/meson.build +++ b/target/s390x/tcg/meson.build @@ -3,7 +3,6 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( 'int_helper.c', 'mem_helper.c', 'misc_helper.c', - 'vec_helper.c', )) s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( 'cc_helper.c', @@ -11,6 +10,7 @@ s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( 'fpu_helper.c', 'translate.c', 'vec_fpu_helper.c', + 'vec_helper.c', 'vec_int_helper.c', 'vec_string_helper.c', )) --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076556; cv=none; d=zohomail.com; s=zohoarc; b=TZP8Bh1A/dNjz2Cjv8jmoIFmdgSv1LUp2IO6tMC/bk5ZEIPl7KivGLUfkSsRz44CKQ9I6GZN/QoPGZ6kFjoySLrrsk2jtLbZUG/X8cTV0Ck2tviW/mMhP3hlhvtcyUp+eaLAVjRfp2GUpNdpwkGpa6EexDXkPSIsp94/QdIaS9s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076556; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=0nvgup5yA+TVirBzshOkEAlxX6Plz/Eb10z3ot7vtvM=; b=YfH59cnemJ4wZDPHArBZ5lGXyKDpXuf8jzvto8S4FpKtWKXOXS+6DEU1giV/FhAjQ3wBVHcUcKD/D4XM/Tg1QaOHDXMnR/rg10SutVvFFSEVYFImXImEYPq/hSXbIMiuNo8Uoenz7haDuRYUrniXi9UmGLfyOq/Ag2kDJvNxOP0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076556738728.3710119627897; Wed, 6 May 2026 07:09:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcus-0000va-WF; Wed, 06 May 2026 10:07:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcuh-0000Tj-Gi for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:50 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcuf-0001yf-ES for qemu-devel@nongnu.org; Wed, 06 May 2026 10:07:47 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-488b150559bso44967485e9.1 for ; Wed, 06 May 2026 07:07:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538acbfcsm46580525e9.8.2026.05.06.07.07.40 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076462; x=1778681262; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0nvgup5yA+TVirBzshOkEAlxX6Plz/Eb10z3ot7vtvM=; b=w/15LdEGHALXv+v4FleBSAxmbU+ebF0uz38+ZIXPtC8dYsZYZN2AmrpkX9tQCGjMWt i6Enxscv6dqk6FSt6idSyO6+PWLDpkApwllMn/3obCyA7pQBvm8RNZsBqq1RuOu1w43z zD1m36GUdAh8g+aAQkiKiY4hqhDvUSseClIXLxYR7VYZD2kvn5j62+SvK6qXj8Jhyh97 pDgjQYkeO0XNNnUO1dKJYWGt/VLl8dyXJubzLPBnxmprRTJ/bWNmx+mh4MP/Dyk0HnSa QjjfsPWHODAwXkrV0M8x44FMX1PyXXltUZ69ZydGtQAQGKtwNShaDfIapEX2eJmWtYjY 46uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076462; x=1778681262; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=0nvgup5yA+TVirBzshOkEAlxX6Plz/Eb10z3ot7vtvM=; b=sskEaGfifRWOwixiSve8S0U3pxhCi4WVDsbYaNt2ywJ3nw5f1WwEteliFlVUs/mPa4 Ix1YWkFOe/Mj7abnOpwhWOn725yYbZ7Jzt68TSJoFDcEU9w6dSWnHs5Uga9HSpCJtDVe DtI7/2dp3PZ+CARws5gRUAdIbH8dWJ4XJdrfRuYvgMNDHyeUp3qUVGb2/tfyPMifDkyg 4MPkzvETHOl/4dEg8a54jVxfizu+1nquajdDrejuLRpbs66jxNHkLBOZzU/OoOrYFett kn8y2KlKnibYYzDLJpnTr6Q692sRo195i25kzJzb1hjeys6oveZ0cOatScJkbcsL5VOq +NfA== X-Gm-Message-State: AOJu0Yw8Pw6TUk5FysdnJGAKIHEpgeN104nBc4GDaHQniR8YZ3rY99dR F60aIZgT2xM4CPafjB4cIbxy5e2+EU+7tqMybbp3K60K8iRmvpg3TPh7CTk/FC0D0qc8I7zTSSU /ChKk2cs= X-Gm-Gg: AeBDiet9oMJwb7B6oTo1MPZ7Rq+WcyB4c/itW+pfMHY0Fsi8jB7Ruho9K2F9y+kOpCo 6/VtxZJz3gR6vXVcP+PSkC614cQItZaQk6SzmMhjUsXeg9Cx8ykaDcR8Mfj5vzYgLfFRYtQdvwP K6CAg1HCCPW+/llZFTAw9xKewcYZ4uZY0uURhmRLUEqXoHhahRWewJcbxdQ31DXtb4syMCoQmKk SsXZ/bMXtz2kb8H9YgUmNd7reE+IfRuVaxZh5AGTOOq80jB0g/hE5rcTZy2andtQV7Ve3wI+HMZ 8GzctOnWGeI40us3D7DBilfmKUKx1Z7jpvG5VAgPHdGdje0dWF3h9zfRev5dLolJJv0Y4Wz7G9/ a5flX2gzPO7jr6YG0Z20/6xV2xIvYIJF3Yr2HgjHXVkmD1TwBHSJB3KgG9PZ9Duq3kma7zRqsLR 6RPsmpAFMtWxr4gWKLN/d9hYC0eX4mtQo7BRDmPa7sxwy4UrKotW5D1EfHPIx9TUq82ngAp3fU9 tQUbXLUzMA0qb87A0j60g== X-Received: by 2002:a05:600c:3ba8:b0:48a:7676:30bc with SMTP id 5b1f17b1804b1-48e52bd5035mr63305265e9.14.1778076462486; Wed, 06 May 2026 07:07:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 093/110] target/s390x: Have MSA helper pass a mmu_idx argument Date: Wed, 6 May 2026 15:55:05 +0200 Message-ID: <20260506135524.20617-94-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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: 1778076557484158500 Next commit will use the cpu_ld/st_mmu() API and thus will also use a @mmu_idx. In order to keep it simple to review, propate @mmu_idx in a preliminary step. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich Message-Id: <20260423135035.50126-8-philmd@linaro.org> --- target/s390x/tcg/crypto_helper.c | 41 +++++++++++++++++--------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/target/s390x/tcg/crypto_helper.c b/target/s390x/tcg/crypto_hel= per.c index 4447bb66eee..074d745eb3f 100644 --- a/target/s390x/tcg/crypto_helper.c +++ b/target/s390x/tcg/crypto_helper.c @@ -18,6 +18,7 @@ #include "tcg_s390x.h" #include "exec/helper-proto.h" #include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-mmu-index.h" =20 static uint64_t R(uint64_t x, int c) { @@ -119,8 +120,8 @@ static void sha512_bda_be64(uint64_t a[8], uint64_t w[1= 6]) sha512_bda(a, t); } =20 -static void sha512_read_icv(CPUS390XState *env, uint64_t addr, - uint64_t a[8], uintptr_t ra) +static void sha512_read_icv(CPUS390XState *env, const int mmu_idx, + uint64_t addr, uint64_t a[8], uintptr_t ra) { int i; =20 @@ -130,8 +131,8 @@ static void sha512_read_icv(CPUS390XState *env, uint64_= t addr, } } =20 -static void sha512_write_ocv(CPUS390XState *env, uint64_t addr, - uint64_t a[8], uintptr_t ra) +static void sha512_write_ocv(CPUS390XState *env, const int mmu_idx, + uint64_t addr, uint64_t a[8], uintptr_t ra) { int i; =20 @@ -141,8 +142,8 @@ static void sha512_write_ocv(CPUS390XState *env, uint64= _t addr, } } =20 -static void sha512_read_block(CPUS390XState *env, uint64_t addr, - uint64_t a[16], uintptr_t ra) +static void sha512_read_block(CPUS390XState *env, const int mmu_idx, + uint64_t addr, uint64_t a[16], uintptr_t ra) { int i; =20 @@ -152,8 +153,8 @@ static void sha512_read_block(CPUS390XState *env, uint6= 4_t addr, } } =20 -static void sha512_read_mbl_be64(CPUS390XState *env, uint64_t addr, - uint8_t a[16], uintptr_t ra) +static void sha512_read_mbl_be64(CPUS390XState *env, const int mmu_idx, + uint64_t addr, uint8_t a[16], uintptr_t r= a) { int i; =20 @@ -163,8 +164,9 @@ static void sha512_read_mbl_be64(CPUS390XState *env, ui= nt64_t addr, } } =20 -static int cpacf_sha512(CPUS390XState *env, uintptr_t ra, uint64_t param_a= ddr, - uint64_t *message_reg, uint64_t *len_reg, uint32_t t= ype) +static int cpacf_sha512(CPUS390XState *env, const int mmu_idx, uintptr_t r= a, + uint64_t param_addr, uint64_t *message_reg, + uint64_t *len_reg, uint32_t type) { enum { MAX_BLOCKS_PER_RUN =3D 64 }; /* Arbitrary: keep interactivity. = */ uint64_t len =3D *len_reg, a[8], processed =3D 0; @@ -182,7 +184,7 @@ static int cpacf_sha512(CPUS390XState *env, uintptr_t r= a, uint64_t param_addr, tcg_s390_program_interrupt(env, PGM_SPECIFICATION, ra); } =20 - sha512_read_icv(env, param_addr, a, ra); + sha512_read_icv(env, mmu_idx, param_addr, a, ra); =20 /* Process full blocks first. */ for (; len >=3D 128; len -=3D 128, processed +=3D 128) { @@ -192,7 +194,7 @@ static int cpacf_sha512(CPUS390XState *env, uintptr_t r= a, uint64_t param_addr, break; } =20 - sha512_read_block(env, *message_reg + processed, w, ra); + sha512_read_block(env, mmu_idx, *message_reg + processed, w, ra); sha512_bda(a, w); } =20 @@ -215,13 +217,13 @@ static int cpacf_sha512(CPUS390XState *env, uintptr_t= ra, uint64_t param_addr, * or use an additional one. */ if (len < 112) { - sha512_read_mbl_be64(env, param_addr + 64, x + 112, ra); + sha512_read_mbl_be64(env, mmu_idx, param_addr + 64, x + 112, r= a); } sha512_bda_be64(a, (uint64_t *)x); =20 if (len >=3D 112) { memset(x, 0, 112); - sha512_read_mbl_be64(env, param_addr + 64, x + 112, ra); + sha512_read_mbl_be64(env, mmu_idx, param_addr + 64, x + 112, r= a); sha512_bda_be64(a, (uint64_t *)x); } =20 @@ -236,14 +238,14 @@ static int cpacf_sha512(CPUS390XState *env, uintptr_t= ra, uint64_t param_addr, * TODO: if writing fails halfway through (e.g., when crossing page * boundaries), we're in trouble. We'd need something like access_prep= are(). */ - sha512_write_ocv(env, param_addr, a, ra); + sha512_write_ocv(env, mmu_idx, param_addr, a, ra); *message_reg =3D deposit64(*message_reg, 0, message_reg_len, *message_reg + processed); *len_reg -=3D processed; return !len ? 0 : 3; } =20 -static void fill_buf_random(CPUS390XState *env, uintptr_t ra, +static void fill_buf_random(CPUS390XState *env, const int mmu_idx, uintptr= _t ra, uint64_t *buf_reg, uint64_t *len_reg) { uint8_t tmp[256]; @@ -271,6 +273,7 @@ static void fill_buf_random(CPUS390XState *env, uintptr= _t ra, uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_= t r3, uint32_t type) { + const int mmu_idx =3D cpu_mmu_index(env_cpu(env), false); const uintptr_t ra =3D GETPC(); const uint8_t mod =3D env->regs[0] & 0x80ULL; const uint8_t fc =3D env->regs[0] & 0x7fULL; @@ -303,11 +306,11 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1,= uint32_t r2, uint32_t r3, } break; case 3: /* CPACF_*_SHA_512 */ - return cpacf_sha512(env, ra, env->regs[1], &env->regs[r2], + return cpacf_sha512(env, mmu_idx, ra, env->regs[1], &env->regs[r2], &env->regs[r2 + 1], type); case 114: /* CPACF_PRNO_TRNG */ - fill_buf_random(env, ra, &env->regs[r1], &env->regs[r1 + 1]); - fill_buf_random(env, ra, &env->regs[r2], &env->regs[r2 + 1]); + fill_buf_random(env, mmu_idx, ra, &env->regs[r1], &env->regs[r1 + = 1]); + fill_buf_random(env, mmu_idx, ra, &env->regs[r2], &env->regs[r2 + = 1]); break; default: /* we don't implement any other subfunction yet */ --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076702; cv=none; d=zohomail.com; s=zohoarc; b=CLi0rs/wbRfhKXPmS+iQl2JH3JNPFD5b6BU1PPYzJ/KNuObiQf8UNCpBl7BwwXrIWc7zP4xZ/kI5uqXnnHGBjQRPsOKpxJl52w5zl8Eyj1Y9xEIwAO4FHBpGK/XSgMbHYkMCbqzz7Zw5BAGW4lxgNtZW9Te/mTC8sgxwrk9diD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076702; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=NjD38AF72kHQcdJLp03kxhc3tCZ7YiQ75NzgoKjvE9A=; b=KylyCWVN7LqqCWksmJ8vRy/5E+K5Tdzs31lG6r5uXyuY0300S6B5N0Js8gXfW7TvTY+opTMh4WxRTt6rV8gB5XasxH2a1fqvRe3uZJFUPbiYhPbnkpeR7a5Yiyy00ppNDEmN5Vm18k35SCpXKnjNGNrMMFIaMKhNwEP3kLZJiZs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076702239774.4963708204124; Wed, 6 May 2026 07:11:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcuz-0001aV-QO; Wed, 06 May 2026 10:08:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcuu-00017A-RE for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:01 -0400 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 1wKcur-0001zN-5j for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:00 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-488e1a8ac40so63801635e9.2 for ; Wed, 06 May 2026 07:07:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53141f41sm17510765e9.26.2026.05.06.07.07.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076471; x=1778681271; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NjD38AF72kHQcdJLp03kxhc3tCZ7YiQ75NzgoKjvE9A=; b=lxXYNLnegtkZ6QxWuXFFyiTKzzzUyzxIlkZbnz8qL7NoO7Hz8haDEKUujS7ukGDEHN az/N9iPHHIUarAORoR4riHZB7PJDJAZh5itKcPv45WMzicQyMYe51N/5/ALerqX6RDYQ jz+h3QsgUD4U1nkMy7OyLUJgQdM5df8PoAwnCRUjhZ1IV8GNkDqhWWi3m/KmDEM9orPk qPyQoywos1wsjhqW1ZC3a48V1fHdbwcBdyRMTM4Ra4l+VnKAlq3VLNayTORKfeyrfbPL x+dlxvsOhNzQDPuOKnUHGye/+NH6plBIHQfnl1Pss/O5qtZ/4WOWi5aMZFFzfuAkfHPP IpNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076471; x=1778681271; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=NjD38AF72kHQcdJLp03kxhc3tCZ7YiQ75NzgoKjvE9A=; b=mPCR4WPRZHwTwIbh/tV02lmWu20p/GmaShqu1+mxwHooFKc5HCA+WmU+Q98+ywcois Qg0hjz6llLyrHqn+tedL3BIOEZkr49DNwQGXWC6WhPe+SVbF4Fz/MeXAGQSW8oV7ood4 mLAtG72R1zwtdKZI9ZXGLOY9YDI7HuoN6djBxkv21kdQHO344u+wJIzQsJ4tIqPyOLs6 edYhDj1qEJ7+p+erkrdMED7QsPw124Kw9roJDt2t4KUZc2MJPHSk1eH9XECugf4j8Egs PTRXev10Z4YyY9q/VxAEFlW84P7rLFdWEFjspfKfIrpwjSfVl4usUB2JQ9I+FqJAfY+h U0iw== X-Gm-Message-State: AOJu0YzKTmDIWs9EyGGKF3UGuuv5HaMx5dC8N2+m4hS6WzQ5uTMpdPxA 25xvFpYRzXHFe38zo9BkQARyhaBmv1Wb/NmwkdscWn1eFBe3BB0RQH/2Sy3bltVJFAsHPn4dpBz 2ZVkt72o= X-Gm-Gg: AeBDiev7IdBYl9cS41PfdhdlGSaAVo0qEwxRva+ffaXnaNVf5NX73fIH9sx1ledJeTu 7BNEsVkPsnTKEcrq6IB0Qg4fEiVWwk5B0kt9/7uScBguVe8A3bm7GfbNmAJ3j0uBQDncQqiciuo lqNMU3bdlA/9tcmbYL76ZB4GIVO8XZc8P588klP7RWNE+6HlwqR8TxPjIM8Y4GhWR6RYXhtCCOy 2HsccT4UbxFQRWd1zJyHzrfT/aPCE0aRc/muD73bdiVg6ic6rLPawG+XUrUdF71Ip6zo+NWcgJ+ VldkR9VeT6faPq2LWOP838CMo8eM9NYzLTdC4Cl68x+MV30FtmJrPLi5yAl1qaiBWcA+3U3vHV7 F1HACKmQkdHOGwcD8oEh8g+CEYlK2wAGWR9Z6hvr+qslBkMP/wWWWWlnsX4of87fCWm+hPbcL1C Q5+mNvQJTb66BxeTK5V4ZbM5yIXxcjd260STQnjrUfLJkNlTklH+M/6I5JJ5HoO38ZTa+w1Aikc NMpUivjabw= X-Received: by 2002:a05:600c:4e43:b0:485:30d4:6b9e with SMTP id 5b1f17b1804b1-48e51f4c1e5mr72058645e9.21.1778076470551; Wed, 06 May 2026 07:07:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 094/110] target/s390x: Compile crypto_helper.c as common unit Date: Wed, 6 May 2026 15:55:06 +0200 Message-ID: <20260506135524.20617-95-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076704786154100 In order do build crypto_helper.c as a common unit we need to replace: "accel/tcg/cpu-ldst.h" -> "accel/tcg/cpu-ldst-common.h" and update the cpu_ld/st_be_data_ra() API by cpu_ld/st_mmu() one. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich Message-Id: <20260423135035.50126-9-philmd@linaro.org> --- target/s390x/tcg/crypto_helper.c | 39 +++++++++++++++++--------------- target/s390x/tcg/meson.build | 2 +- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/target/s390x/tcg/crypto_helper.c b/target/s390x/tcg/crypto_hel= per.c index 074d745eb3f..ae392bce0e7 100644 --- a/target/s390x/tcg/crypto_helper.c +++ b/target/s390x/tcg/crypto_helper.c @@ -17,7 +17,7 @@ #include "s390x-internal.h" #include "tcg_s390x.h" #include "exec/helper-proto.h" -#include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-ldst-common.h" #include "accel/tcg/cpu-mmu-index.h" =20 static uint64_t R(uint64_t x, int c) @@ -123,44 +123,44 @@ static void sha512_bda_be64(uint64_t a[8], uint64_t w= [16]) static void sha512_read_icv(CPUS390XState *env, const int mmu_idx, uint64_t addr, uint64_t a[8], uintptr_t ra) { - int i; + const MemOpIdx oi =3D make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx= ); =20 - for (i =3D 0; i < 8; i++, addr +=3D 8) { + for (int i =3D 0; i < 8; i++, addr +=3D 8) { addr =3D wrap_address(env, addr); - a[i] =3D cpu_ldq_be_data_ra(env, addr, ra); + a[i] =3D cpu_ldq_mmu(env, addr, oi, ra); } } =20 static void sha512_write_ocv(CPUS390XState *env, const int mmu_idx, uint64_t addr, uint64_t a[8], uintptr_t ra) { - int i; + const MemOpIdx oi =3D make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx= ); =20 - for (i =3D 0; i < 8; i++, addr +=3D 8) { + for (int i =3D 0; i < 8; i++, addr +=3D 8) { addr =3D wrap_address(env, addr); - cpu_stq_be_data_ra(env, addr, a[i], ra); + cpu_stq_mmu(env, addr, a[i], oi, ra); } } =20 static void sha512_read_block(CPUS390XState *env, const int mmu_idx, uint64_t addr, uint64_t a[16], uintptr_t ra) { - int i; + const MemOpIdx oi =3D make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx= ); =20 - for (i =3D 0; i < 16; i++, addr +=3D 8) { + for (int i =3D 0; i < 16; i++, addr +=3D 8) { addr =3D wrap_address(env, addr); - a[i] =3D cpu_ldq_be_data_ra(env, addr, ra); + a[i] =3D cpu_ldq_mmu(env, addr, oi, ra); } } =20 static void sha512_read_mbl_be64(CPUS390XState *env, const int mmu_idx, uint64_t addr, uint8_t a[16], uintptr_t r= a) { - int i; + const MemOpIdx oi =3D make_memop_idx(MO_8, mmu_idx); =20 - for (i =3D 0; i < 16; i++, addr +=3D 1) { + for (int i =3D 0; i < 16; i++, addr +=3D 1) { addr =3D wrap_address(env, addr); - a[i] =3D cpu_ldub_data_ra(env, addr, ra); + a[i] =3D cpu_ldb_mmu(env, addr, oi, ra); } } =20 @@ -200,13 +200,14 @@ static int cpacf_sha512(CPUS390XState *env, const int= mmu_idx, uintptr_t ra, =20 /* KLMD: Process partial/empty block last. */ if (type =3D=3D S390_FEAT_TYPE_KLMD && len < 128) { + const MemOpIdx oi =3D make_memop_idx(MO_8, mmu_idx); uint8_t x[128]; =20 /* Read the remainder of the message byte-per-byte. */ for (i =3D 0; i < len; i++) { uint64_t addr =3D wrap_address(env, *message_reg + processed += i); =20 - x[i] =3D cpu_ldub_data_ra(env, addr, ra); + x[i] =3D cpu_ldb_mmu(env, addr, oi, ra); } /* Pad the remainder with zero and set the top bit. */ memset(x + len, 0, 128 - len); @@ -248,6 +249,7 @@ static int cpacf_sha512(CPUS390XState *env, const int m= mu_idx, uintptr_t ra, static void fill_buf_random(CPUS390XState *env, const int mmu_idx, uintptr= _t ra, uint64_t *buf_reg, uint64_t *len_reg) { + const MemOpIdx oi =3D make_memop_idx(MO_8, mmu_idx); uint8_t tmp[256]; uint64_t len =3D *len_reg; int buf_reg_len =3D 64; @@ -262,7 +264,7 @@ static void fill_buf_random(CPUS390XState *env, const i= nt mmu_idx, uintptr_t ra, =20 qemu_guest_getrandom_nofail(tmp, block); for (size_t i =3D 0; i < block; ++i) { - cpu_stb_data_ra(env, wrap_address(env, *buf_reg), tmp[i], ra); + cpu_stb_mmu(env, wrap_address(env, *buf_reg), tmp[i], oi, ra); *buf_reg =3D deposit64(*buf_reg, 0, buf_reg_len, *buf_reg + 1); --*len_reg; } @@ -279,7 +281,7 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, u= int32_t r2, uint32_t r3, const uint8_t fc =3D env->regs[0] & 0x7fULL; uint8_t subfunc[16] =3D { 0 }; uint64_t param_addr; - int i; + MemOpIdx oi; =20 switch (type) { case S390_FEAT_TYPE_KMAC: @@ -300,9 +302,10 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, = uint32_t r2, uint32_t r3, =20 switch (fc) { case 0: /* query subfunction */ - for (i =3D 0; i < 16; i++) { + oi =3D make_memop_idx(MO_8, mmu_idx); + for (int i =3D 0; i < 16; i++) { param_addr =3D wrap_address(env, env->regs[1] + i); - cpu_stb_data_ra(env, param_addr, subfunc[i], ra); + cpu_stb_mmu(env, param_addr, subfunc[i], oi, ra); } break; case 3: /* CPACF_*_SHA_512 */ diff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build index ed6441f6f44..36cb0e079ed 100644 --- a/target/s390x/tcg/meson.build +++ b/target/s390x/tcg/meson.build @@ -1,11 +1,11 @@ s390x_ss.add(when: 'CONFIG_TCG', if_true: files( - 'crypto_helper.c', 'int_helper.c', 'mem_helper.c', 'misc_helper.c', )) s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files( 'cc_helper.c', + 'crypto_helper.c', 'excp_helper.c', 'fpu_helper.c', 'translate.c', --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076518; cv=none; d=zohomail.com; s=zohoarc; b=WvgdWks36SR+K8c095OE89bqM3OpiQtfTURT10Z0zFoiqD2UKGj9mDw6CGg38N/O4f0Id5fdKa8OjCJCxictSVXBakIDQZhfO0BlxwTId4jygvfNficWtP5iAxbZk0GaD/gwRVWZaJiMr5c3mo2kMcCUfKdsnRlqWWCC5GM4xmc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076518; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=55Zg5+IU6prz/8Xfor+qrsuZFRdcVABRF35SF6CgGpQ=; b=mYtowSrg2mRNkJWXP6bxojyrvdA3XsqrAMw2gP3HEt0H0CdPY4fXSCygiAGVXZQ+o6g6RQZoLUOyduNFWqhhDztGZqeNsEnzqq1MhvNnZ3GjsjHUB6rQL8KUlMZCDY+fDc2/DOnNbouoViZMLwsh9STZST3vmN/NXHQX/1sGZYY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076518853711.1054348664356; Wed, 6 May 2026 07:08:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcv0-0001bg-0E; Wed, 06 May 2026 10:08:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcuw-0001Dx-Bs for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:02 -0400 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 1wKcuu-00021M-JW for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:02 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-44985f4ab0fso3095667f8f.0 for ; Wed, 06 May 2026 07:08:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055f2487dsm13043341f8f.35.2026.05.06.07.07.56 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:07:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076478; x=1778681278; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=55Zg5+IU6prz/8Xfor+qrsuZFRdcVABRF35SF6CgGpQ=; b=wmlWrhonOsC09uP7/4aBLH6yuN/P4tkvu8QDmf9zNU6uQN4biTdblshk9AaWAGu29A 3rVGeoIS53ksrPoStNXgLY/9FiucwRGFTSHpv/r7/WzI/denaA4lm5ZF9J542LRW0A9b sVA7/n+WBFhsdbWqhZunj8YEvBIH5H+KvSUb0WYm9qnCUouuYt6Xzd34fO/1yXIy5gPL YLwUMRJ38IuXgx290jfYxyjKYL9ckLexz2ARCm0fptfgy4R0uDquE+ryGOeioKXuuWid rhZPAa8ZIIKeb8fd+6wXQj46mXwQwhO1Im9bjnmCJKem8eEtgJ8sNwLyjEDmC1hOLBcv n1rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076478; x=1778681278; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=55Zg5+IU6prz/8Xfor+qrsuZFRdcVABRF35SF6CgGpQ=; b=ZAmtHfp6FO6D2lp8UzY/NHFtwTYrb9eP0EluWaYEDieFGW5amOKNdF9+26NVWlLjsM lwIJC2hr5WFA2peqFCWmWQrvLCbpzCc07SW4w40VNFLJGNYX3G/xog3VJAgL33O3/3mK +yDsxMAymXKmCVP95Ik9tRO+3FDw3bCSceDgmEjOFTJNqBgYO4HdLabrocBV4ATrZ6HS 78q8sokBJxyQ4zvudXBic3QJkE3xk4sY/knmnAzXWEIXhpFbAx406qhZjraeIPLPcwlb Mm09mfHUiAY68d7v2v7d06n0hYDsbRcPmuzVfHZ69zUVqF4lGKywzeWtXIfFP5DRnmbr jfLg== X-Gm-Message-State: AOJu0Ywfgd1UPTWXY5u3rPZyt0Hn2V8BeGN7htOYTOhTqtBqbFi50Hkb yYmTFjYu4RV6jpwqWYS+xao6+uESWfL4kX3hLPLKVZeMomHn1leC12lwF8aZhgd0/4caLkbAPCH qVnQp1lY= X-Gm-Gg: AeBDievJ3KLxmstCMD5cgAWI4y81G6et83MfQuDx0QLxRXH9rh4eAoeEYLcTBiFYyRY sxVRqhlCf5slrT5uBgdIisbiAJdfsEzmqb81eMQN752le/euadGfGMRgBS/wxdLT16l6URDR/m1 q7dPLYJDlwtw1frQafgALCKvEvxwVxg3+O6nE0Vi1Khgrqt41zJOQ6DO6AAqMxXS2v/Y25NpZ+4 C4NurvCeJP9SLxFRgoHkmg9JiZMy9dmcsrKK8NvqrVF4Z/AQzGqzGZJXC/lN3lZg6x6S0FZzXvQ VuFxNMrBv9tIMcHaMbj0PBSSHhuS6qoMKcSAgmj4nm2jPHztquQ/9kuXfKopWh7hZr70eSgzmRh ugtoc6ikhbTwvIhZ2s/D4ydWhWnowWwfzZ4R9FKjjwcW8ifJu2bCyfo1sKNpHvG7vrht4KhyHHi RwFHCEPtecxPoLT6ikve6hpeUVQKYZsW2cvEqxZr9Ana0nl/2ZGu07ygIK2CJq3OrDN4XfEGeFb +VgqCJh2Cc= X-Received: by 2002:a05:6000:3107:b0:43d:2be:e54 with SMTP id ffacd0b85a97d-4515dc8095fmr5512169f8f.39.1778076477750; Wed, 06 May 2026 07:07:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 095/110] target/s390x: Replace cpu_stb_data_ra -> cpu_stb_mmu in STFLE opcode Date: Wed, 6 May 2026 15:55:07 +0200 Message-ID: <20260506135524.20617-96-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076519344158500 In preparation of building misc_helper.c as a common unit, update the cpu_ld/st_be_data_ra() API by cpu_ld/st_mmu() one and replace "accel/tcg/cpu-ldst.h" by "accel/tcg/cpu-ldst-common.h". For now we are blocked by the CONFIG_DEVICES use so keep the file in s390x_ss[]. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich Message-Id: <20260423135035.50126-10-philmd@linaro.org> --- target/s390x/tcg/misc_helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index 1fd900fbbf0..3d13c8bd8ea 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -27,7 +27,8 @@ #include "exec/helper-proto.h" #include "qemu/timer.h" #include "exec/cputlb.h" -#include "accel/tcg/cpu-ldst.h" +#include "accel/tcg/cpu-ldst-common.h" +#include "accel/tcg/cpu-mmu-index.h" #include "exec/target_page.h" #include "qapi/error.h" #include "tcg_s390x.h" @@ -710,6 +711,8 @@ void HELPER(stfl)(CPUS390XState *env) =20 uint32_t HELPER(stfle)(CPUS390XState *env, uint64_t addr) { + const int mmu_idx =3D cpu_mmu_index(env_cpu(env), false); + const MemOpIdx oi =3D make_memop_idx(MO_8, mmu_idx); const uintptr_t ra =3D GETPC(); const int count_bytes =3D ((env->regs[0] & 0xff) + 1) * 8; int max_bytes; @@ -728,7 +731,7 @@ uint32_t HELPER(stfle)(CPUS390XState *env, uint64_t add= r) * not store the words, and existing software depend on that. */ for (i =3D 0; i < MIN(count_bytes, max_bytes); ++i) { - cpu_stb_data_ra(env, addr + i, stfl_bytes[i], ra); + cpu_stb_mmu(env, addr + i, stfl_bytes[i], oi, ra); } =20 env->regs[0] =3D deposit64(env->regs[0], 0, 8, (max_bytes / 8) - 1); --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076591; cv=none; d=zohomail.com; s=zohoarc; b=IpoUZqOjaGs27cdoiQaejVM+gBOIqSHylRTqdizACMOKMqdUAQO7jS6HLE0+iuttBw3UjjNVRuQ5EoGxyDGOtYWeUsEN2xBDDt/vUprEMGVJAugZ/RAMNA//sZg/y2DX7+f3cMUtArS2xF/ljhTjqRS2+jdofZJsP/Ha8+RXlcs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076591; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=wbr7TSm9rrQFY/Tg9TLQeycsBQGCDHg2nKtliBN7mQk=; b=QK+lWc8g/iM+KPY0csF+9/tAlHxhHz/WXNAkGbtltoSuv2V9q+ZZ+KHOeBsA03pd9L4cKJxLS2OTXdLMDuRwLTiym6BETkmUPyWtLeKjL9EhBEX6i6g/ZnuA/bUzBFkg02pcB5YsFq2p+iWY3SOdZRrlNf3BkbRcMhvx5wKSDGo= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076591633765.8259838398186; Wed, 6 May 2026 07:09:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcvO-0002iN-So; Wed, 06 May 2026 10:08:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcv3-0002Br-JK for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:09 -0400 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 1wKcv1-000237-TT for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:09 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-449d6c68ed8so5006473f8f.0 for ; Wed, 06 May 2026 07:08:07 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45055960aa2sm12349586f8f.29.2026.05.06.07.08.03 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:08:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076485; x=1778681285; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wbr7TSm9rrQFY/Tg9TLQeycsBQGCDHg2nKtliBN7mQk=; b=llABpTZ0oA0ej3mn5NltxzV+8/IXyryGAJt1Js5Z8NxV6jukwkxnOGQMQu8OGA2XN7 mC+sTYBarnJoDr2npRHkbxaqNfIIpp4JFIFM9HDD6uUsV44j0kcsOWHdE8p5TmVVuHzN WTVtCXPfJdm7XFExFeSJCtMS4GdktvTOz0qdl8Nf6TYI7zl4gVM9H0M7x/632PxG1qYu XiErv2vSu9Z2PED+vQFf5LSKqnTIHES5UaqVpYZW0u5/itoCEjLm7EHUO3hDVRvxzdpt 1g+sqxN7eCKWmFOJCvch21xrl7uMFl4AJHpo0wEwZqzc6i5DjRJNtmAY3XcvNEU8Vptz gMyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076485; x=1778681285; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=wbr7TSm9rrQFY/Tg9TLQeycsBQGCDHg2nKtliBN7mQk=; b=M7Bu8FSpWc+PS1Irk/1YRNSSNVcZMP11rRynTonV7SRV+mBdtIoUONe1CCGzdQb0M2 D8a/Pslw6faedGYY5snOoMhyHB5UVA972J8+CCc19Fa9P1tMQ3qPTnEYW7YqWxMKwLtI NflrmYj0pmZTCcV8nOdPngHQ1AaJ1VnPcyP1gOACofcqVuxXvGIf8yXeadthCMtPU40L FA4fys7GzMjLlQn9mvdC3psyBCCw6soFGH/ZSUfRVqng6WHamNdHBXYvDYAM25FJ58q8 qJ6rHFp+vwY+23gEYiP8ioHnX5GvdGm1l63vhHSTmqw+DbYyCcuDm5WRkaZ6OshocrCV U13A== X-Gm-Message-State: AOJu0Yx45N6V2czYisBwY4e56bwyw6nTm4XPtRFoAIQl31jcYkX+r2tN tx8GTXaT/gCmD2iDXmfhwyx6rdr0PeIpFExOgrXwHXT6dotiGoRWpQmIufS4/vwqrTjoN3KfGpk TDIc8Edk= X-Gm-Gg: AeBDietONGO9C8VzJ+PR8vbIhyichjU6duNFOztITGdDY3CrHqUKaXwAHsqDABHj9Ak HvQVKFQcqhG4eDE6ghvZIyv4lD90dOq2M2G+JYyx22mL6k4HLg19tXujzTC8fdE4h8EAfKdAkfR puBMziUUZWssL05z87berJUssiohpWsPjqBTis545AeKR4je53tMiL3xts66v1BxuGK82Y174dH 9+2hqZfl3S1pB0j/hfl90x9fVEMPCrveq0JAdC+BA9Ogiw1Si/NKqt0h7a+3fCXGXnJmLGniWFH wte1DDQlGJj87C4Oa6G9egejyyUI8KE9PTZszqOguIDQm+IAYDG4rMU+CN85BQwdUY22hgvKSRw hwcak3B6wrc3aMrLF7uezBFManSC5vzBjPGh0v/o9vV3L5OCeVr2UncgyKx+a9nQPySIUssKPPL Pgjua7iMWQS85WVHlYdB4j28fvhSQQkxQWkmJ/JTBTIp4qYSBX5S0bH/y60lEpdWNjjhfrm0ubw Rel2q0FjhU= X-Received: by 2002:a05:6000:2386:b0:44f:f2d5:a401 with SMTP id ffacd0b85a97d-4515d99f5f9mr6028020f8f.37.1778076485013; Wed, 06 May 2026 07:08:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 096/110] target/riscv: Iterate vCPUs using CPU_FOREACH() macro Date: Wed, 6 May 2026 15:55:08 +0200 Message-ID: <20260506135524.20617-97-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076592690154100 Most code iterates over vCPUs using the CPU_FOREACH() macro. Prefer cpu_env(cpu) over &cpu->env. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260415215539.92629-9-philmd@linaro.org> --- hw/riscv/boot.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 9086793b7a7..ae2f86c7ceb 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -505,10 +505,11 @@ void riscv_setup_direct_kernel(hwaddr kernel_addr, hw= addr fdt_addr) { CPUState *cs; =20 - for (cs =3D first_cpu; cs; cs =3D CPU_NEXT(cs)) { - RISCVCPU *riscv_cpu =3D RISCV_CPU(cs); - riscv_cpu->env.kernel_addr =3D kernel_addr; - riscv_cpu->env.fdt_addr =3D fdt_addr; + CPU_FOREACH(cs) { + CPURISCVState *env =3D cpu_env(cs); + + env->kernel_addr =3D kernel_addr; + env->fdt_addr =3D fdt_addr; } } =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076564; cv=none; d=zohomail.com; s=zohoarc; b=A4Vy0c3jWTg7SZd3Rov8WWZ0NjJ6G0fUU/habHuVVHDCD8S83P8oQB5dkVzjpiXHJPykIdxPXBmhmOjzwSAXfS3T3c/VsnQG3tKArb3OGN5SMDr36hCcOqGwIuXYM4UJ+mlgvnZ5mm1fLG+wXWY8GLElSNnCrfOiDMb6k5UOHz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076564; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=2919rqkJppeOa8VQ6Pm1erdNf5b7nkiclQFbNM3i1/U=; b=kOt8aa7vg5AA8XFDEypv4IVZ1VpEFwP/2gLGdsnwmsuZu3NA73g8ud/QzgqpkZv1gp/JafLHkGu0hxYyD5C7hh7pkWAuLtn42t1FMzB+iErJcMiQaWnUOUCFIpjo3qcc4W4OW8VLAGqj+/c5K8oLEb1zTrOSAfZTe4OVUXI7LQk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076564399607.0236948782642; Wed, 6 May 2026 07:09:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcvR-0002zr-62; Wed, 06 May 2026 10:08:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcvK-0002hi-RL for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:30 -0400 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 1wKcvG-000259-PD for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:25 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-44c4cc7c1cfso3167283f8f.0 for ; Wed, 06 May 2026 07:08:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e530d8691sm41794565e9.2.2026.05.06.07.08.11 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:08:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076493; x=1778681293; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2919rqkJppeOa8VQ6Pm1erdNf5b7nkiclQFbNM3i1/U=; b=XSluwTLv7s9zoyoR45aS/YFTMIJsQADZm7ZI4TRDne/NZYzc/UPdRQiq7g45hgkNy7 7RyfPAwEyH14onBtqzwc2bMCCmQdypNwHv2cXk+32FfFwxp6ICVit+YVfzB2RZg4kN61 Jcjg5Hb0OMuS0j2YFpNCTxlQSrPwcInBh+Pl5c9Bz3cHHVBOvMRKlDQJHDz9OWNOBavR i/H5IURZPBXJHCNrUATkKe7q/6GcYvrlJE8BFdDp38cic83G2l0g4K3y4pdlqbR0VFff sKkhb3xcyVtmCV9ZUtktVoEh/XTrlFBOcR6pPTj1A/aVo00FUG8UQZdJDNbF6qJAd+9B jAwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076493; x=1778681293; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=2919rqkJppeOa8VQ6Pm1erdNf5b7nkiclQFbNM3i1/U=; b=JPZwkAYgI5EZRPVJt6lkyAkguK2iUUbbKvtyw/yy5H3XE3sks0+RjETvm/ZCuPd/ZX XqBJ3lIrc1AI5KkJPKCULjJfosfy/pDgqvt8x9gILU2GDozp1DoSbo8OX1VxUdQNzC7b 6hm00Ql4pX1+Klrmq0fE2RFDeExO1H/IaqfmWSTBiKtneg4ipEC+ycU49KVpuLS2S4iK B10/jQYnkF5P0ESmAbY0ukkuc9Ep8/P32MUq/lQ+9P9/aJZKOI6BtIU4JYYW3t3YEAPm NLTqSgIvO+60PxrS/D/6lgI1ict7+Z2uUfahVax8vZPSeE+b9T/oTi1vHbcCtzpfoPVI GVWw== X-Gm-Message-State: AOJu0YxVyxhqdZ3AoKIQ7M7qexbVcTtvzIOceVVuD6LgeB6duntQZpNA JlI5FmSAzkTRWh/QiJfO/9MyBjQ5tq9CS6S3j9j01DYgg61yDW0Qxk/8NBzwAfjMvH6uDMe045y 4CSpfi0Y= X-Gm-Gg: AeBDiesZt0SgzK20yJi7w9UlmHq9R3zPsixgUz6sYMl4TsAgOX1DF/0U+1uHq+Pj42H RlTnVRVXvCoL0YO93pXM7TBlqZ1FKopSwGA0qK+0gmcAhB2g8d3ZDwDdU2e7NDCWhmyZ3+p8Gql Us6v9C7sKcTvZPXBnq+jQgNiOkVc4Kr9bKaHje0/m2AdG0yBm2SfwV4F1JIBUGlNKmtaXreyJUP ikOt9TOpkfSL0o6ebs6BuUIdqauUMCbQsYAXUI4lC57L6JWJ9DnmbzAk0wJJQMvnwG0goWR0Eqp TyB23ihtMlxecH5411qP69y7GESJCxhPdNALOPeb4vzGMObIWLvo9T/u5aItwshulcoPiv1aFvD Lae1z3t3bIEJvVDnDZwSk4sxFjBbvdlMd9Sa2w8d52wsbiB+TEfkEk3XOvVrj1vkgJDeRQcJYXp J0+q2yKXcmndEL6fmPmOBqIJbLDKxKLlwztuhyB1ErERVGLYg46W+USTB3PpFF4OQG7RZ8ElMpl LAMkqbSBec= X-Received: by 2002:a05:600c:41cc:b0:489:1c1f:35e6 with SMTP id 5b1f17b1804b1-48e51e0bc24mr31963625e9.6.1778076492741; Wed, 06 May 2026 07:08:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 097/110] target/mips: Reduce CPUState scope when used with CPU_FOREACH() Date: Wed, 6 May 2026 15:55:09 +0200 Message-ID: <20260506135524.20617-98-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076566191154100 When possible, reduce CPUState variable scope. Prefer cpu_env(cpu) over &cpu->env. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260415215539.92629-8-philmd@linaro.org> --- target/mips/internal.h | 11 ++++++----- target/mips/tcg/system/cp0_helper.c | 28 ++++++++++++++++------------ target/mips/tcg/system/tlb_helper.c | 7 +++---- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 95b8b7bb9c9..2fd5ffa304a 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -280,7 +280,7 @@ static inline int mips_vpe_active(CPUMIPSState *env) =20 static inline int mips_vp_active(CPUMIPSState *env) { - CPUState *other_cs =3D first_cpu; + CPUState *cs =3D first_cpu; =20 /* Check if the VP disabled other VPs (which means the VP is enabled) = */ if ((env->CP0_VPControl >> CP0VPCtl_DIS) & 1) { @@ -288,10 +288,11 @@ static inline int mips_vp_active(CPUMIPSState *env) } =20 /* Check if the virtual processor is disabled due to a DVP */ - CPU_FOREACH(other_cs) { - MIPSCPU *other_cpu =3D MIPS_CPU(other_cs); - if ((&other_cpu->env !=3D env) && - ((other_cpu->env.CP0_VPControl >> CP0VPCtl_DIS) & 1)) { + CPU_FOREACH(cs) { + CPUMIPSState *other_env =3D cpu_env(cs); + + if ((other_env !=3D env) && + ((other_env->CP0_VPControl >> CP0VPCtl_DIS) & 1)) { return 0; } } diff --git a/target/mips/tcg/system/cp0_helper.c b/target/mips/tcg/system/c= p0_helper.c index 123d5c217c1..8b83ba16399 100644 --- a/target/mips/tcg/system/cp0_helper.c +++ b/target/mips/tcg/system/cp0_helper.c @@ -1566,13 +1566,14 @@ target_ulong helper_emt(void) =20 target_ulong helper_dvpe(CPUMIPSState *env) { - CPUState *other_cs =3D first_cpu; MIPSCPU *cpu =3D env_archcpu(env); target_ulong prev =3D cpu->mvp->CP0_MVPControl; =20 if (env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) { - CPU_FOREACH(other_cs) { - MIPSCPU *other_cpu =3D MIPS_CPU(other_cs); + CPUState *cs =3D first_cpu; + + CPU_FOREACH(cs) { + MIPSCPU *other_cpu =3D MIPS_CPU(cs); /* Turn off all VPEs except the one executing the dvpe. */ if (&other_cpu->env !=3D env) { other_cpu->mvp->CP0_MVPControl &=3D ~(1 << CP0MVPCo_EVP); @@ -1585,13 +1586,14 @@ target_ulong helper_dvpe(CPUMIPSState *env) =20 target_ulong helper_evpe(CPUMIPSState *env) { - CPUState *other_cs =3D first_cpu; MIPSCPU *cpu =3D env_archcpu(env); target_ulong prev =3D cpu->mvp->CP0_MVPControl; =20 if (env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) { - CPU_FOREACH(other_cs) { - MIPSCPU *other_cpu =3D MIPS_CPU(other_cs); + CPUState *cs =3D first_cpu; + + CPU_FOREACH(cs) { + MIPSCPU *other_cpu =3D MIPS_CPU(cs); =20 if (&other_cpu->env !=3D env /* If the VPE is WFI, don't disturb its sleep. */ @@ -1608,12 +1610,13 @@ target_ulong helper_evpe(CPUMIPSState *env) /* R6 Multi-threading */ target_ulong helper_dvp(CPUMIPSState *env) { - CPUState *other_cs =3D first_cpu; target_ulong prev =3D env->CP0_VPControl; =20 if (!((env->CP0_VPControl >> CP0VPCtl_DIS) & 1)) { - CPU_FOREACH(other_cs) { - MIPSCPU *other_cpu =3D MIPS_CPU(other_cs); + CPUState *cpu =3D first_cpu; + + CPU_FOREACH(cpu) { + MIPSCPU *other_cpu =3D MIPS_CPU(cpu); /* Turn off all VPs except the one executing the dvp. */ if (&other_cpu->env !=3D env) { mips_vpe_sleep(other_cpu); @@ -1626,12 +1629,13 @@ target_ulong helper_dvp(CPUMIPSState *env) =20 target_ulong helper_evp(CPUMIPSState *env) { - CPUState *other_cs =3D first_cpu; target_ulong prev =3D env->CP0_VPControl; =20 if ((env->CP0_VPControl >> CP0VPCtl_DIS) & 1) { - CPU_FOREACH(other_cs) { - MIPSCPU *other_cpu =3D MIPS_CPU(other_cs); + CPUState *cpu =3D first_cpu; + + CPU_FOREACH(cpu) { + MIPSCPU *other_cpu =3D MIPS_CPU(cpu); if ((&other_cpu->env !=3D env) && !mips_vp_is_wfi(other_cpu)) { /* * If the VP is WFI, don't disturb its sleep. diff --git a/target/mips/tcg/system/tlb_helper.c b/target/mips/tcg/system/t= lb_helper.c index b989c7e5bd5..45cbeb40a2d 100644 --- a/target/mips/tcg/system/tlb_helper.c +++ b/target/mips/tcg/system/tlb_helper.c @@ -346,15 +346,14 @@ void helper_ginvt(CPUMIPSState *env, target_ulong arg= , uint32_t type) uint32_t invMsgVPN2 =3D arg & (TARGET_PAGE_MASK << 1); uint8_t invMsgR =3D 0; uint32_t invMsgMMid =3D env->CP0_MemoryMapID; - CPUState *other_cs =3D first_cpu; + CPUState *cpu =3D first_cpu; =20 #ifdef TARGET_MIPS64 invMsgR =3D extract64(arg, 62, 2); #endif =20 - CPU_FOREACH(other_cs) { - MIPSCPU *other_cpu =3D MIPS_CPU(other_cs); - global_invalidate_tlb(&other_cpu->env, invMsgVPN2, invMsgR, invMsg= MMid, + CPU_FOREACH(cpu) { + global_invalidate_tlb(cpu_env(cpu), invMsgVPN2, invMsgR, invMsgMMi= d, invAll, invVAMMid, invMMid, invVA); } } --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076765; cv=none; d=zohomail.com; s=zohoarc; b=n/7t/E65G4igo2tSdSE8sOuEghzNd1B+EkoACe/qrk7LVRbc0nuqOVZgIeQo4v3fInn0FcLyz4u3wNPG4wQa4o25JVj+IuPC6nLWhIt9nOBPjhecoqwGozReVZ/M8TGlbFC+csmf2m4VE+/mF/pXKbw96S7Cn/Hf1d5joa46FLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076765; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=9RICF6DM7j3DDPVVqH7dOlS6B3hpcugv7s9C+BNqulg=; b=Jzww/kVxcTDoAKglU88YCSm63dGEqik8ho2hL7f6S0MPWIVg7mT+gJ/rP6/YvUSnRrsLCTz1LiezJBm6UHZNScNJqv6lAYDaG2fLt+PwMwOpfroG/ABItlO4YCFMT4Yc1gio9o2bINgegV7BVaMrO0ZNi/MrH4A8aSAp/4HfUTk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076765163141.84772659217833; Wed, 6 May 2026 07:12:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcvT-0003KI-Au; Wed, 06 May 2026 10:08:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcvK-0002hj-Rc for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:30 -0400 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 1wKcvH-00025k-6u for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:25 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-488ff90d6c7so61664005e9.2 for ; Wed, 06 May 2026 07:08:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5313b023sm28452585e9.5.2026.05.06.07.08.18 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:08:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076500; x=1778681300; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9RICF6DM7j3DDPVVqH7dOlS6B3hpcugv7s9C+BNqulg=; b=huk8nzuR7fqGPQU+oXcNqt8ivg/qm3YRSWqu6+bc9dP2Y8IDCxhCmedp0DL+W5HXZe Lp2iNRJeEopWxWXcxvCxXXorrQKnGqTMkzpu7/rxxSPi5tH0bEdKfwLVEfGM/make/65 vnqRXJd7QqzN6r9OTBfk8x7OIh1SGXnxBvUeQ4RszdZXxmrkOXqKaQPqkUESuzsUMiju 8nzGPbfxgJrR5UwqEfCEp9YA250vx/Bbp8MkooXQvFlUKT5vvfsO2dF9fdbG6oIRpJ+R ZhuPLvdHysdqglKiRv4XYfkfroOPU5q7yY4JJ+xo6rHzQ7UktCCA3zt7Mc4Hmw8YNCHm FtSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076500; x=1778681300; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=9RICF6DM7j3DDPVVqH7dOlS6B3hpcugv7s9C+BNqulg=; b=kY26ihqQGX67kus/zLIfLBZJMMzwt0Eml2Qvc66Z2eJK/1WuFV6IGTPCLHAe8XQuvs lmK4vbTvXJpWkLGpoUvDAtUh8wv7RvcK6LWJ+9qzsTMxAWBR6Dpn28c7aCWOCFLiCe3K DlhkdGuVpmJKpLOMIpvZxKAuxyel60Advg6oNkJqqjtb6D06jk1uZA6GIZ4E4fx2tyMH sypXewpCX0oPxUb4iGQVzdL8eovvBW0TCDRYjI/ttu7Opp0pNiN10O93Mv3IGb0Wf4iv plUgrynnRw3PQR7uHOq69B4gBx1iv2aUAnst2jkNT+NV7cdHBuXGoVQXu+Rk7/m++ZGP 9yGw== X-Gm-Message-State: AOJu0YwWIQTlyBKH1pt7045QYCDzYQW/ooMalqDiRt8D/m83buAMlmqB Z2xNE1OU4z9mbcxHhxV+m+esy1sn03imCDP/9+5x/7RlKBZnKQOfvDM35Qx0KimH6ZnBwVlZ02x hB+24LDY= X-Gm-Gg: AeBDievOiVx2rA6uVRilcSy5DRmj7vZHYgF510774ykeziVBlq51nAX//BB/D5SFlW5 B/SzOiLAZKCtFNgVCOLBfTnndS2FjeDyJJlIeE6x+xtsB+5uQ7rYNevxFBu/9CfXDEMBMHkIbkj r+wCifsaH3lbMZdKBrKgictA2mAw3uCj+Gb8Rqc6WJYUiH9AT9nSdVmPgIpYQChHfsZap3FRtgl BBVrK2LALucPa2+ULLPl0LQnvyeWGidfeCh1eXeYs0VzFH/itmCoNvaV/3qxJo9HsAoH+MJGjOs d8/rQJgH3bYJkLfVhe5wDWDCKGajcgNm60p2Zv7OGMiu0u0AqC+kzE2yJ4Lp/eDV0WYL0U7Pcec b1Bec+0HUeKMmllHX/kpMow1pumgEccAqnptTO1dPGTOPEQB8X5OpJieeCrUtXZsov1Q50WEJbS D+I15l2RzLrZcaiy9RJz2kXANrC3UawOBCbr3YAm9dywG/6B5IpASJj4SEhYZ24sSpmLx5+j7/X 7uYxSOuCdM= X-Received: by 2002:a05:600c:8485:b0:488:af7f:775f with SMTP id 5b1f17b1804b1-48e51f32a64mr67493085e9.18.1778076500488; Wed, 06 May 2026 07:08:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 098/110] target/mips: Do not initialize variable used by CPU_FOREACH macro Date: Wed, 6 May 2026 15:55:10 +0200 Message-ID: <20260506135524.20617-99-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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: 1778076767484154100 The CPU_FOREACH() macro, defined in "hw/core/cpu.h", ends up calling QTAILQ_FOREACH_RCU() which always assigns its iterator variable when entering the loop. Remove the pointless and possibly misleading assignment. Mechanical patch using the following coccinelle spatch: @@ type T; identifier e; iterator FOREACH_MACRO =3D~ ".*_FOREACH.*"; statement S; @@ - T *e =3D ...; + T *e; ... when !=3D e FOREACH_MACRO(e, ...) S Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260415215539.92629-7-philmd@linaro.org> --- target/mips/internal.h | 2 +- hw/misc/mips_cpc.c | 4 ++-- target/mips/tcg/system/cp0_helper.c | 8 ++++---- target/mips/tcg/system/tlb_helper.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 2fd5ffa304a..23e1ada1852 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -280,7 +280,7 @@ static inline int mips_vpe_active(CPUMIPSState *env) =20 static inline int mips_vp_active(CPUMIPSState *env) { - CPUState *cs =3D first_cpu; + CPUState *cs; =20 /* Check if the VP disabled other VPs (which means the VP is enabled) = */ if ((env->CP0_VPControl >> CP0VPCtl_DIS) & 1) { diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c index 9d9c8bf6ec8..9ce37514d5b 100644 --- a/hw/misc/mips_cpc.c +++ b/hw/misc/mips_cpc.c @@ -45,7 +45,7 @@ static void mips_cpu_reset_async_work(CPUState *cs, run_o= n_cpu_data data) =20 static void cpc_run_vp(MIPSCPCState *cpc, uint64_t vp_run) { - CPUState *cs =3D first_cpu; + CPUState *cs; =20 CPU_FOREACH(cs) { uint64_t i =3D 1ULL << cs->cpu_index; @@ -63,7 +63,7 @@ static void cpc_run_vp(MIPSCPCState *cpc, uint64_t vp_run) =20 static void cpc_stop_vp(MIPSCPCState *cpc, uint64_t vp_stop) { - CPUState *cs =3D first_cpu; + CPUState *cs; =20 CPU_FOREACH(cs) { uint64_t i =3D 1ULL << cs->cpu_index; diff --git a/target/mips/tcg/system/cp0_helper.c b/target/mips/tcg/system/c= p0_helper.c index 8b83ba16399..ba6b487b751 100644 --- a/target/mips/tcg/system/cp0_helper.c +++ b/target/mips/tcg/system/cp0_helper.c @@ -1570,7 +1570,7 @@ target_ulong helper_dvpe(CPUMIPSState *env) target_ulong prev =3D cpu->mvp->CP0_MVPControl; =20 if (env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) { - CPUState *cs =3D first_cpu; + CPUState *cs; =20 CPU_FOREACH(cs) { MIPSCPU *other_cpu =3D MIPS_CPU(cs); @@ -1590,7 +1590,7 @@ target_ulong helper_evpe(CPUMIPSState *env) target_ulong prev =3D cpu->mvp->CP0_MVPControl; =20 if (env->CP0_VPEConf0 & (1 << CP0VPEC0_MVP)) { - CPUState *cs =3D first_cpu; + CPUState *cs; =20 CPU_FOREACH(cs) { MIPSCPU *other_cpu =3D MIPS_CPU(cs); @@ -1613,7 +1613,7 @@ target_ulong helper_dvp(CPUMIPSState *env) target_ulong prev =3D env->CP0_VPControl; =20 if (!((env->CP0_VPControl >> CP0VPCtl_DIS) & 1)) { - CPUState *cpu =3D first_cpu; + CPUState *cpu; =20 CPU_FOREACH(cpu) { MIPSCPU *other_cpu =3D MIPS_CPU(cpu); @@ -1632,7 +1632,7 @@ target_ulong helper_evp(CPUMIPSState *env) target_ulong prev =3D env->CP0_VPControl; =20 if ((env->CP0_VPControl >> CP0VPCtl_DIS) & 1) { - CPUState *cpu =3D first_cpu; + CPUState *cpu; =20 CPU_FOREACH(cpu) { MIPSCPU *other_cpu =3D MIPS_CPU(cpu); diff --git a/target/mips/tcg/system/tlb_helper.c b/target/mips/tcg/system/t= lb_helper.c index 45cbeb40a2d..c850ddd9650 100644 --- a/target/mips/tcg/system/tlb_helper.c +++ b/target/mips/tcg/system/tlb_helper.c @@ -346,7 +346,7 @@ void helper_ginvt(CPUMIPSState *env, target_ulong arg, = uint32_t type) uint32_t invMsgVPN2 =3D arg & (TARGET_PAGE_MASK << 1); uint8_t invMsgR =3D 0; uint32_t invMsgMMid =3D env->CP0_MemoryMapID; - CPUState *cpu =3D first_cpu; + CPUState *cpu; =20 #ifdef TARGET_MIPS64 invMsgR =3D extract64(arg, 62, 2); --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076768; cv=none; d=zohomail.com; s=zohoarc; b=FLsuTSZmi4ANeeJ4D56sPdZffHn/TCvz9/zJgdCoEa+aIZi67D3Kq8mP2q4e/1bDq6OYdaaYLLcS0M8idn35XjwrFvt/3yztl2UBb93EJPB6S97xzxgWA0YZPkj8gyWKHVOkfWA9av4ecOvUH+vlzxNlqFpnkWM5tEuNLrJXs/8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076768; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=PWbNAwxgFE54VWoaiHwHEhttmkywv5oUyoPiI95fGyA=; b=YUCkRry9Uluf0fZWNzd6gD2R0/xjb3qXx9cUQN+ntps7Nhq+TRtoQfVxf4wnyXny07hBr7YOdE3CySIm3PuySGV4taCly0QuHKp0t2APxiqevPlwrEx26pEtsjHCJTlj5crr4xA09hqEDPrPh0pIrB66Xf8+MVbbkMUde2Q3/fQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076768310105.18211324449317; Wed, 6 May 2026 07:12:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcvT-0003H2-3Z; Wed, 06 May 2026 10:08:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcvQ-0002wD-2R for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:32 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcvO-000286-Co for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:31 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-488a88aeec9so72997135e9.2 for ; Wed, 06 May 2026 07:08:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53895f0asm54981505e9.2.2026.05.06.07.08.26 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:08:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076508; x=1778681308; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PWbNAwxgFE54VWoaiHwHEhttmkywv5oUyoPiI95fGyA=; b=dD4m1Og44Orvis9nlhIxsl+Bc40E+3mfcC88dDKHN9rbiL5OQANQeltlbjcsshWUHw 95yXjlBT1SjYr7tHoqmLdvJe5IIy/8NH0v76ZVGTwv2zG5Pth5W9uxcRo6VeXBJPDivE Xy11eMLa3g9NtFxDBNWTkQl8tkrgtIGX3k0FhVYAfw3VjJq6vMYBimw7O5mC+IClbXor Qnmsj+BRcPdepi0gSZOVrILna+EWLHuA5ebYuxGi7LPcEsqyUA0hPJR2TKXfZzij3uYA rWv+Ch/lnVV1AMKmVwCxANutklEIf4EptsCCip3dJL+rmJCGPfnRAU/X/BzmC+H1Gbhl KuQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076508; x=1778681308; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=PWbNAwxgFE54VWoaiHwHEhttmkywv5oUyoPiI95fGyA=; b=Cj4nsD28pqcs47cjRAetQWZKP5yhYW7WqBOnH+oufOz/U7jw4qkwR4bLbtHSHcL8q/ E1LnGhjcZuCkPY14dWaKOEbTu+eRG836ER6NTI/r8PiwsjVXAbkAAvHt1pAiSD22su5j GO6kJ/hh8hiLNmaNuTKzrosROq8RcDaIuiBkDvjNWK+3SKDIjQfDlvovzfD9TLVdstHj rqtsdNxUp3YJYmWqA6dsBpTYyScUG4pnHkxTLo2icfp1u3Y8B6CEaPcNvcQPf+AFyBCo NXV37GXMtZHVdWW6y4+uF6+MGVtfQp1DLxiLb44lofdCioGETbecquZHWyBytGZPye41 YryA== X-Gm-Message-State: AOJu0YwUYltG8vzq5c49uiPFT4u4OUUentJuQ5pO6+lHIOUwRFlewHJe hB26PXr9TsyzqUi6yCsLijc2NHWiLZthmT7p/JUG1gEvIT/cZCmTAGlqXAEAn8feFTtUZnST1l7 sdJrADw0= X-Gm-Gg: AeBDieuZAwqDkTesDIC3u1ANNMdqwFJdgEvlbtQjzOzhqit/afDap5uQuy02BO3R8X0 +TfDWIlFnrWEhv24iy6kh0f6CGImooVItiTB5GQhxCdBPETVdAILtH0b9BLkgFDzfgTd6yI/vv/ cx8a/bMcyHWCmchILCQ7Iez7yki6mpI4W4pOTXjWbm0WmssMUJO2ygQNM5vmpQLP05H+ahgqsjm pNePlWXSqvJTz8j88lUp4lsVW42oL37lScAf0ucebr5Y0uGW2HXP8TL5BvXfCTopc2luqvBGwD/ TNDsVPHCEU0bF4cs+wcZjiyfn9/iGoTBbwFQRLkEBLnACD/wfguem8R4fVurzZNoihT5L6ej1oc HanHbydq2vFv1knp0Jp95cN1MoVtBwcvaWiVywls7S7A6VT/S9UK3DmXq5uloWnYlkqfHL9eCFW F7oGMDxWnRgSawzHu4P0YnuULMg+cpC3RqXl3odp8E2lydBOcWEHrRRZ+dnW2uRQYDgRMn2c65x CYUfXKSqus= X-Received: by 2002:a05:600c:3548:b0:489:1c1f:35f1 with SMTP id 5b1f17b1804b1-48e51e09706mr62060615e9.4.1778076507793; Wed, 06 May 2026 07:08:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 099/110] target/s390x: Do not compile KVM stubs for linux-user binary Date: Wed, 6 May 2026 15:55:11 +0200 Message-ID: <20260506135524.20617-100-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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: 1778076769537154100 None of these KVM symbols should be used in the qemu-s390x linux-user binary. Do not build the stub there, prefer a real linker failure. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Ilya Leoshkevich Message-Id: <20260423135035.50126-3-philmd@linaro.org> --- target/s390x/kvm/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/kvm/meson.build b/target/s390x/kvm/meson.build index 588a9aa737e..437e12f221f 100644 --- a/target/s390x/kvm/meson.build +++ b/target/s390x/kvm/meson.build @@ -1,5 +1,5 @@ =20 -s390x_ss.add(when: 'CONFIG_KVM', if_true: files( +s390x_system_ss.add(when: 'CONFIG_KVM', if_true: files( 'pv.c', 'kvm.c', 'stsi-topology.c' --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076701; cv=none; d=zohomail.com; s=zohoarc; b=NK+mmKUb0xM3spgbQXe1wQYiU7VaS0GeE4J9ACHSDdAIi8f3BeaNiVL3yVfbgCT2owMG//n5V1/XkpOiXWpPwLldhh6kSMY6S96SxVHVoeyDMkr09+RGB2Kq3U9APuYhYYPQ+PrLF75wWdwB5JinNm3te8BHrpdLmGbakmF5gk0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076701; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=+Cpu8qLZGCubO9MhUb+BAJDaMSuLsGH2ENsBOZgkNkg=; b=A0hzGpG2QWwRQmBw4uNvV5quOYey8esWzi68QNjqhI+kfi+FU9C/ESmPHV/bl4QTu3osZM4ZtOQlF2Sq7VCV7ZS1bMLgJxD0q8x/2v5eXA4GrofsE4Ld2UUyaysGZFlbrUf74pqF/Srvc24NCsfvdsgR9vUZPcGmpRWwBlM4hOU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807670183066.71184354575189; Wed, 6 May 2026 07:11:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcvm-0003zi-Qs; Wed, 06 May 2026 10:08:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcvc-0003vY-Gx for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:48 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcvZ-00029k-Kz for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:43 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4896c22fcbaso50231815e9.0 for ; Wed, 06 May 2026 07:08:40 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5313b023sm28461295e9.5.2026.05.06.07.08.33 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:08:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076518; x=1778681318; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+Cpu8qLZGCubO9MhUb+BAJDaMSuLsGH2ENsBOZgkNkg=; b=NzuXFMHcqEO4EPKmIezQZ4QBLjxUW6DFPSzVcg1yHUbgBaULNqIGVW3iBDAB85g7H/ 3D4lRy2EeEvo1HU00JDjBTYLGI332aq8r5oT6SMomipiggOCxgIDUEvzVaJTAYMy13O8 gxdaKfcGHZDlEGef6Shdh532qEbOgEQVFLWIK/gPSZjCdgvyiGHyUPxd8GDFFIjbLnUn GOoUUxCf1/DRtIbPLhpOMdjLFjdSv+48GeRxw/Qss4yuQllVp9iew3HauUdoUFki93TV 2lkC9fiu33sdmh7PDQ0DiBao+90m1t21Hz/Toc/92MGJ3S/xIiGvOOVoqN6EbSRSD9H1 XtpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076518; x=1778681318; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=+Cpu8qLZGCubO9MhUb+BAJDaMSuLsGH2ENsBOZgkNkg=; b=aZKWHu5mnhPEtQ30Ss2rZdNkck1rwxJqvSu2VHk/6kOXDasuRvUYHLY0jPb5pgvyyn VDBm+/Ap0pq4xsWVF/oQ12mSq2Bj2X0ktwcQ5J8NbCheFgY8FC7A8r98ME1lnxSO7hOu nVAHgmbLwPwwCE3EdLk6cxgqnHtLX4dmK7N6xwMI1ltdBAOuqQ8dLic5PTbHg4kMont2 jBoE7ewDn9dNM6vzZAzaY0i9nfTSd+oT/c7q34epf+tJgH2EUc30PZgIqAvY/RM3OmPV apSKgBr48QetH0CowD9gmT2GSB/o+6oe7j5I+iBgw4fiPDDP0pFV5IG9u/tRgEctoOQ8 BsBw== X-Gm-Message-State: AOJu0YxhiprBzDQ32rW37i2afvS8xfszF7F7AmuHxGJkOHtUuQytGS4n NY//bMdNwbToJuxg/sK3KWxUUbSrOJ5YtMJW6qdIKOp1rJgNJHTrtIh/FI5bEHxYfeXPjGxxpAk 9vEm9NNw= X-Gm-Gg: AeBDiev92jAyca2EdrcJUVjM2UaUpZfjTuXW/UoBqoETQ0CfkjLShtToVcT4FF/VooB xWhgStYwgdODExrELOnPCSE9jCOkRi/N1FSwX6DA9owYZQilhSMm0tWr1uOYjTRDRAlbSTSIAQs oU3gvWH2ekY2QzHb/72tfCbkAWbwEIEEDDELecOyELse15bS8ut6s6PhU9ogNKzXjUralz/9P5A usSOkKHi5pquaG8U9XrIo82KoLc4E0myIVRinefFqA1V0lOS5VGcaaSjBoFYWHfumKFhr44Iv5Q fmmMe6wvwbX+B6bzJA/p+1IyGMDB0CsWB2vUjIiy1edkbTvfKDj5JkYV4DfH2x52LXQBasRXf03 6G9Xr2vfwOvBdOBdTBZ2w9t3nzp5qYk/jLpaMCy/EYLCiX99gaRk5itnsERx6t8zQhcb841FZ/H J/bnUCQsDC8YL61qyPMHZfdt2wgoLQ1R3pDnittEaRjEMfiqk8KDQDdXxyhWE2/MMHdCMx8y9pg SX3EnUzFLM= X-Received: by 2002:a05:600c:26c8:b0:489:1f04:96c3 with SMTP id 5b1f17b1804b1-48e51e0c80dmr38823955e9.2.1778076515630; Wed, 06 May 2026 07:08:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 100/110] target/xtensa/core: register types using type_init Date: Wed, 6 May 2026 15:55:12 +0200 Message-ID: <20260506135524.20617-101-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1778076704544154100 From: Pierrick Bouvier Instead of using a static constructor, delay registering those types until we call module_init(MODULE_INIT_QOM). This is not yet a problem, but since we will start initializing target-info types before any other, without this patch qemu-system-xtensa* fails with: Type 'dsp3400-xtensa-cpu' is missing its parent 'xtensa-cpu' Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Pierrick Bouvier Message-ID: <20260430203842.29156-4-pierrick.bouvier@oss.qualcomm.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/xtensa/overlay_tool.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/xtensa/overlay_tool.h b/target/xtensa/overlay_tool.h index 701c00eed20..b9eaffa4871 100644 --- a/target/xtensa/overlay_tool.h +++ b/target/xtensa/overlay_tool.h @@ -451,13 +451,14 @@ =20 #if TARGET_BIG_ENDIAN =3D=3D (XCHAL_HAVE_BE !=3D 0) #define REGISTER_CORE(core) \ - static void __attribute__((constructor)) register_core(void) \ + static void register_core(void) \ { \ static XtensaConfigList node =3D { \ .config =3D &core, \ }; \ xtensa_register_core(&node); \ - } + } \ + type_init(register_core) #else #define REGISTER_CORE(core) #endif --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076591; cv=none; d=zohomail.com; s=zohoarc; b=FzscuUsZFsQkGrHW7OfhBFju7V0ThdPvUsrfiUu4c551FPA19WGqgUXvD1a/NIpkrMfx1xRjV2LllRQX295oKLD0PpdFIekUKmX7WLFu1abNcLj7ankZtBFAJ7PyRXe7B/QyreEUlR3CpTZq+VexNbr5dp3qI+r8P9fhzKGv1hM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076591; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=2YScFuD/G2yULe3kqslcvrkPGjbEWx3inHxGy7MRNZQ=; b=ekNUeOKnrxvTGHrEG/tRrcZA/vjv6oOK5NorkF5aED1gkdHVMqIf1vdA1mX+mai8NTsKVakhz110RejjGQkDBcgN60CDXf5iccxWyMMIV6HRQ7SptiVQzl5aVhGXU8JMstdDdxZV98cjwcjEhbeX+2ygnsqdLNsZbAwpAui1H14= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076591564234.4257402195134; Wed, 6 May 2026 07:09:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcvr-0004DN-4E; Wed, 06 May 2026 10:08:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcvh-0003vq-1q for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:50 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcvf-0002AL-97 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:48 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-44b052142e1so2797524f8f.1 for ; Wed, 06 May 2026 07:08:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4505285e765sm12365586f8f.10.2026.05.06.07.08.42 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076525; x=1778681325; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2YScFuD/G2yULe3kqslcvrkPGjbEWx3inHxGy7MRNZQ=; b=A26Od+oTsMSf3PpO0ePppc8jQkXtfep/sHZIdZBLPCq+JxRa2HzC1f3Z+uJaaNHf1W +w8pKz5QzIRlLeQhXLO7DqAyHLqvnCjR5dFcY5SUhaajUhfY0SCglTJIm1LM4sAGpzLQ YnfbqhANSnT0W8zQEzA2JsIKunjDKTPcrLZKPOcXwlxzSb7gnI2Pf6LiObmOmqUS3bTY ZMdnQNnIjqePQ/Dud+IM8e4v2tR0O6TO1MOktNbNs9+SqjHwQku0v5p9F2X9auN9itin IfB5+RAxas0zc3Ik2kU9LSDn1OxaTRAWys4cYxDuLIyHu3pPnfxP1NWm8mqLLh4SV4MG zUEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076525; x=1778681325; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=2YScFuD/G2yULe3kqslcvrkPGjbEWx3inHxGy7MRNZQ=; b=MPPaZs7Cl3/bhuSBdiqpc4ELXbcgq9+KZp6F9jP18yb5VzI3JiKJMB63I2u6D3dpGS zCHGtED/9kxuj6B/StieG1a6XzrhPK83flmXsf6IlkDTWYa4zW8jOuimWr0IsO+F7z/U NholaGPtTFufWTh+jDwAHcwQ0PzBsC2WUgdal19sr1yyAk+/iwJw6ZWfJ8MmUVD0NMRR a5xqaGIAFaKh1fKDSro465+Z+VRSg+7/QyjIKb9YomWllVRpeZhV0fbJhw0Tdk4+Hr/+ 6lchDL/7UPez4KDdmYxJEG411lZr6dEdDoTzrnm87vepcQszLl5gfjg80IMaw9mcz0fP zH8w== X-Gm-Message-State: AOJu0Yx7EGS0mibAVVNLTmS4PPT+NljLrP06oDSAFmYJ3pIiaeH/iLrl EXtOeH2uCvYUpIFwX6jOy+AppdV49YriDus67vA513PMRgQMnsGcjBrept9K8BrO8CW960R6g9f V4IjcqUQ= X-Gm-Gg: AeBDievy0ZrgNvhqnqDB7SVtoECZ6CoAZ+iihJRve++bjJ/dO3XjciyaeCpqPSKJtPZ r9yH65XV5C34PE68d0Uap6twgjiSJZfoa7IvdWf0//j3FQodYu9g5fnb89oobK9BM2lbK7fx9zb HY6NST50n4qU08wHrgFTMh3cEtZMRy2r3yNHrMU7PceLtsdYtmEn4qQEEBtjhieQCWjDVikQmvI qX4UuazHa6x2xkY5onH114Ko5q6WNEddaFlPbkghaQBrOZIqnsRDtINS4Uf6y92QgCyUN1v7AQB 8AjDCEhXJSRDrp3yEEHfamiznF23xxG+7FGlZ7HgsQJK+YmZkRFS7S9YwA/SVFVAw5fCPQWb6ll 2IhGDlpYeADR5Ae79wGYi42+dWEJjXgQtzUAAGWMY3pMzb7UCigoqc9j92/HQ1zt666Dr26QJdY XCm32i5agIQ3i+xF4dvymrVUKD0nwxxhFoZprB/xKiB9EB1+clN3Vyf8PbVQSTOUigxqu0UBBod xSFFr3Vfn0= X-Received: by 2002:a05:600c:4512:b0:488:c744:49b with SMTP id 5b1f17b1804b1-48e51f539b0mr60021525e9.7.1778076524626; Wed, 06 May 2026 07:08:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 101/110] io: Clear dangling GLib event source tag Date: Wed, 6 May 2026 15:55:13 +0200 Message-ID: <20260506135524.20617-102-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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: 1778076591757158500 Following commit 34aad589019 ("hw/char/virtio-console: clear dangling GLib event source tag"), prevent stale tags from being reused by clearing dangling GLib event source tag during the cleanup phase (finalize, unrealize). Inspired-by: Matthew Penney Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Matthew Penney Message-Id: <20260408100605.66795-2-philmd@linaro.org> --- hw/usb/redirect.c | 4 +--- io/channel-websock.c | 8 ++------ target/i386/kvm/tdx-quote-generator.c | 5 +---- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index fda5bbca676..100afbdb06a 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1494,9 +1494,7 @@ static void usbredir_unrealize(USBDevice *udev) if (dev->parser) { usbredirparser_destroy(dev->parser); } - if (dev->watch) { - g_source_remove(dev->watch); - } + g_clear_handle_id(&dev->watch, g_source_remove); =20 free(dev->filter_rules); qemu_del_vm_change_state_handler(dev->vmstate); diff --git a/io/channel-websock.c b/io/channel-websock.c index 85b22a8822a..617d79c351a 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -950,12 +950,8 @@ static void qio_channel_websock_finalize(Object *obj) buffer_free(&ioc->encinput); buffer_free(&ioc->encoutput); buffer_free(&ioc->rawinput); - if (ioc->hs_io_tag) { - g_source_remove(ioc->hs_io_tag); - } - if (ioc->io_tag) { - g_source_remove(ioc->io_tag); - } + g_clear_handle_id(&ioc->hs_io_tag, g_source_remove); + g_clear_handle_id(&ioc->io_tag, g_source_remove); error_free(ioc->io_err); object_unref(OBJECT(ioc->master)); } diff --git a/target/i386/kvm/tdx-quote-generator.c b/target/i386/kvm/tdx-qu= ote-generator.c index dee8334b27a..002bc40c8a8 100644 --- a/target/i386/kvm/tdx-quote-generator.c +++ b/target/i386/kvm/tdx-quote-generator.c @@ -74,10 +74,7 @@ static void encode_header(char *buf, size_t len, uint32_= t size) { static void tdx_generate_quote_cleanup(TdxGenerateQuoteTask *task) { timer_del(&task->timer); - - if (task->watch) { - g_source_remove(task->watch); - } + g_clear_handle_id(&task->watch, g_source_remove); qio_channel_close(QIO_CHANNEL(task->sioc), NULL); object_unref(OBJECT(task->sioc)); =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076726; cv=none; d=zohomail.com; s=zohoarc; b=iAp7EutJgifb/XyboxdLb7rC9Rf10f5D57KMxtYQeUsztnqFSTZsFwSm4UIdgezVgsw25Djp2ItY9tozNNoDV9OtNqQZdAMHaOWxJssQToeic1QWPvIl3ecnuvalEUBfovFOGk8bcnhkpwvmJLgvjzAVVdxX/TTJ6rmft6jBWSs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076726; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=a11/gtG0jF1VWPlJJVKlu/AgeHXIKLDxKd6uKAJXj/E=; b=CjyEyLdtCu7/XSfPeDhpZzY+f9E24ZR+GJPZjTHeL+hxqNy4cyArgKlhIOhqfYfmFXssZZZVhTNUgCKRgectUoae/Eb+ZuqbCMwkS6ksqZsGVUShXRvp3MmYyl/9coC6KtJBlUcTboyPftJ5EWjMYQo4oyzZOcSq4exjLoTOqmg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076726385112.13715500389321; Wed, 6 May 2026 07:12:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcvt-0004JR-51; Wed, 06 May 2026 10:09:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcvp-0004AD-Qh for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:58 -0400 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 1wKcvn-0002BV-4G for qemu-devel@nongnu.org; Wed, 06 May 2026 10:08:57 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4891f625344so10925905e9.0 for ; Wed, 06 May 2026 07:08:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5389da63sm49794045e9.4.2026.05.06.07.08.50 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076532; x=1778681332; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=a11/gtG0jF1VWPlJJVKlu/AgeHXIKLDxKd6uKAJXj/E=; b=oSNA+4qy11OTJDdXUEaeH1cec2PRL5IAk2GWBJsPPkZ+rgV3xX6IpEaGVDbOMOb3pj 9PoxK/V4cboCklHCuaXU3pYuYRoaAkjv3acSnKY3RdGuwQcwb1uptEZkhXcM7b1Xy0Cj Ju6jpI4mYpRaRvAGqyMI8AnBJhVlc5SMCGWz/aOgjyStPM7BVkQkDp/IOUP1y4zuMJ3r pbjo2Yy6jUx3K1t2EAltaKhQ4N+QLTZ6oGj6C2QbSdG7E+mPoA4cQbrfSbi7JWs+flXk MFgRPLqoeJ8g5cxHj7gJMPaoST0DHRBEsHjXaW2ILAMW7gLkF/hZC2MD8ezoztTT48IA gDSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076532; x=1778681332; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=a11/gtG0jF1VWPlJJVKlu/AgeHXIKLDxKd6uKAJXj/E=; b=ZqD92ffd6kCpDHrD8K3YwpuJCEq8X/nutXuH/xJjxDXVegmFEtPC3lPpDBv+92FnCu 306oRpB0JOPFlj4psM+076T/M0M8BqgyngkjzhtTPAvomjH78eDhA9awF7QrlTyhEbwU zwE2fDhGKXieSrSqgGfekywTWRBg84u/pGLtrAeq14kITsukagSfVcPQK98xI4l6kLat kuHfBVXIH/ox5g436+bGVBGtvkiVrZ6e/ZQCWHw9QY/sz/CWgq4DnbUIgBbjq1PDT1ev 3Rg0KP95k8UWPVmgwG07IC4gCVyC953bo2Gh+fCo/Fu3z+HBiJb0b9VcR2WwZs0r3RM5 IV5g== X-Gm-Message-State: AOJu0YzDfSbGOZ1ATqROzdFKMuuAJLxjyVdqy21JObZU3McvKKK2D5li WSdJY3svTVWWFV56XzLpLrYCbuPq968tm/OMstgEsvQPx5YZjBNRsHjAryhJP982EkEwwdHuM9w 3//oO1Yg= X-Gm-Gg: AeBDiesK/WHtX03M/Ha4C8bvzKsg4arPvo7BtNsN/2ZT7hyfFKCsqeujsi1+psJC9Iu NdyvOgJoTYa7IK6tQIcStfyZEfaJ7aGVIQ5BSNyT9/bjSIE7rFKuizrt2TKiN9rCEz75o0JCJfd qypfNb0VppeOAGtJoek9Rsb4H3yoUFQhTVWehBvyN7eovq0undiz5hm8YaAzvV4TQ+sY2vHlGRF riqstNEJ5MpGlxWEWTd4Q1gWXz3lwbYPkT6LHT0EdmqCrxgV1TpOb1wlgekifdzUWIuV4K1eTO5 jFJE0PV+LuOauEdjxDE2J+zES7yw+HSMz2gtrrgL0F5t92iflsYg/nNCGf66N0BxoHbEJr8TC0n 876wF3hXYfL7bSP2HJMxBYch5C/te0ylWONZ83500PxU7WXhis7MtS5uSYIa/dJP0khQQDn6adU CCM0p8hDjcRZ/ViqkNIvAUvHF5CfSbR7Ici2SG36WcPf8kcypjCX8zYyAeaIoqme1slTJ58O3wL cWDxQneuWc= X-Received: by 2002:a05:600c:a305:b0:489:1abb:5559 with SMTP id 5b1f17b1804b1-48e5227db96mr34234345e9.5.1778076532304; Wed, 06 May 2026 07:08:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 102/110] io: use g_clear_handle_id() for GSource cleanup Date: Wed, 6 May 2026 15:55:14 +0200 Message-ID: <20260506135524.20617-103-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076726880158500 Use g_clear_handle_id() instead of g_source_remove() with manual ID checking and zeroing. This simplifies the code and ensures consistent handling of GSource IDs, since g_clear_handle_id() checks for a non-zero ID before calling the cleanup function and zeros it afterwards. No functional change intended. Mechanical change using the following Coccinelle spatch script: @@ expression TAG; @@ - if (TAG > 0) { + if (TAG) { g_source_remove(TAG); <... when !=3D TAG TAG =3D 0; ...> } @@ expression TAG; @@ - g_source_remove(TAG); - TAG =3D 0; + g_clear_handle_id(&TAG, g_source_remove); @@ expression TAG; @@ - if (TAG) { g_clear_handle_id(&TAG, g_source_remove); - } Inspired-by: Matthew Penney Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Matthew Penney Message-Id: <20260408100605.66795-3-philmd@linaro.org> --- hw/char/cmsdk-apb-uart.c | 5 +---- hw/char/nrf51_uart.c | 5 +---- hw/char/serial.c | 6 +----- hw/char/stm32l4x5_usart.c | 5 +---- hw/char/terminal3270.c | 5 +---- hw/char/virtio-console.c | 10 ++-------- hw/usb/redirect.c | 5 +---- io/channel-websock.c | 13 +++---------- net/passt.c | 8 ++------ net/stream.c | 15 +++------------ net/stream_data.c | 5 +---- net/vhost-user.c | 8 ++------ ui/dbus-clipboard.c | 6 ++---- ui/input-barrier.c | 6 +----- ui/vnc-auth-vencrypt.c | 6 +----- ui/vnc-ws.c | 12 ++---------- 16 files changed, 25 insertions(+), 95 deletions(-) diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c index edb80f61819..0631821a571 100644 --- a/hw/char/cmsdk-apb-uart.c +++ b/hw/char/cmsdk-apb-uart.c @@ -236,10 +236,7 @@ buffer_drained: =20 static void uart_cancel_transmit(CMSDKAPBUART *s) { - if (s->watch_tag) { - g_source_remove(s->watch_tag); - s->watch_tag =3D 0; - } + g_clear_handle_id(&s->watch_tag, g_source_remove); } =20 static void uart_write(void *opaque, hwaddr offset, uint64_t value, diff --git a/hw/char/nrf51_uart.c b/hw/char/nrf51_uart.c index 73069232441..96f0d085fdd 100644 --- a/hw/char/nrf51_uart.c +++ b/hw/char/nrf51_uart.c @@ -104,10 +104,7 @@ buffer_drained: =20 static void uart_cancel_transmit(NRF51UARTState *s) { - if (s->watch_tag) { - g_source_remove(s->watch_tag); - s->watch_tag =3D 0; - } + g_clear_handle_id(&s->watch_tag, g_source_remove); } =20 static void uart_write(void *opaque, hwaddr addr, diff --git a/hw/char/serial.c b/hw/char/serial.c index 0f3469a1e8f..0729cd2ce9d 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -856,11 +856,7 @@ const VMStateDescription vmstate_serial =3D { static void serial_reset(void *opaque) { SerialState *s =3D opaque; - - if (s->watch_tag > 0) { - g_source_remove(s->watch_tag); - s->watch_tag =3D 0; - } + g_clear_handle_id(&s->watch_tag, g_source_remove); =20 s->rbr =3D 0; s->ier =3D 0; diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c index 736f1e764e6..dd1b0991956 100644 --- a/hw/char/stm32l4x5_usart.c +++ b/hw/char/stm32l4x5_usart.c @@ -280,10 +280,7 @@ buffer_drained: =20 static void usart_cancel_transmit(Stm32l4x5UsartBaseState *s) { - if (s->watch_tag) { - g_source_remove(s->watch_tag); - s->watch_tag =3D 0; - } + g_clear_handle_id(&s->watch_tag, g_source_remove); } =20 static void stm32l4x5_update_params(Stm32l4x5UsartBaseState *s) diff --git a/hw/char/terminal3270.c b/hw/char/terminal3270.c index 1d857bad9bc..989b6f6ee1e 100644 --- a/hw/char/terminal3270.c +++ b/hw/char/terminal3270.c @@ -52,10 +52,7 @@ static int terminal_can_read(void *opaque) =20 static void terminal_timer_cancel(Terminal3270 *t) { - if (t->timer_tag) { - g_source_remove(t->timer_tag); - t->timer_tag =3D 0; - } + g_clear_handle_id(&t->timer_tag, g_source_remove); } =20 /* diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index efe7cd6772e..4737b9a56eb 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -159,10 +159,7 @@ static void chr_event(void *opaque, QEMUChrEvent event) virtio_serial_open(port); break; case CHR_EVENT_CLOSED: - if (vcon->watch) { - g_source_remove(vcon->watch); - vcon->watch =3D 0; - } + g_clear_handle_id(&vcon->watch, g_source_remove); virtio_serial_close(port); break; case CHR_EVENT_BREAK: @@ -255,10 +252,7 @@ static void virtconsole_realize(DeviceState *dev, Erro= r **errp) static void virtconsole_unrealize(DeviceState *dev) { VirtConsole *vcon =3D VIRTIO_CONSOLE(dev); - - if (vcon->watch) { - g_clear_handle_id(&vcon->watch, g_source_remove); - } + g_clear_handle_id(&vcon->watch, g_source_remove); } =20 static void virtconsole_class_init(ObjectClass *klass, const void *data) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 100afbdb06a..bde821e214b 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -1226,10 +1226,7 @@ static void usbredir_chardev_close_bh(void *opaque) usbredirparser_destroy(dev->parser); dev->parser =3D NULL; } - if (dev->watch) { - g_source_remove(dev->watch); - dev->watch =3D 0; - } + g_clear_handle_id(&dev->watch, g_source_remove); } =20 static void usbredir_create_parser(USBRedirDevice *dev) diff --git a/io/channel-websock.c b/io/channel-websock.c index 617d79c351a..1929abf56ac 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -1066,10 +1066,7 @@ static gboolean qio_channel_websock_flush(QIOChannel= *ioc, =20 static void qio_channel_websock_unset_watch(QIOChannelWebsock *ioc) { - if (ioc->io_tag) { - g_source_remove(ioc->io_tag); - ioc->io_tag =3D 0; - } + g_clear_handle_id(&ioc->io_tag, g_source_remove); } =20 static void qio_channel_websock_set_watch(QIOChannelWebsock *ioc) @@ -1246,12 +1243,8 @@ static int qio_channel_websock_close(QIOChannel *ioc, buffer_free(&wioc->encinput); buffer_free(&wioc->encoutput); buffer_free(&wioc->rawinput); - if (wioc->hs_io_tag) { - g_clear_handle_id(&wioc->hs_io_tag, g_source_remove); - } - if (wioc->io_tag) { - g_clear_handle_id(&wioc->io_tag, g_source_remove); - } + g_clear_handle_id(&wioc->hs_io_tag, g_source_remove); + g_clear_handle_id(&wioc->io_tag, g_source_remove); if (wioc->io_err) { g_clear_pointer(&wioc->io_err, error_free); } diff --git a/net/passt.c b/net/passt.c index 4ff94ee509d..d3b5ab426c9 100644 --- a/net/passt.c +++ b/net/passt.c @@ -90,10 +90,7 @@ static void net_passt_cleanup(NetClientState *nc) g_free(s->vhost_net); s->vhost_net =3D NULL; } - if (s->vhost_watch) { - g_source_remove(s->vhost_watch); - s->vhost_watch =3D 0; - } + g_clear_handle_id(&s->vhost_watch, g_source_remove); qemu_chr_fe_deinit(&s->vhost_chr, true); if (s->vhost_user) { vhost_user_cleanup(s->vhost_user); @@ -421,8 +418,7 @@ static void passt_vhost_user_event(void *opaque, QEMUCh= rEvent event) if (s->vhost_watch) { AioContext *ctx =3D qemu_get_current_aio_context(); =20 - g_source_remove(s->vhost_watch); - s->vhost_watch =3D 0; + g_clear_handle_id(&s->vhost_watch, g_source_remove); qemu_chr_fe_set_handlers(&s->vhost_chr, NULL, NULL, NULL, NUL= L, NULL, NULL, false); =20 diff --git a/net/stream.c b/net/stream.c index ea83f4a763a..6df4e251feb 100644 --- a/net/stream.c +++ b/net/stream.c @@ -71,24 +71,15 @@ static gboolean net_stream_send(QIOChannel *ioc, static void net_stream_cleanup(NetClientState *nc) { NetStreamState *s =3D DO_UPCAST(NetStreamState, data.nc, nc); - if (s->timer_tag) { - g_source_remove(s->timer_tag); - s->timer_tag =3D 0; - } + g_clear_handle_id(&s->timer_tag, g_source_remove); if (s->addr) { qapi_free_SocketAddress(s->addr); s->addr =3D NULL; } if (s->data.ioc) { if (QIO_CHANNEL_SOCKET(s->data.ioc)->fd !=3D -1) { - if (s->data.ioc_read_tag) { - g_source_remove(s->data.ioc_read_tag); - s->data.ioc_read_tag =3D 0; - } - if (s->data.ioc_write_tag) { - g_source_remove(s->data.ioc_write_tag); - s->data.ioc_write_tag =3D 0; - } + g_clear_handle_id(&s->data.ioc_read_tag, g_source_remove); + g_clear_handle_id(&s->data.ioc_write_tag, g_source_remove); } object_unref(OBJECT(s->data.ioc)); s->data.ioc =3D NULL; diff --git a/net/stream_data.c b/net/stream_data.c index 03740e9f73e..73b45da9fe3 100644 --- a/net/stream_data.c +++ b/net/stream_data.c @@ -84,10 +84,7 @@ void net_stream_data_rs_finalize(SocketReadState *rs) if (qemu_send_packet_async(&d->nc, rs->buf, rs->packet_len, net_stream_data_send_completed) =3D=3D 0) { - if (d->ioc_read_tag) { - g_source_remove(d->ioc_read_tag); - d->ioc_read_tag =3D 0; - } + g_clear_handle_id(&d->ioc_read_tag, g_source_remove); } } =20 diff --git a/net/vhost-user.c b/net/vhost-user.c index a4bb49bbcff..2d0fc49b4d8 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -215,10 +215,7 @@ static void net_vhost_user_cleanup(NetClientState *nc) s->vhost_net =3D NULL; } if (nc->queue_index =3D=3D 0) { - if (s->watch) { - g_source_remove(s->watch); - s->watch =3D 0; - } + g_clear_handle_id(&s->watch, g_source_remove); qemu_chr_fe_deinit(&s->chr, true); if (s->vhost_user) { vhost_user_cleanup(s->vhost_user); @@ -356,8 +353,7 @@ static void net_vhost_user_event(void *opaque, QEMUChrE= vent event) if (s->watch) { AioContext *ctx =3D qemu_get_current_aio_context(); =20 - g_source_remove(s->watch); - s->watch =3D 0; + g_clear_handle_id(&s->watch, g_source_remove); qemu_chr_fe_set_handlers(&s->chr, NULL, NULL, NULL, NULL, NULL, NULL, false); =20 diff --git a/ui/dbus-clipboard.c b/ui/dbus-clipboard.c index 935b6b1a2ac..90318384ee4 100644 --- a/ui/dbus-clipboard.c +++ b/ui/dbus-clipboard.c @@ -80,8 +80,7 @@ dbus_clipboard_update_info(DBusDisplay *dpy, QemuClipboar= dInfo *info) if (req->invocation && info->types[req->type].data) { dbus_clipboard_complete_request(dpy, req->invocation, info, req->t= ype); g_clear_object(&req->invocation); - g_source_remove(req->timeout_id); - req->timeout_id =3D 0; + g_clear_handle_id(&req->timeout_id, g_source_remove); return; } =20 @@ -183,8 +182,7 @@ dbus_clipboard_request_cancelled(DBusClipboardRequest *= req) "Cancelled clipboard request"); =20 g_clear_object(&req->invocation); - g_source_remove(req->timeout_id); - req->timeout_id =3D 0; + g_clear_handle_id(&req->timeout_id, g_source_remove); } =20 static void diff --git a/ui/input-barrier.c b/ui/input-barrier.c index 74724be8f45..042f63cc5a1 100644 --- a/ui/input-barrier.c +++ b/ui/input-barrier.c @@ -518,11 +518,7 @@ static void input_barrier_complete(UserCreatable *uc, = Error **errp) static void input_barrier_instance_finalize(Object *obj) { InputBarrier *ib =3D INPUT_BARRIER(obj); - - if (ib->ioc_tag) { - g_source_remove(ib->ioc_tag); - ib->ioc_tag =3D 0; - } + g_clear_handle_id(&ib->ioc_tag, g_source_remove); =20 if (ib->sioc) { qio_channel_close(QIO_CHANNEL(ib->sioc), NULL); diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c index d9c212ff328..a1b8cde2292 100644 --- a/ui/vnc-auth-vencrypt.c +++ b/ui/vnc-auth-vencrypt.c @@ -101,11 +101,7 @@ static int protocol_client_vencrypt_auth(VncState *vs,= uint8_t *data, size_t len QIOChannelTLS *tls; vnc_write_u8(vs, 1); /* Accept auth */ vnc_flush(vs); - - if (vs->ioc_tag) { - g_source_remove(vs->ioc_tag); - vs->ioc_tag =3D 0; - } + g_clear_handle_id(&vs->ioc_tag, g_source_remove); =20 tls =3D qio_channel_tls_new_server( vs->ioc, diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c index 9e3503d93d8..65e8b344b65 100644 --- a/ui/vnc-ws.c +++ b/ui/vnc-ws.c @@ -54,11 +54,7 @@ gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_U= NUSED, VncState *vs =3D opaque; QIOChannelTLS *tls; Error *err =3D NULL; - - if (vs->ioc_tag) { - g_source_remove(vs->ioc_tag); - vs->ioc_tag =3D 0; - } + g_clear_handle_id(&vs->ioc_tag, g_source_remove); =20 if (condition & (G_IO_HUP | G_IO_ERR)) { vnc_client_error(vs); @@ -123,11 +119,7 @@ gboolean vncws_handshake_io(QIOChannel *ioc G_GNUC_UNU= SED, { VncState *vs =3D opaque; QIOChannelWebsock *wioc; - - if (vs->ioc_tag) { - g_source_remove(vs->ioc_tag); - vs->ioc_tag =3D 0; - } + g_clear_handle_id(&vs->ioc_tag, g_source_remove); =20 if (condition & (G_IO_HUP | G_IO_ERR)) { vnc_client_error(vs); --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076592; cv=none; d=zohomail.com; s=zohoarc; b=df9mMLkgwtGdLZ9NexpdOrzGLeu6LyGPhtdgf/r572fnn3RnJMRAmPcXhvMFDR2Pfj/Qr731DN9ZR21rRdBTGodQuaXxUHLJDWtThCy4Bv/LBD2U9fDK7VzBmL4Y6+VMbCG5/PWqWrv59UIcEAZockPpuvETujLkhHWrHaLjuPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076592; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=MaCMp39K2yLioHrKWnLqpJ+dZE3GjbZUzhgA018Ywsc=; b=TPXev2GXmgFcf1SfC+xMMfbnjN1M9z6yKj2RDvAh2/qMUDKj4yBAZ8KK4NOLPDcE6Y/ac1QMkplwTPscAif+KIirKpgoUJB5ox6A1Do7n3D4N8TfTXFuOargaaIMQr9CzcfjmIEb3NZEXsM2Y5Q6r113DdAPMne5os05C97s524= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076592216494.07874158381367; Wed, 6 May 2026 07:09:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcvz-0004ZD-7a; Wed, 06 May 2026 10:09:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcvw-0004Sn-Ce for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:04 -0400 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 1wKcvu-0002CC-Gt for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:03 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4896c22fcbaso50236325e9.0 for ; Wed, 06 May 2026 07:09:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e5389da63sm49799235e9.4.2026.05.06.07.08.58 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:08:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076540; x=1778681340; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MaCMp39K2yLioHrKWnLqpJ+dZE3GjbZUzhgA018Ywsc=; b=OlO8ZBIjDxvRyEx3YLWMosANwWQ48olx+AOLJAeiaGkCS59biEBy3gKlhEAH3guqPC Dju348/DSPgl8jk4KJLnschXn5/LoZ6OVwd5QLKneGhi+fT3oMcDt9fzEgs4Y8hH63sK +plCMYhO+Mv+tPRm5qOcexf90IzAVqB973qMwXavBvLKA+pk8RawpJGwNLm3g+zaQGi/ HQS8sT88z5e2BzEoopePxQaW4dP7iTZD4Xgex//LX6F/NPxdApj+Snv8Y+kGZmruiFY0 cbp9L71w453wfcLEv8v8J/bcuD6MlQyXEYqM0cFC4OT7FNW/i7YAAO2Ri/X+K8j9PQgt qYyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076540; x=1778681340; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=MaCMp39K2yLioHrKWnLqpJ+dZE3GjbZUzhgA018Ywsc=; b=NZ4NDHj3aksqw5tzfgzdsuCoVIBozJO+ZVfaGU9JoPumQo1meIW9wHCjXcfmenYS8q LU/eEM/w/12mF7FbnUkWC7gsQNqBMaXeCiite6Vu9lRA+MAC6WPAoGLKrqs/uevKB/4W yITgJc4/o4XoBY8aK6pXf9IcFrmNWyxR/xw0uTRRE5OTK8dAGFE/rUogxITFp0Di4D3Q f+iyxKmJvqfBi3vbuI1hLwdraGvWd0Tf166ITwKrildj3QsNxJ+69+Alby30+tviGnuP wbOZgv/fXDaBEKpOgtqnydv1qFrVLVahYFRC+tNIpaiZo/+D8lzo7kc9SX9mEUCL1UW/ sK5Q== X-Gm-Message-State: AOJu0Yy6j+eyzWaxqXNYfCPI1nn+/6kzFHDzmgGiPvI/OijV9lUF+YF5 Jz8ObSvFR/xzzdkbNHFIFEJGKIfEiZW4QNlZVhGKVs+IhML7iu64JSjPgm1L9g46esuoY9UH6Xx MVpecsHI= X-Gm-Gg: AeBDiev9l1F7gJ8hnPFRLD40lGzc+W5nI+2x6qPWDXLrazFAAFE/5XLw/rAwupFz0Ur XpRXm9fHKQugWGU9cb13xgLuzlEL8NfGdZAZFPHdluI7lLp/wwMfx/uCBrGuomcvx+2yO8nw5qH dQm177jQKjPZ0E0xNDOeui+OK2NOJR8UOP9iFRoSzpkQiKYqWH+Zeydo6vMM+uWRBR4VuX4m+SP EiBAahjZiQpaOLI2/aEHf62ojkqONRG0jkqvZ3FfCNPgihd/AbJ1cYSz71ZlT6mQJVSoKACDiMK X1GQjC3OWBERD/o6NY+qxReWSZ3sEl9x68lB+ukcGyDWFUOzq7b8Jpo2R2vHoix4y/Q8t1DlnNs wlDQ5gk72JhloR/p/rkwzEi8kjX0AWT3RRYuuoV2kK39PG3d7uFx6vShDyIKEi5cKiy4oVnJnzb 5TYhhk+yXEyRYhPGX4/0WKZMXLz8TjGrcaIsC+B24ANJwZnr+WHfFZftCRhJybwXsie69x6aQSX WIQalj9kbs= X-Received: by 2002:a05:600c:354b:b0:48a:554d:b9a2 with SMTP id 5b1f17b1804b1-48e51e0c7c9mr61473365e9.6.1778076539695; Wed, 06 May 2026 07:08:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 103/110] scripts/checkpatch: Reject another license boilerplate pattern Date: Wed, 6 May 2026 15:55:15 +0200 Message-ID: <20260506135524.20617-104-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076593767158500 From: Bernhard Beschow The pattern us used 56 times in QEMU. Signed-off-by: Bernhard Beschow Reviewed-by: Daniel P. Berrang=C3=A9 Tested-by: Matyas Bobek Message-ID: <20260414135018.13585-1-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- scripts/checkpatch.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index e1cf2ff23b9..d440553a7ed 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -368,6 +368,7 @@ our @typeList =3D ( # Match text found in common license boilerplate comments: # for new files the SPDX-License-Identifier line is sufficient. our @LICENSE_BOILERPLATE =3D ( + "licensed under the GPL version 2", "licensed under the terms of the GNU GPL", "under the terms of the GNU General Public License", "under the terms of the GNU Lesser General Public", --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076789; cv=none; d=zohomail.com; s=zohoarc; b=c9XGhkK0rzaa9vtWiDD0pefYGG8WApt44KiZkblNqn66GsRSm6WqDcm1HfijutZUKY7IVGeUeTqHFD6fq6WUxGskpKYUVT/78a5oCEl0GXV0E+KNbNLWhwmeIsbH+9uDmT7XgMDIbWoNVc2SliStULOMdFuFWo94ZG86tL+ts8I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076789; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=K3nrp9HgpNvnB5JSb3ITv/y/XMExaEyF4f08sVkOvWk=; b=O+2wlIDBcHaXGI5aBFyrpsKR3bv9RjgWDMWfkJhcbd/TI+nOFklYqtJFh945hK6efAIFeozvBvM854XoDMHbTgRnKL/wq3QYnFq0OmvOpuXfABbIA99Sc7KVBLG2D0RBmug6yEEcKHhenubTLFfcl3bDfxfA+FZU1E2/1qDU6RI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177807678961855.88819199972045; Wed, 6 May 2026 07:13:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcwB-0005Gr-RS; Wed, 06 May 2026 10:09:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcw4-0004rz-Bq for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:12 -0400 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 1wKcw2-0002Cu-0P for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:11 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-488ba840146so57476445e9.1 for ; Wed, 06 May 2026 07:09:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538acbfcsm46637325e9.8.2026.05.06.07.09.05 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:09:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076547; x=1778681347; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=K3nrp9HgpNvnB5JSb3ITv/y/XMExaEyF4f08sVkOvWk=; b=Vs6+kY89B6Ta5V90XKBPrGkHTyHpxuDHYuGYyL4PENEmZvbdq+wJj7qoo5NMtdaLai 6o9AoHWq9T/TSZWh92b2Gq30Jq5YTdIkBMJ8tS9DgzYKyxBNiTd8glCKUENZhZCu/9zZ d9iHuEZ3lSLGi9B1BrGAFfqMoVaR3H9C05W2qlg4DVvc955vYZilbrkMlF3Kyvp8RmOg gKJw6ZbBeBW5WymWoZ8bjathuOCcxKr+ICPaFzr2CYG7rjfHlA+PlCgcWu8wL1sYPrsg SIC6kN93hlsAF2q/WxCihUjAaes0GxStW8mRjZ5+w+hJykr4GYjmCdQJ7WgJyDPeaRcF 1LoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076547; x=1778681347; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=K3nrp9HgpNvnB5JSb3ITv/y/XMExaEyF4f08sVkOvWk=; b=jBE6T9YIKaiZE918En8p7gBCRkIGBQF0w+t6hDvgbGeiCKAl7NGpOvg7ZCVnfCKH0L aL3HkIrnxa/UWDb43inQ3fEwyKvHcP5ZsbLjR7a1T/Ipwgzvi58FMIGP57P7eAu81CuE zJ3XXo6dPxW9+P/hp20Zct2zHXtqDH7WW6zfGK3uZoQC4RRbw2ruaq2ytr/2XAZFL4So UCLbyPhILuY9unsvbngS0XVpzrTewUiWl5mDsKF4iD28RKRV7HddAWqP+8d7jA+KTqia 2ggOxVfXzbgbO5dg3ajD1J8f6LJlCs5XqY0LUG1TAkCc8VSjElEu4Njl9PThtvsHmIMx Q3UA== X-Gm-Message-State: AOJu0YxVcSr0NtWduq6qvLBTvqG3irNqegMTgz29tbu4di/D6AfQaRk1 4inCUUXWg5ysbInb3kidPwe7nbjYtyhOIq06nWfzkHP5Zpq3/KyZrq3nWV6sw7JgsGjcbGJ3/3c vZVv+TgA= X-Gm-Gg: AeBDies3I1TRYRy+X2Pwdgt0fneGkAgtdaYRJNoLk75YQAiZf3pZoC17HzndsZJ06iT Z6HQHJ5cnii/ENtedX/T6nZZlbAGM+u+erOylYlGzYaku3R7iRG3TaB+XwU48shDp9V2TP01OeX bDoYh5LP4CGy5hzMB2Jjgs7UsqxKp0WEBT/70Z+Z+FgWTVkkyzTVnOKGDnEkJ+yXxOyLkh/W3bG Yz4azVJqCNZzbfvWB+AmZlBWwgbe1cv/tpBHTGb/ZAu10FeUSB5V2Hirp8t+96DiI/5ag+2tdZY PgedLNMgB9N1JZcwY6C2tctvI2lzDqSsUJCgdmP6ey39UJYnv/UoR2NyjcPc0dE9wIMCQbFRAYO EUz9OB0UmUguqZF/Y23yqIKXBOZPdVonv/MPDvmKbPLwq56rgfZI5hV7YoZLOG6IcUuhctsqPgw +6Kypzpn3w9GCwRLjmgyVhRJMX8EWSI2tPMKM4UEM4acwAbM56twWU7hku0ioJd60bxNQqnVcXh dG7tJbBEvU= X-Received: by 2002:a05:600c:a111:b0:488:79a3:f04c with SMTP id 5b1f17b1804b1-48e51f46d1bmr48492415e9.27.1778076547323; Wed, 06 May 2026 07:09:07 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 104/110] cocci: Do not initialize variable used by QLIST_FOREACH macro Date: Wed, 6 May 2026 15:55:16 +0200 Message-ID: <20260506135524.20617-105-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076791916154100 The QLIST_FOREACH() macro, defined in "qemu/queue.h", always assigns its iterator variable when entering the loop. Remove the pointless and possibly misleading assignment. Mechanical patch using the following coccinelle spatch: @@ type T; identifier e; iterator FOREACH_MACRO =3D~ ".*_FOREACH.*"; statement S; @@ - T *e =3D ...; + T *e; ... when !=3D e FOREACH_MACRO(e, ...) S Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260415215539.92629-2-philmd@linaro.org> --- block/blkio.c | 2 +- block/gluster.c | 4 ++-- hw/arm/virt-acpi-build.c | 2 +- hw/i386/xen/xen-hvm.c | 4 ++-- hw/riscv/riscv-iommu.c | 2 +- hw/vfio/cpr-legacy.c | 2 +- hw/vfio/listener.c | 4 ++-- hw/xen/xen_pt_config_init.c | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/block/blkio.c b/block/blkio.c index 20f138a38c5..fb8bec27d71 100644 --- a/block/blkio.c +++ b/block/blkio.c @@ -124,7 +124,7 @@ blkio_do_alloc_bounce_buffer(BDRVBlkioState *s, BlkioBo= unceBuf *bounce, int64_t bytes) { void *addr =3D s->bounce_pool.addr; - BlkioBounceBuf *cur =3D NULL; + BlkioBounceBuf *cur; BlkioBounceBuf *prev =3D NULL; ptrdiff_t space; =20 diff --git a/block/gluster.c b/block/gluster.c index 4fb25b2c6d8..279f650241c 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -251,7 +251,7 @@ static void glfs_set_preopened(const char *volume, glfs= _t *fs) =20 static glfs_t *glfs_find_preopened(const char *volume) { - ListElement *entry =3D NULL; + ListElement *entry; =20 QLIST_FOREACH(entry, &glfs_list, list) { if (strcmp(entry->saved.volume, volume) =3D=3D 0) { @@ -265,7 +265,7 @@ static glfs_t *glfs_find_preopened(const char *volume) =20 static void glfs_clear_preopened(glfs_t *fs) { - ListElement *entry =3D NULL; + ListElement *entry; ListElement *next; =20 if (fs =3D=3D NULL) { diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 6817a72e2eb..3f285ff6c78 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -146,7 +146,7 @@ static void acpi_dsdt_add_pci(Aml *scope, const MemMapE= ntry *memmap, { int ecam_id =3D VIRT_ECAM_ID(vms->highmem_ecam); bool cxl_present =3D false; - PCIBus *bus =3D vms->bus; + PCIBus *bus; bool acpi_pcihp =3D false; =20 if (vms->acpi_dev) { diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 67d3e836eb1..d3ce082e07a 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -184,7 +184,7 @@ static void xen_ram_init(PCMachineState *pcms, static XenPhysmap *get_physmapping(hwaddr start_addr, ram_addr_t size, int page_mask) { - XenPhysmap *physmap =3D NULL; + XenPhysmap *physmap; =20 start_addr &=3D page_mask; =20 @@ -200,7 +200,7 @@ static hwaddr xen_phys_offset_to_gaddr(hwaddr phys_offs= et, ram_addr_t size, int page_mask) { hwaddr addr =3D phys_offset & page_mask; - XenPhysmap *physmap =3D NULL; + XenPhysmap *physmap; =20 QLIST_FOREACH(physmap, &xen_physmap, list) { if (range_covers_byte(physmap->phys_offset, physmap->size, addr)) { diff --git a/hw/riscv/riscv-iommu.c b/hw/riscv/riscv-iommu.c index 7ba32405522..5fac1ec3449 100644 --- a/hw/riscv/riscv-iommu.c +++ b/hw/riscv/riscv-iommu.c @@ -1678,7 +1678,7 @@ static void riscv_iommu_ats(RISCVIOMMUState *s, IOMMUAccessFlags perm, void (*trace_fn)(const char *id)) { - RISCVIOMMUSpace *as =3D NULL; + RISCVIOMMUSpace *as; IOMMUNotifier *n; IOMMUTLBEvent event; uint32_t pid; diff --git a/hw/vfio/cpr-legacy.c b/hw/vfio/cpr-legacy.c index 033a546c301..c431d899731 100644 --- a/hw/vfio/cpr-legacy.c +++ b/hw/vfio/cpr-legacy.c @@ -212,7 +212,7 @@ void vfio_legacy_cpr_unregister_container(VFIOLegacyCon= tainer *container) void vfio_cpr_giommu_remap(VFIOContainer *bcontainer, MemoryRegionSection *section) { - VFIOGuestIOMMU *giommu =3D NULL; + VFIOGuestIOMMU *giommu; hwaddr as_offset =3D section->offset_within_address_space; hwaddr iommu_offset =3D as_offset - section->offset_within_region; =20 diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c index 31c3113f8fb..0b72a2cf5e5 100644 --- a/hw/vfio/listener.c +++ b/hw/vfio/listener.c @@ -333,7 +333,7 @@ static void vfio_ram_discard_unregister_listener(VFIOCo= ntainer *bcontainer, MemoryRegionSection *sect= ion) { RamDiscardManager *rdm =3D memory_region_get_ram_discard_manager(secti= on->mr); - VFIORamDiscardListener *vrdl =3D NULL; + VFIORamDiscardListener *vrdl; =20 QLIST_FOREACH(vrdl, &bcontainer->vrdl_list, next) { if (vrdl->mr =3D=3D section->mr && @@ -463,7 +463,7 @@ static void vfio_device_error_append(VFIODevice *vbased= ev, Error **errp) VFIORamDiscardListener *vfio_find_ram_discard_listener( VFIOContainer *bcontainer, MemoryRegionSection *section) { - VFIORamDiscardListener *vrdl =3D NULL; + VFIORamDiscardListener *vrdl; =20 QLIST_FOREACH(vrdl, &bcontainer->vrdl_list, next) { if (vrdl->mr =3D=3D section->mr && diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 3edaeab1e34..bbc82a2bcfa 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -62,7 +62,7 @@ static int xen_pt_hide_dev_cap(const XenHostPCIDevice *d,= uint8_t grp_id) /* find emulate register group entry */ XenPTRegGroup *xen_pt_find_reg_grp(XenPCIPassthroughState *s, uint32_t add= ress) { - XenPTRegGroup *entry =3D NULL; + XenPTRegGroup *entry; =20 /* find register group entry */ QLIST_FOREACH(entry, &s->reg_grps, entries) { @@ -80,7 +80,7 @@ XenPTRegGroup *xen_pt_find_reg_grp(XenPCIPassthroughState= *s, uint32_t address) /* find emulate register entry */ XenPTReg *xen_pt_find_reg(XenPTRegGroup *reg_grp, uint32_t address) { - XenPTReg *reg_entry =3D NULL; + XenPTReg *reg_entry; XenPTRegInfo *reg =3D NULL; uint32_t real_offset =3D 0; =20 --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076592; cv=none; d=zohomail.com; s=zohoarc; b=OwpKLx/lLdyholE9XsgDVutRGHrjM/u24Z9waQC920rgf8Tq6aRUDPIfNeqCgUqjmRCZtrmp0vTkHxqVCV0op+p1t3mypC5OOBcePl8jnYD70x1pZ6YHc4FLQbHYvzOYo3TKFE6xS9wRE7NcC3ICN5TULFgjnBRpNZCQqEwAJeU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076592; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=9TqnxfEzR64GRmqXRK3DSb/VcCyUpdxv+sPM/sBfqmE=; b=GcecVMrwfem0bNIFOsSKBxvwVQFrKmY2BWI9qOlCL4fxgRcfZTJf1y2GVDEcycoxF/vKdjEmulCnGqjliO+oKdol8Xfjg1Sp00BCXzRj+t7lnFn9a5WPvXmd6EHG4lBKqfNoE4JL/2r1nM1PHCv0MdYal3rVeO9A3BbrhwA7KFE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076592277822.799336633927; Wed, 6 May 2026 07:09:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcwL-0005iS-FG; Wed, 06 May 2026 10:09:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcwC-0005Z1-H0 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:26 -0400 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 1wKcwA-0002DP-RC for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:20 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-488b8bc6bc9so41372465e9.3 for ; Wed, 06 May 2026 07:09:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e530b19adsm17579125e9.3.2026.05.06.07.09.13 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076555; x=1778681355; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9TqnxfEzR64GRmqXRK3DSb/VcCyUpdxv+sPM/sBfqmE=; b=oafYWKWMnhkorGXzJo1DFm/v6jg4UA+wJyO1HPDp1U/J2PYkuAhuXYxqQLZF1OIdVZ ROuoCxGaCXXX2NnXRLBHZXY5HbzUVIEFEn9svt2TdgnpL6GYSvrGbpThxaTSp3n8WB/N VMZsLXV/xl1ejv/u0UJbXbnA2T/CM9+74Q7hOBBHOC4JeB7GDd55QOc799oKeOws10KS 1VRagAnN3vJxeGoi0Z7/C8B4q+Kk96KfrS4rcQkTvgeVlK3KznKD51nH/qVjFVQywuSh UM2iHQfbPKUOyq2NrSQUoSQRRIsNiGyaCW0EJ/7xAaZe6TcEMQpjOnifzuV+XcW6OS/h qppg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076555; x=1778681355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=9TqnxfEzR64GRmqXRK3DSb/VcCyUpdxv+sPM/sBfqmE=; b=IyurbXUHWpyZL2RLzDEgdVe17krLG7MAosACBHxoVBGEwtBnUTWxHv6LroxfDC69mq lDDAx2ahAQAnGoc9g1SRUE3yDO+Is/2bQHfJkHcV/h088howfReY+jp1MYfs/B9QZNki uaKlnN9V0U/+9UOCr+E9J0h5rYJ0Y9b8BUoHD56uzCYpE7hbydKZsdHkdbb0kBYeI2Gu xdfooxAkLmILV3tCMVGpIaQqpjRORTNo+/BEAqRGWMvz93USLd4ukXztG/zuqOgKwc3O GaqXodwWvOxaZGJsdtgdfpF6klEHEFH001vD04J0FK9b5R8BMgIfQJ5WumLkyhoWURCG MXYA== X-Gm-Message-State: AOJu0YwHoLzaLqLg9cIBiWZ63VYNzRi44B4VvQvR0obE9J/5dCSDcm6B /t5qbY2n+a6SVTV8LTJ/PgzMbrevWVPtGONxVADCjRkW9LkE5HRFBgGbm0abnDU2yA0F+0M3Y3q fRVxurK8= X-Gm-Gg: AeBDievtHS+cFN1Xm11kpxu8l272EiSxFHsEXdahytkG6bDt9iZJwWe2iGsh1NKdMbE p533NlGpcGL89z/KS59Peyi7n4/roFr6C9N8IDGj8cdt+Ll1lcwirzSaC24Ww3IlB5nHvNa5+XB 9We833sSiRfsRUHPp1LmPoPlzlmMninsQPA0EwJ/L1q0zivKkB8OPKnPOK85yvP6m2aNKHb50KB 1YYq7GaTNM5gYjwL59t9Xa0msXTwAf5AX6q0AFL/491b/iUpXBs1UM1ageAsuv4NI/G6A8rxblH l10+RRoFpanBMA09va3GY37LBnqNtcgXFbL3V9vXJPcujT5LTJiHc1IOkeL1gHlG8tJdTAljYIA JEfhQrf2sWPhX9I1IkDEhIHcjlTdaSk64UwweSDhq2kiePVJjunm0KhmnEksKCcq0iZ0jzfX8Pl Dnzy92VuqP/L5ys1O7c+GZxYdVj7k6sfF3kLKVhlIEqR4hRrO4Coqe1belcovez548XgmnhjsHU YuIYrOgx4c= X-Received: by 2002:a05:600d:8408:b0:48a:58e1:6d17 with SMTP id 5b1f17b1804b1-48e52bd4f17mr42231295e9.20.1778076555421; Wed, 06 May 2026 07:09:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 105/110] cocci: Do not initialize variable used by QSLIST_FOREACH macro Date: Wed, 6 May 2026 15:55:17 +0200 Message-ID: <20260506135524.20617-106-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076593767158501 The QSLIST_FOREACH() macro, defined in "qemu/queue.h", always assigns its iterator variable when entering the loop. Remove the pointless and possibly misleading assignment. Mechanical patch using the following coccinelle spatch: @@ type T; identifier e; iterator FOREACH_MACRO =3D~ ".*_FOREACH.*"; statement S; @@ - T *e =3D ...; + T *e; ... when !=3D e FOREACH_MACRO(e, ...) S Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260415215539.92629-3-philmd@linaro.org> --- ebpf/ebpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebpf/ebpf.c b/ebpf/ebpf.c index 2d73beb4796..a8d441b02c1 100644 --- a/ebpf/ebpf.c +++ b/ebpf/ebpf.c @@ -40,7 +40,7 @@ void ebpf_register_binary_data(int id, const void *data, = size_t datalen) =20 const void *ebpf_find_binary_by_id(int id, size_t *sz, Error **errp) { - struct ElfBinaryDataEntry *it =3D NULL; + struct ElfBinaryDataEntry *it; QSLIST_FOREACH(it, &ebpf_elf_obj_list, node) { if (id =3D=3D it->id) { *sz =3D it->datalen; --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076702; cv=none; d=zohomail.com; s=zohoarc; b=k/audy7kvBgMKyrenVVqG4eWJVc86MlDGEMZ79wm8mkIBqFxVk+wOAKs8xihrgXcQwCc0J1zlISjAhHe2/4VGwoYoCIbT9lCOWC/8z7rmqUQtkFhPKqVRgnvemav5teAeT8jhuBg46aaSeflkwAiIO0IF93zczuCAS96SSRVebI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076702; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=HJ0OWL8WJExfKsdO5nO8p6D5eIKwLGM2sS6DWKi+43g=; b=ejkbqwLv6QiWJobyyBmW4/N68G+X12D0Z0MJn0ePuNIXCQC9N0ZBsJ9p71wnTAAniTZ9pA9wzG1Xa1VI8a8N047kH9r9I2swzgKDXgKnBQugQaJb26h7lG7hbmH8B9ISJMC5qIxtdIVohUIxjOyekLC+CWPlrT0Yc6DyHBHj6Eo= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076702794165.37233613223066; Wed, 6 May 2026 07:11:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcwQ-0005mg-0K; Wed, 06 May 2026 10:09:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcwJ-0005bB-FH for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:27 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcwH-0002Dx-Q0 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:27 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-4891e86fabeso77652625e9.1 for ; Wed, 06 May 2026 07:09:24 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45054b02c5asm12763743f8f.19.2026.05.06.07.09.21 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:09:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076563; x=1778681363; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HJ0OWL8WJExfKsdO5nO8p6D5eIKwLGM2sS6DWKi+43g=; b=r9IK6XUnZtB9NuYeayxRu4wk+MH3mcOEnpwPS8POXiF02N6gS647kHTRXjKQaLFlV7 5X57rocJFd1dlevWNYd03S1BwQY2w7Ag0kOIMh3fEsF6tLAs6Zxnp6gL6SiO/f/Q/uLK tu9WxLSKoIK0YAS5ew64fhygWxJCXz9JQxMwcrPra4IoJsd14aysEBk8L7/o12bH7SRh AbBxMqKSMXc+4NYnZg6g+I5DXMc6SNsfCl+IzzU8GwwFvvnk/Ad4O+AryyIkyAcUeZBr 1GXNsJRO6oa1DSjiqhuGRUFxnHfdiNMDQ9rUelbZlE7XhBBymtriaSlCU0PIckLR+EZB pTkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076563; x=1778681363; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=HJ0OWL8WJExfKsdO5nO8p6D5eIKwLGM2sS6DWKi+43g=; b=cFfO7xAJCTSmpShncq8m8zHntBvlhVpyjJ+mrp2vmnOtYIWcxtSIG92draQMm72WVU fjt/4XJ3sbWfJ876f6O4BJ6y2uoyd2qXzgBqSk+ma+kyjkPgdJn3CjX0aPOF0AT9E8IN NeQV3wRDdEeEcWuyjYq+RiLtAQmC+rNug+UWvgWbNO8JL+9flowMwiNThf4BR7LtfVlZ 5dmneVXZYOsD5CxFRgcVejKPpxDn3rhVUxkpHEFRRl6CGrO40Qpy9ipSDpTKrvtX5SU9 GfwcH6T8e83l3EM25ttOsnP9h4Gaz0AM3B+zoK4NZyEp81+j4bPE8A5mmbxb0FCQ4dR8 VkFA== X-Gm-Message-State: AOJu0YwYlfIneHodcvQm1rdI+6vmJ+oqDLqYaQSbnzYFkr6xxjQT6EOz E1l6LwR60o57td9DFek38OcV8he7vEYWcrG3R7qpRPVk1aVsJTQqabSv8OtcnbgTGuLlC2jgU3U Jsk2aA9o= X-Gm-Gg: AeBDievoo0BVKBK1OIbS6CvjTkMiv4D0NWVUClSkXF7eEDQj1htoYCgsfmculr/sIT5 5r0frezwgNLHqKP/GuK/Nezd9ElLsRGmiwx8db75zm+RaMWoyEmmAQECLMtJvJ31EyOrz4TXD55 PpEzyQnRstbdWhTMdGzDczPskoi/DpKDOrmFJK7kyYDyzBXTh44mMtQro3mqcwva7CgcWcPHRCY rjMeXDiP9SwJMEbmS0RKD+A3WvhilHryEGkPcCNyO1D0Fv6CCBBbZ17yBQYLLzHruEzY8j8yPAG CqBHkS5RUgJ5VcyI5D1uKiLcHnBhixsYDrY5SfJXQhPQrmYUQYRshRtPKbJcFKaHpaZJrGkT6Ef f2lk/ChfZySWPoIfN9hOW8HYrjnGDuqEc4zonj5rPGAd7AQGb6upFiP4lBVJzfhO2xY+0/YDVCo PQPmcIXy8YNr4CaFz4wmW/n+3joRKMA1nwMEUJg6C2A4vw4qNx6IrKrl12QsuL/IPCFunwSVRBD pNJznXoBds= X-Received: by 2002:a05:600c:a30d:b0:488:a2ac:a334 with SMTP id 5b1f17b1804b1-48e51e08228mr42688095e9.3.1778076562792; Wed, 06 May 2026 07:09:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 106/110] cocci: Do not initialize variable used by QSIMPLEQ_FOREACH macro Date: Wed, 6 May 2026 15:55:18 +0200 Message-ID: <20260506135524.20617-107-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1778076704626158500 The QSIMPLEQ_FOREACH() macro, defined in "qemu/queue.h", always assigns its iterator variable when entering the loop. Remove the pointless and possibly misleading assignment. Mechanical patch using the following coccinelle spatch: @@ type T; identifier e; iterator FOREACH_MACRO =3D~ ".*_FOREACH.*"; statement S; @@ - T *e =3D ...; + T *e; ... when !=3D e FOREACH_MACRO(e, ...) S Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260415215539.92629-4-philmd@linaro.org> --- block/blkdebug.c | 2 +- migration/block-dirty-bitmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 8a4a8cb85ea..fdc96d1f45d 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -591,7 +591,7 @@ static int coroutine_fn rule_check(BlockDriverState *bs= , uint64_t offset, uint64_t bytes, BlkdebugIOType iotype) { BDRVBlkdebugState *s =3D bs->opaque; - BlkdebugRule *rule =3D NULL; + BlkdebugRule *rule; int error; bool immediately; =20 diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index a061aad8177..87009c45182 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -1216,7 +1216,7 @@ fail: static int dirty_bitmap_save_setup(QEMUFile *f, void *opaque, Error **errp) { DBMSaveState *s =3D &((DBMState *)opaque)->save; - SaveBitmapState *dbms =3D NULL; + SaveBitmapState *dbms; =20 if (init_dirty_bitmap_migration(s, errp) < 0) { return -1; --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076590; cv=none; d=zohomail.com; s=zohoarc; b=OEYdqAfa/0TWXg0UyBJXRbCYtKVtlrXQMk+FYzrfSbR6fMycqzG/D44H7xZK/1Fd07A7LNqdu7cjp3OBgd1NSYpGYufk3IfC7vXO3ZnnqrL93S7jONIh/rNzsULDL8XBa2/x5ma7rcQz/nDqL63skwsJ3YYd6JKm4MNmgw5Fbkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076590; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=q4WjpvxxBANzYXoyOWgi5EeaV2D4FlJx0zSnbtFPWpM=; b=i5EyTMEtfqbHmN/v4vDcGKYzvUFtf6WZ3/BPDjD/IoX96pUkuny4WeYoFvCGrLlAhpIgzgylJi33BWNRh0Ec0qj3iHtiFV9N9qEWfKw07FHa4Bef7b2kvCHWCYUAm2x9UWGMZrJHJD2MEhXSuZ79IfH+PzEGxYPuj05izyxiN7A= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17780765908830.5289581560223269; Wed, 6 May 2026 07:09:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcwa-0006Vv-Df; Wed, 06 May 2026 10:09:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcwS-0006ED-5d for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:36 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcwP-0002Ec-NB for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:35 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-48374014a77so77062165e9.3 for ; Wed, 06 May 2026 07:09:32 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53147bc2sm28929625e9.6.2026.05.06.07.09.28 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076570; x=1778681370; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=q4WjpvxxBANzYXoyOWgi5EeaV2D4FlJx0zSnbtFPWpM=; b=tm5Ya7cVL4wO8+CYCsZnNCMtIrZlLvzCErwbm4j6zxPuzpV9sJeXMPdsRyA77g1mVC wE2B/VBCRx327tkjCFEWVz/5AJn9zG90IckY+oiemrZI1HEGRVISLxFxLfrkcyM19qdD V8SZIka7aWFJMa35Sc0QeV/xQdy6FtP3i1NEci/zNMA+39ISWaV0lD8OtsXxkjML51Sv tdgM6xBTwlPG+G9yOvyk3m/F0/lykh5379sbOczRerGeCQtHg8VCNU1JCmVtZgKnqWYc 7RaYOFwnqpP61KwWK9tWrdO3A4nTKaccy74quf1Svk+lfxQCje0fBwHylNTEOMPlfy3J 4XwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076570; x=1778681370; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=q4WjpvxxBANzYXoyOWgi5EeaV2D4FlJx0zSnbtFPWpM=; b=nQL7bFEg6deVkd8ct2zcUFa32pBzq2GkAOzFqaPuIOiKlDJubmGCyBNOWOHVtm2L7c wozlRxEqXFl3DUgtjl6KLzQthxzpioBwf0PTEqugRELuSdhwew2p0b3fwshnt+V9R6Kt jqTgbaZNbYXa/B2l97xMHSjB5Uo6ZBhkVUlZZPRVCIt67qUTOFwjyC2X77fQZrFekdZQ Gs4wluDGOcdYukwdjwy95DjI9IvIP4SQQ5NtrjFnRQK59TNSyP0tAJWBktkUb1EBIDMA WJUg3Zugh4RSfF+g7skxIkPvNFMAOPjEMOcpr2Uw7Uon3dVN4VlA1C+wHYPaEm3YfzJu 939Q== X-Gm-Message-State: AOJu0Yw8SlEe5NYAV6em2c9fvgrdq4VqysDCNX18uYNyI2muJeeWA47O mb8VUhXB+msI/gi/j2ISKr4fkvbVwfZZFM16XwG6JMG6piRCqez/+Dqsi4rII46hesxvOY2d2mC Bldb6myk= X-Gm-Gg: AeBDietrbW5uUTRfHpeIMPa1PKnHE0/67VjlegGg+nh6rFbCjeeHlmdhvNmdvtmRP+a iAVVgA8V/QWW+4RctN16+58uvMpQNIbBacteLngJtFgURr/aPfVU9PirBlFZxi1PcO/0xZtlAhS dSA0hhvYcpJtMSEaH62snAivhS9SnrZkyv5EfsfNMVzn58yIapJXsHhMuArkaYCtbeQrPYxzzcW MOeQPxNSAGldCp5E+Shsv92Stxm2/ep3Imy8fONzgn/QzGdLjALos/tqRs8hnT4PkTNGFLQlD8X ZcspQXblIhmB+uFkLpWNVp2pEHvu73tjkAbM32xX7GW4FqeaxxSJOm85sB9+qDDGOOTXCdHwYNp crnibl/W0jDoW+vNcavJ2D0OHVD6vXrNZB5GuPZo+cKKkq97IZNFuybDWvsQlKBXt2RfzATafJZ 7Rp2zkwmQW5wB/XbLblG9Jdopj5uyDM0+6iCIQwi3bP7LlnaJpDrC8GCSaCJRatrXot9W92MS4l oQyf+XwQw4= X-Received: by 2002:a05:600c:4755:b0:48a:7b55:12a6 with SMTP id 5b1f17b1804b1-48e51dd5ef5mr62345115e9.0.1778076570252; Wed, 06 May 2026 07:09:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 107/110] cocci: Do not initialize variable used by QTAILQ_FOREACH macro Date: Wed, 6 May 2026 15:55:19 +0200 Message-ID: <20260506135524.20617-108-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: 1778076592742154100 The QTAILQ_FOREACH() macro, defined in "qemu/queue.h", always assigns its iterator variable when entering the loop. Remove the pointless and possibly misleading assignment. Mechanical patch using the following coccinelle spatch: @@ type T; identifier e; iterator FOREACH_MACRO =3D~ ".*_FOREACH.*"; statement S; @@ - T *e =3D ...; + T *e; ... when !=3D e FOREACH_MACRO(e, ...) S Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260415215539.92629-5-philmd@linaro.org> --- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_events.c | 4 ++-- net/colo-compare.c | 4 ++-- net/net.c | 2 +- target/s390x/kvm/stsi-topology.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 428b491a7df..d40af312fae 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3685,7 +3685,7 @@ struct SpaprDimmState { static SpaprDimmState *spapr_pending_dimm_unplugs_find(SpaprMachineState *= s, PCDIMMDevice *dimm) { - SpaprDimmState *dimm_state =3D NULL; + SpaprDimmState *dimm_state; =20 QTAILQ_FOREACH(dimm_state, &s->pending_dimm_unplugs, next) { if (dimm_state->dimm =3D=3D dimm) { diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 1a21ac7bbf8..ab23e3f477b 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -460,7 +460,7 @@ static void rtas_event_log_queue(SpaprMachineState *spa= pr, static SpaprEventLogEntry *rtas_event_log_dequeue(SpaprMachineState *spapr, uint32_t event_mask) { - SpaprEventLogEntry *entry =3D NULL; + SpaprEventLogEntry *entry; =20 QTAILQ_FOREACH(entry, &spapr->pending_events, next) { const SpaprEventSource *source =3D @@ -482,7 +482,7 @@ static SpaprEventLogEntry *rtas_event_log_dequeue(Spapr= MachineState *spapr, =20 static bool rtas_event_log_contains(SpaprMachineState *spapr, uint32_t eve= nt_mask) { - SpaprEventLogEntry *entry =3D NULL; + SpaprEventLogEntry *entry; =20 QTAILQ_FOREACH(entry, &spapr->pending_events, next) { const SpaprEventSource *source =3D diff --git a/net/colo-compare.c b/net/colo-compare.c index c356419d6a8..abc1326b704 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -1396,7 +1396,7 @@ static void colo_compare_init(Object *obj) =20 void colo_compare_cleanup(void) { - CompareState *tmp =3D NULL; + CompareState *tmp; CompareState *n =3D NULL; =20 QTAILQ_FOREACH_SAFE(tmp, &net_compares, next, n) { @@ -1407,7 +1407,7 @@ void colo_compare_cleanup(void) static void colo_compare_finalize(Object *obj) { CompareState *s =3D COLO_COMPARE(obj); - CompareState *tmp =3D NULL; + CompareState *tmp; =20 qemu_mutex_lock(&colo_compare_mutex); QTAILQ_FOREACH(tmp, &net_compares, next) { diff --git a/net/net.c b/net/net.c index a176936f9bc..2892f1730d1 100644 --- a/net/net.c +++ b/net/net.c @@ -653,7 +653,7 @@ static ssize_t filter_receive_iov(NetClientState *nc, NetPacketSent *sent_cb) { ssize_t ret =3D 0; - NetFilterState *nf =3D NULL; + NetFilterState *nf; =20 if (direction =3D=3D NET_FILTER_DIRECTION_TX) { QTAILQ_FOREACH(nf, &nc->filters, next) { diff --git a/target/s390x/kvm/stsi-topology.c b/target/s390x/kvm/stsi-topol= ogy.c index c8d6389cd87..301d41b68d2 100644 --- a/target/s390x/kvm/stsi-topology.c +++ b/target/s390x/kvm/stsi-topology.c @@ -285,7 +285,7 @@ static void s390_topology_fill_list_sorted(S390Topology= List *topology_list) */ static void s390_topology_empty_list(S390TopologyList *topology_list) { - S390TopologyEntry *entry =3D NULL; + S390TopologyEntry *entry; S390TopologyEntry *tmp =3D NULL; =20 QTAILQ_FOREACH_SAFE(entry, topology_list, next, tmp) { --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076672; cv=none; d=zohomail.com; s=zohoarc; b=E+yMbrZgjzem9lZXkm9biZG/CqPQjKVVNleEbjiSfV10ci+JJf/tRJiKXTNt06os5sUUaACB5yZ2PJbpvftACHRt/PwgYM2crM5mQQjkmeV6DSYqtgNf0uzT5SoYVvXfep5Q6xgMU/pqs7SII7osiTvvQgkKyCpfFA1PoA51Jdo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076672; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=0XBhuIaUCuVaYJHq6IcZfUhYnqlkL06H5sgtVF9yQks=; b=lU5Ph6GBTndsI+eabmkkV7qxNx8hECk4JElnhgP8mxCcjiCFvv5BMCUT9gbbQx6bdWUnXEfahkxLPzDeJBRDsvqJ9V4YLWJnq4g1NXNJAt+bEQsM72upxoufCuSCyZ2ADzTRD65zJ9s9Hb+9fj6vgrLG0A5SSBBJM5p0FWL5Vns= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076672408596.1028060888082; Wed, 6 May 2026 07:11:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcwd-0006r2-E0; Wed, 06 May 2026 10:09:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcwX-0006W7-W8 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:42 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcwW-0002G9-8N for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:41 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-488af96f6b2so81699855e9.0 for ; Wed, 06 May 2026 07:09:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538d222esm62074825e9.14.2026.05.06.07.09.36 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:09:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076578; x=1778681378; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=0XBhuIaUCuVaYJHq6IcZfUhYnqlkL06H5sgtVF9yQks=; b=n4fAw0wDSsqwGMX/9LNwisgaLmLjTIOraGHrwkf8xA+kLygFocExvk74RqxPq43Vpy UkWx6Se1JUH3RrWitNc3fgYSoDABEcKDr1CapnftV21SE9Tod9ymYbWph0peeqTDM2kQ 4gtFtzj1/i19oOlo+WAEWoF4/x7Mtay2Un4zSKwINasPTLCIXVMceCHONrAnxD2KLfmO zsquk9gNvkcnY3iCwA808leBLGn4GGUsfncEOt6kwI6MEMLg8Kv1r96s8BRWKbStsH+f jlazJxcYqRYFibQ1bjod2Us3/NuxwtN+yQJa3mkoDoM292c13YuLt10/a1H95ypNfLqd ZvvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076578; x=1778681378; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=0XBhuIaUCuVaYJHq6IcZfUhYnqlkL06H5sgtVF9yQks=; b=k056kEh8PTjkcX4HPY/JdoPp8RtwicAj8FBq54j80ZYjwCu9AFYxiYuOmRhp3tn8G+ sTsAlzuIXDWkNZku3BJ1AhqxAFBPbnaf3chlgRdTrkHufnfw4S6s0y5MxC8IesXwR+mE 9AdnUS3lWi0m6MCF+qcg3Gmu4V/nxVeENf44sqzvVr+CJs0i7dREU2j5MuXiRg5P7+Uq yPLNzoYub94bnVFFOTjMud5/7fRCPmkmqUus3z4VpxqbaiK0EZsrZx1YYu5N2KlRTGV6 wV62vfXKJWVNUc7JWgWn7OP96yDME3Xf6dLnFaEzVALgpBzcFTT44jpZ7yKrTLzdHdFL B3MA== X-Gm-Message-State: AOJu0YzMN3tQ9277Vaund7N+jgY6CYRLbe/syN2K/1eps6Ygqbzaa8mM 713E/hOjlYNn+NrcLBr46twZEgyatAhKyA99lQd5cyGP5lj3LZXP4eJ29gnltpci+Er2ec4q8Fj SIZtSon8= X-Gm-Gg: AeBDietsZyRw//BJr6ceFQ0j/zigmzanOUM+pONSACdWuZysrFZvcT4NeW6UnJLrkYW dxmZIAwnj+nDqrqIBO+6NDT3L3IhfMzafvXtlb4Q4OCdKGahPEy/JWxeeL24TMT3Zyh1+oXYVYv 2vGTJXDlPUm/ixr/7Ie96V4gXlXzxdmQS8EuRiAEl6T2D9puNdm2Hp95eZWJ2lOnWpUzgqu52F+ bC7VkYW/7krV0GgiwQrM+oZEDzDUt7zB5VOOnaED8+faj7ZsXDH+U7CvzDjL2L3kzMV2euSiivV JrHUOOFF/SFCRaMFqt+5V6qePdrmf3vfc+y+hI7vKQr8IMC/n+D8YZNtSqbKHPu14HbCWGpwRVO dx5gvlUptRXOl3hsWo4A8ln3udz4nSupHAF5SZtFf2keII7NvzbD/4Pyx5jmZ1l3hn3ZaNLLGT9 UNbdN2nLL9nAkIQG/qYqAtVbNvVmFtGBiPDP0C3FazuOdc/X/0xWMYjOp5KJO8RYO/t9xb6wz5P Blqf4MhACM= X-Received: by 2002:a05:600c:3b17:b0:48a:568f:ae6d with SMTP id 5b1f17b1804b1-48e51e15c37mr61074715e9.8.1778076577608; Wed, 06 May 2026 07:09:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 108/110] cocci: Do not initialize variable used by RAMBLOCK_FOREACH* macro Date: Wed, 6 May 2026 15:55:20 +0200 Message-ID: <20260506135524.20617-109-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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: 1778076674411158500 The RAMBLOCK_FOREACH_MIGRATABLE() macro, defined in migration/ram.h, ends up calling QLIST_FOREACH_RCU() which always assigns its iterator variable when entering the loop. Remove the pointless and possibly misleading assignment. Mechanical patch using the following coccinelle spatch: @@ type T; identifier e; iterator FOREACH_MACRO =3D~ ".*_FOREACH.*"; statement S; @@ - T *e =3D ...; + T *e; ... when !=3D e FOREACH_MACRO(e, ...) S Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier Message-Id: <20260415215539.92629-6-philmd@linaro.org> --- migration/dirtyrate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 58f04670629..b360f49efea 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -485,7 +485,7 @@ static bool record_ramblock_hash_info(struct RamblockDi= rtyInfo **block_dinfo, { struct RamblockDirtyInfo *info =3D NULL; struct RamblockDirtyInfo *dinfo =3D NULL; - RAMBlock *block =3D NULL; + RAMBlock *block; int total_count =3D 0; int index =3D 0; bool ret =3D false; @@ -568,7 +568,7 @@ static bool compare_page_hash_info(struct RamblockDirty= Info *info, int block_count) { struct RamblockDirtyInfo *block_dinfo =3D NULL; - RAMBlock *block =3D NULL; + RAMBlock *block; =20 RAMBLOCK_FOREACH_MIGRATABLE(block) { if (skip_sample_ramblock(block)) { --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076715; cv=none; d=zohomail.com; s=zohoarc; b=k6YstpwhelMY/8z0CNA67JTRSGyulhHnJDbKVzhb/pnqaxMI3kb8GH+IUbRd/Buxb5cfvu6os8zM1SM/1x46gqNGY+ZbT6zcqCkPwr4d+XKOhF3o0+vA+iZBhnO/5SjoylUhpq5KvwHa6RHOsm2M9jcZM3mwxFrE39q2EL6fHwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076715; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=uaonkIYudK/xNKEuVvZ4LYtiC0muy271uDca+MHeHuk=; b=jAmYoRUvjTeYf9Q8FI/cKkZ4lrr3Zcy3GVxrBA6LJe8EWh6U40mXOUMbPRDLfTht2gFRV7Ccmbl7Noem5Y/4OOqFhXevE9lwyC9qgJOuTHiZ/XSQo99WtrgmJ6orAl3x+kqorVdh57xfh+L0eO2OAyt1zezgDK9Zunu2Q7GVqJQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076715396605.5425046069973; Wed, 6 May 2026 07:11:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcxG-0007nT-S9; Wed, 06 May 2026 10:10:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcwg-0007NQ-Q3 for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:51 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKcwe-0002Go-Nf for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:50 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so99992675e9.2 for ; Wed, 06 May 2026 07:09:47 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538a8159sm56958465e9.6.2026.05.06.07.09.43 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:09:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076585; x=1778681385; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=uaonkIYudK/xNKEuVvZ4LYtiC0muy271uDca+MHeHuk=; b=MVrfQ9DXlnZ3U2B2ukNrQxsq0nmFybljs0dlWJDkmsOE62KEZaybVoFK3fy2KZT6yn mEnBxzNN0NWiOLiRT/SQwbHA6DljYpT0V5BsGJYQyuU615i5lXghYELk+3qto6Of8BiB 2OGUlnq1vAlxzm/jEKJcsJNf86zPFoD7aUTgUBDIrBslgYch7QRRwsA08u74zGUK/1r4 FPsep/Ytuvg8u3Lcs2voRY/Hb6CLgO4qqZKL961oOMiKSlRdiujwe+T7Pb/hzYKx5iOO 0KuikVTHFOKbZqal8FAE31EeALWgm9JloDaGoaQsB+6Uii4fnrJYv+MwLqrHo7u4gqwp qVYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076585; x=1778681385; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=uaonkIYudK/xNKEuVvZ4LYtiC0muy271uDca+MHeHuk=; b=WmfZgXYirPFb0mZnZYQFcASrCS7a7p4wFe9f9jA0yyfx5FUaSMWcDJHOKCX7/5n+SZ 2u0HCBL1x+pzLLUjEwCgzXV2MGa8McEAT0XWoAakV5iLktl+g2V0TpOuPqrLOUhuvuW+ 1U3/F0PoVy0d3LEDL6gAvjsc7HFpL0o2vlhWxV5ySKYykYLZRIEYF/a7UQ4jBvWvvdB6 dLxvrogh2wVIcFwYsHz6xvYbaCy/90xFFYp5lmIp1/A8WX9NSiOMn5cqe/n+8PY5x+Gb U0s2BD31JDEuc//OUVOnCpvnpp+BFHIHJZDFSmdds9g86i50HigB8iqPTdpbAqhyZa7t eXWA== X-Gm-Message-State: AOJu0YwF2gP+PP+pUFbfRobWR2A4PW2vYYmTYODIFn4xpT2mIPxHF15B zRcHh+dkJLxPKRPt7SE9dsXDog36Nc0Sut1TAwqTkRy6Cuty7hsJ+tZbpvnYcvgJsKPYFf7gzTr 0uR1t3Fo= X-Gm-Gg: AeBDietZhMEXG7tkP6b4Zcgyzp/dvp3gvlJqCVo+jvVE1m6670BGmtmF9ry3lrpRg8e bRvRjfXB7viF/gR3u4cU7Wb0w38xXAfuRcI7PdFDSe8jL7N7ojYAkWj/rA0MQ+d2m2BFqnXaOP+ vZJTWu7QEjFQvX8Af3lPVOHgfZySQEXHAEnrdNg/wfnsHO/Ywxtt+NRHXVWa3sKuRyRV8nv0Nol KOGs5cAR+l9fFBbwDvjq0RX0vCWU0FaFkDFmjWPLLBoV4d3KjdkaooytbXWtZ9Hc5kHamM3iXWJ +i1XD2gnsp04k570pQZZfpYesSdFN+fLIgxQYZ8THHPb+qJRH2g9GKsbbOyt9Ms/72hgDsu1Rae ho9akWJisaOMmNNtFCVGKynHlGyZ0Dv75VzL6tXonFAhclmGrwJgt7Sfncta/rL0PpE7QyX1rQ0 6q66Wkdg5SyRDwFpJ6ORu94sl6KvKWEjsGAJdXmOSvlPsx3ip/Ia2FLmxv30PmbviFUFZu67hCc ErjTtYGUrU= X-Received: by 2002:a05:600c:8b06:b0:485:4388:3492 with SMTP id 5b1f17b1804b1-48e51e223ccmr60286685e9.11.1778076585089; Wed, 06 May 2026 07:09:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 109/110] scripts/checkpatch: Avoid false positive on empty blocks Date: Wed, 6 May 2026 15:55:21 +0200 Message-ID: <20260506135524.20617-110-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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: 1778076716638154100 From: Akihiko Odaki SUSPECT_CODE_INDENT checks the first line after a conditional statement. When the block is empty, the first line after the conditional is the closing brace at the same indentation level, so checkpatch reports a bogus indentation error. Ignore same-indented braces and else statements, matching with: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?= id=3Df6950a735f29e782bc219ece22bb91d6e1ab7bbc Signed-off-by: Akihiko Odaki Message-ID: <20260424-force_rcu-v4-6-feccfaca0568@rsg.ci.i.u-tokyo.ac.jp> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- scripts/checkpatch.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index d440553a7ed..2189db19f54 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2283,7 +2283,8 @@ sub process { #print "line<$line> prevline<$prevline> indent<$indent> sindent<$sinden= t> check<$check> continuation<$continuation> s<$s> cond_lines<$cond_lines> = stat_real<$stat_real> stat<$stat>\n"; =20 if ($check && (($sindent % 4) !=3D 0 || - ($sindent <=3D $indent && $s ne ''))) { + ($sindent <=3D $indent && + $s !~ /^\s*(?:\}|\{|else\b)/))) { ERROR("suspect code indent for conditional statements ($indent, $sinde= nt)\n" . $herecurr . "$stat_real\n"); } } --=20 2.53.0 From nobody Sat May 30 07:57:52 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=1778076709; cv=none; d=zohomail.com; s=zohoarc; b=cwzmISzWDkBRfAvAg2zi+UCUC8D4QVM8ynot8SQdPJVK5uclN1fbcGRJ7HFnvlG8S8o91By3wDOmJkh+sr9W53TfjponEqFoyuSlykdYud1mflC0b+R4q7M7sF6dC35S4gSlOUWFEyPl6Gqz3SHjX/2iWMTxX5dcL69+TD2T+mo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778076709; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=cRYPq0kfd9OLQZNCTmCz4sOJdP+EazwFZ/SzgSuAvXI=; b=W7dnvTrTEQ7zSOA6lGkDZlcB+hxycQkuj0Kqg9ZjCtR2sT3X5BSvOlEr1gbje9rbqu+apgBJr6Zy2F2zO+nIQpo3amGavCl6cJeoxKdvvE99sDisd4x4gPo2U1zXveU7xJ/zfpKVpsBpnMk69ww7zbxZ5W+Rdl7ANL58f9kNZvY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1778076709019865.1633305172801; Wed, 6 May 2026 07:11:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKcxP-00080r-Ha; Wed, 06 May 2026 10:10:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKcwt-0007mX-LH for qemu-devel@nongnu.org; Wed, 06 May 2026 10:10:05 -0400 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 1wKcwl-0002HS-IO for qemu-devel@nongnu.org; Wed, 06 May 2026 10:09:57 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4891c00e7aeso55500715e9.2 for ; Wed, 06 May 2026 07:09:55 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e53907e8asm49401665e9.13.2026.05.06.07.09.50 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 May 2026 07:09:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778076593; x=1778681393; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cRYPq0kfd9OLQZNCTmCz4sOJdP+EazwFZ/SzgSuAvXI=; b=xYAwFChVtqAZ8NYGj/kWQ1NQGS2j1S0jrLzPuNioyFVobROlCRYFsgKBx+bjCx3Z8T /Vn1+Bc0nqGsf775l2D7Lm++bQ+gZ9dhEoqPgCbo0ojxeaIyXGag5/NRajfJMuWMbNOP p0agCO/7btTDsXedeCmvjl5G84v7L37AT8vKdQiwyGSPzo32m62yIUJ0mJA58k0KfsRW Z3bLzykEINA23PCVwthyQRyf5EDPeYCc4Goc+9sOdJlzfQcotA2LCC1Jidi5au2XCHRg ov6LM1sGFGZ0+xYwl85jnyDnOQPsmxFFOtxikDG8JqUoCtG0sHFdihITZNhfvT7VM+cW pATg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778076593; x=1778681393; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=cRYPq0kfd9OLQZNCTmCz4sOJdP+EazwFZ/SzgSuAvXI=; b=EoR75nn38AvC5P7z5sNnftsqn9pgPONrgoAG20dQ+zwvdzT7pH35q2uFS7BdRb7gBC tgusA+NfBdWgmPdYC5A000mdM9IjBNOYQB3Z7iZwvqExzJsEk/i4PCxmFhnGMx/26lO5 0ysbci/LO0c4QBiqNEQabBkr3qtmH3iYIqtxwz893VLZIkTep/k+lprIOjvuBQpjRvOl Uc3WTyFh7XRpu+aiHJEjNuZOQZjk9GBtb1LmwjmmY5DuTsWRkWijceo9Ph4qWnabOaQI QEIDGxTyT0XP9uxpwIgy6hkKRPXfBdTvWTO9AJq9hm819+i1pcUedZHK7DcoG3A4kzWI iJIA== X-Gm-Message-State: AOJu0Yzc/4yHBONkGhizY23TK6cWpsD373oRR4xR+joCRka41Q8040Jj Uq7Amp3o0tMxejvfPV9uZaR5IyRg34mmj1QW5oHNCwFdJ1WTSRzxbK5i+h8d9hO9vkylChzqKRu kIYTAiIk= X-Gm-Gg: AeBDiese7Kj8GIIPlteuBkkPV8AyUqEGN//suF4HBJMizwUjViIUeFQGwoi1hjfvvXH a4Dgc/JbgBfXVvUxHnNt0Euf7z0HX/aub7c6+/AYIzBcFxRBSUUPLDTbx+6mrZPdCuUHz34DBBC j/trJf1meRjtgrrZ2t2b+/YEJahXaMHh8jql3FB6WUUufin7q5zLjqwj76DyYAI+yNsK2e1N/AM fsopNBC+eDVAnG0ZBUE6wl+yOljYMekuZNLMMlVSlu48pLZFT0Vh7oc799NQJ1kQzWs8t1Oc0TT 41aLK54zjhFNTDCZYWeii6M4KyqnbYZYPX0tVH3HF7Crm8TddSfGQjmDqvZYWbHLMOjsNpG8xrd c8l+0sULr55PCJQu20pQOEV31DuRBRL/ASnLw8rxqdxetYIZ81NdO0BIsIJAolSvm4qvzc6mZ/c q4wZ8xcWB2m7YiRBP8FbnFPEF0AOhdm7wdt0a80amQDz0npLajH0yPIiMAKgL1hblmG1P9ErtqI WUTLt67UWA= X-Received: by 2002:a05:600c:3548:b0:487:1108:48b8 with SMTP id 5b1f17b1804b1-48e51e0a60fmr63594845e9.2.1778076592738; Wed, 06 May 2026 07:09:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 110/110] system/vl: inline qemu_opts_parse_noisily() result checks Date: Wed, 6 May 2026 15:55:22 +0200 Message-ID: <20260506135524.20617-111-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260506135524.20617-1-philmd@linaro.org> References: <20260506135524.20617-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=lists1p.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=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: 1778076710564154100 From: Bin Guo In qemu_init()'s option parsing switch, several cases assigned the return value of qemu_opts_parse_noisily() to the shared 'opts' variable solely to check for NULL, without using the pointer afterwards. Inline the call directly into the if-condition, matching the style already used by QEMU_OPTION_action. This affects the following options: -drive, -numa, -iscsi, -m, -mon, -chardev, -fsdev, -fwcfg Cases where the returned QemuOpts* is subsequently used (e.g. -acpitable, -smbios, -virtfs) are left unchanged. Signed-off-by: Bin Guo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20260429062004.36582-4-guobin@linux.alibaba.com> [PMD: Reduce @opts declaration to innermost block] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- system/vl.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/system/vl.c b/system/vl.c index 705f0d3a4a9..d2f4044e5d8 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2842,7 +2842,6 @@ void qmp_x_exit_preconfig(Error **errp) =20 void qemu_init(int argc, char **argv) { - QemuOpts *opts; QemuOpts *icount_opts =3D NULL, *accel_opts =3D NULL; QemuOptsList *olist; int optind; @@ -2928,6 +2927,7 @@ void qemu_init(int argc, char **argv) drive_add(IF_DEFAULT, 0, argv[optind++], HD_OPTS); } else { const QEMUOption *popt; + QemuOpts *opts; =20 popt =3D lookup_opt(argc, argv, &optarg, &optind); if (!qemu_arch_available(popt->arch_mask)) { @@ -2963,9 +2963,8 @@ void qemu_init(int argc, char **argv) break; } case QEMU_OPTION_drive: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("drive"), - optarg, false); - if (opts =3D=3D NULL) { + if (!qemu_opts_parse_noisily(qemu_find_opts("drive"), + optarg, false)) { exit(1); } break; @@ -2990,9 +2989,8 @@ void qemu_init(int argc, char **argv) replay_add_blocker("-snapshot"); break; case QEMU_OPTION_numa: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("numa"), - optarg, true); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("numa"), + optarg, true)) { exit(1); } break; @@ -3051,9 +3049,8 @@ void qemu_init(int argc, char **argv) break; #ifdef CONFIG_LIBISCSI case QEMU_OPTION_iscsi: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("iscsi"), - optarg, false); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("iscsi"), + optarg, false)) { exit(1); } break; @@ -3106,8 +3103,8 @@ void qemu_init(int argc, char **argv) exit(0); break; case QEMU_OPTION_m: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("memory"),= optarg, true); - if (opts =3D=3D NULL) { + if (!qemu_opts_parse_noisily(qemu_find_opts("memory"), + optarg, true)) { exit(1); } break; @@ -3228,17 +3225,15 @@ void qemu_init(int argc, char **argv) default_monitor =3D 0; break; case QEMU_OPTION_mon: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("mon"), op= targ, - true); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("mon"), optarg, + true)) { exit(1); } default_monitor =3D 0; break; case QEMU_OPTION_chardev: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("chardev"), - optarg, true); - if (!opts) { + if (!qemu_opts_parse_noisily(qemu_find_opts("chardev"), + optarg, true)) { exit(1); } break; @@ -3248,8 +3243,7 @@ void qemu_init(int argc, char **argv) error_report("fsdev support is disabled"); exit(1); } - opts =3D qemu_opts_parse_noisily(olist, optarg, true); - if (!opts) { + if (!qemu_opts_parse_noisily(olist, optarg, true)) { exit(1); } break; @@ -3388,9 +3382,8 @@ void qemu_init(int argc, char **argv) smbios_entry_add(opts, &error_fatal); break; case QEMU_OPTION_fwcfg: - opts =3D qemu_opts_parse_noisily(qemu_find_opts("fw_cfg"), - optarg, true); - if (opts =3D=3D NULL) { + if (!qemu_opts_parse_noisily(qemu_find_opts("fw_cfg"), + optarg, true)) { exit(1); } break; --=20 2.53.0