From nobody Mon Feb 9 23:21:46 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=1766006552; cv=none; d=zohomail.com; s=zohoarc; b=U5W29NT3vDSFrO+Xq0YLLAu8d6vhsLcPmAL7IYNagexceTYcQPeQSowRJnHx9xuCcqM8WiihieZjvz30iKXbBIqEXQ6BWhs83tfSk3tV63smqPHfTZZLeIlp6HGGGJ3AbDieR85dXNiBdAIbmD1D/S6P2KbVy1kp8wUgcTeJu80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766006552; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ux7V/vcnfKVnQVQzXuR5cKKTLtK6T4UuaelCSQB/P7E=; b=SoaEbh5Q5zf+hjAoID16hNBrKgaAUhL+KHaeieYGVU6pdZio511ftIwvf2l7BkK50n4dv2ou52Vm2JY0cEaNFcNhq4af5rAEl8H3q12eviixmQ6lDuDdkrmdFc+NeOJnn7zFOBXU2n/w6E17Tim9FF62SDYCGsUhc4VPTboH8hU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766006552019770.5997234226913; Wed, 17 Dec 2025 13:22:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVyxL-00005v-K4; Wed, 17 Dec 2025 16:21:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vVyxD-0008SO-Mu for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:03 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0: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 1vVyx9-0004XX-Pn for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:02 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2a09757004cso56578615ad.3 for ; Wed, 17 Dec 2025 13:20:59 -0800 (PST) Received: from gromero0.. ([191.8.216.160]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12061ef3383sm1852476c88.0.2025.12.17.13.20.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 13:20:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766006458; x=1766611258; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ux7V/vcnfKVnQVQzXuR5cKKTLtK6T4UuaelCSQB/P7E=; b=y7P6vWPnVzWfbUGpCQ+t1+sGUs9IaQc1N4pqi8vzZ045KSca5snK6SJXKecnH7kzEx RMUHA3AG/OvCKP2uLcf3LpryOEOrnlwS3TB8zl1DDF1fE4+DNjo1+L5e4ZIy9bHiamQ9 v9YYRYtftQDpiPt/6zBdqoYk3zOqu5mNgGMyX4Z04TRtLHJBfDNzDstNb+3pO9fEJq5a KP5NCyoKSCDCn2hvhhXUP2ENOsAHZb6x+7wgmVWbpmtjjjzUtV8e5YakzglApDARQnyI JcDB95rQg4s1xQj0OJhsS0BAnYELSxMcFGVwZsklsf7HsR3htnSvSFiN+V59cuSSrwU3 HtAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766006458; x=1766611258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ux7V/vcnfKVnQVQzXuR5cKKTLtK6T4UuaelCSQB/P7E=; b=A8UMx2OXG1ty0vqe3Ct4hclX7LbBt8vGaub4ah5lVRi6JlwNeED8QHMH5aDtCY+MQQ HGU40ecyBqkMAiyiAOOQqywVZHtSohEBjak/OT6gIlONODoaTCdAtBruNxJ5fKdIJRpF GuWzzIJi+h/mIyRKK9uZIZ0L46FU6besgqeNLl+XfalW9ahAOKoMhZzympYS2UOU/XMg mDgX1HB8Clg6F0AX8BQwE/9Uy+sIHqiWeVjuKDsYEBuT6mtSYzeboqDPQuBLIzL8EApZ ib+6V7HjGslqdLJ/+tuYXiSYeqKRI3+IlKXA15PN/rdSeESCw6mn4zveQa4Qthmb9RAK kqOA== X-Gm-Message-State: AOJu0Ywdhmy1PxYtfrKkX3k4uyqUnzFz9WCH4jr8hXEHbLb3VbVKylor MsJ5ULf+G0XmydeEMT0qxPNeusbQc7ltVnhiWw40EBR2gg4M3AE1vZ88p/Jk4lock7atoGbUvkW YUKm3 X-Gm-Gg: AY/fxX6HY75/VsRMs2cmlw6D3aPgZ0VSwkkg8UN3lnV4aHt4c81t+P/x98ovZMuwJH5 NZzzm97Kv1Oj6XOlcWXPmZH4Fb9b12zqTksywl+TdeAajiI+PeUoWBTzelLvGQvu1wsZ7Ask07G ZxF07cV7TYF3/VCYVr2I0ugxYRRntvWfAx1RtxLpnZTDXIBdYB6qCp6MrRCIaNxKdKImKxL5wJk +0KPkf2gXAEqtdmHq8HV9YNy7vh/eJLm+4JDJMxejDMeitnblJchjoVBhlyOjHcA1Gw/PGnexx/ mipViaM7XfpVdThy5a6bzYL3Ij2XWWmUJQWRrYu/bq42JOSH6paWruguobco5UFWDLb+rUldWfo oFHkqTRFsJSvvqVdlnln2xJEPkXVy1uQfUwn+L/XKbwh4DvfSVyIy5bU/CjiVUej/xwfM5TdxX2 5K+ZxQgANkuwWJfkg= X-Google-Smtp-Source: AGHT+IGsmzPhSKcPO8lH02VXvl/xP3usSOzkhMUBWaZRt8bf0RPs57isX9k0jJ8e+xsm9J2ufQt40Q== X-Received: by 2002:a05:7022:3b8c:b0:119:e56c:18a7 with SMTP id a92af1059eb24-11f34bc656emr12330014c88.15.1766006458073; Wed, 17 Dec 2025 13:20:58 -0800 (PST) From: Gustavo Romero To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, philmd@linaro.org, peter.maydell@linaro.org Cc: gustavo.romero@linaro.org Subject: [PATCH v2 1/6] target/arm: Initialize AS 0 first Date: Wed, 17 Dec 2025 18:20:13 -0300 Message-Id: <20251217212018.93320-2-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251217212018.93320-1-gustavo.romero@linaro.org> References: <20251217212018.93320-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=gustavo.romero@linaro.org; helo=mail-pl1-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1766006555116154100 Move the initialization of AS of index 0 (ARMASIdx_NS) so it happens before the initialization of the other address spaces. This is purely a code organization change with no effect on behavior. Signed-off-by: Gustavo Romero Suggested-by: Alex Benn=C3=A9e --- target/arm/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 39292fb9bc..1640b20b4d 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2158,6 +2158,8 @@ static void arm_cpu_realizefn(DeviceState *dev, Error= **errp) cs->num_ases =3D 1 + has_secure; } =20 + cpu_address_space_init(cs, ARMASIdx_NS, "cpu-memory", cs->memory); + if (has_secure) { if (!cpu->secure_memory) { cpu->secure_memory =3D cs->memory; @@ -2175,8 +2177,6 @@ static void arm_cpu_realizefn(DeviceState *dev, Error= **errp) } } =20 - cpu_address_space_init(cs, ARMASIdx_NS, "cpu-memory", cs->memory); - /* No core_count specified, default to smp_cpus. */ if (cpu->core_count =3D=3D -1) { cpu->core_count =3D smp_cpus; --=20 2.34.1 From nobody Mon Feb 9 23:21:46 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=1766006553; cv=none; d=zohomail.com; s=zohoarc; b=MdFyG8L4IgVVYMkWwGltHuCh9E0moj+hqmeR3vxkd23oUfkJ6qxyulh5ZNLDaVLdYNqjs1NJnLh6+fmayKnzprz6O6wk1w2JliiqH8ixujfYuH0uCcMf9/P2URwuowCjZNCqMrbZDrX7MzEI+gOmhSifLfAnNUMLJySi4jXmYJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766006553; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=u2+w7aKeM4mn6IUIq7PiZicrN3KwLnQcc+QlfR75hvY=; b=HgAIDzD3IOy5i1jVSCGXJd+U2Mcl9bIo/UgzSBLxdEM2rnkACG4IWsGO29Qpz3aVarYQUuxqBJQrGI9kjwi2uZYSc9qpMwRS4LVjxG24+XBc4Alfcjwt91YZvcbh0naH3SW+KfSuC1fn6DRy1upi+j5eBZqnzqJsaQr1B5mFqHk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766006553793315.19547142815156; Wed, 17 Dec 2025 13:22:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVyxN-00009F-E0; Wed, 17 Dec 2025 16:21:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vVyxF-0008Si-MK for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:05 -0500 Received: from mail-pf1-x435.google.com ([2607:f8b0: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 1vVyxC-0004YZ-2Z for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:04 -0500 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-7acd9a03ba9so7097425b3a.1 for ; Wed, 17 Dec 2025 13:21:01 -0800 (PST) Received: from gromero0.. ([191.8.216.160]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12061ef3383sm1852476c88.0.2025.12.17.13.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 13:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766006460; x=1766611260; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=u2+w7aKeM4mn6IUIq7PiZicrN3KwLnQcc+QlfR75hvY=; b=VB9dcjcwiOWVSdQ37lIEzrg4x/3Mm52GgbuaqYC55WSx7EO1cJaF4x937gjKcR1hbw 6Dz6Phg+6Ji0Al7JlwpRIoVBdCQlKWVqu5evjWNJ8aagTTJLslNtAKrbQ/4csnuPbvxG MXBO4OsyACiTQT23+SbFA13FGMp3UMtujKble4XlBZbWQZbqq3di0XyoGLS8qKfZEBIn /k2T2NvVUU7lmCwjMIrPFqXOxfYK7Q/+Grnb2Z+ZFKvV8u/sMi/0PXgNRTc4p79pEKIq B5kiZAj3oWOmlUZ6DpSXQ+JI0TnToThscAVL/0JIhb+2LOfafadqD4673uaUU+JVr6db 66Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766006460; x=1766611260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=u2+w7aKeM4mn6IUIq7PiZicrN3KwLnQcc+QlfR75hvY=; b=lZ1ypHAOwrtscGaCBaOs/2xyp4fomlDui3hFY3loB1rL84yumwBMVZRzZH+yNa/gRc nQdOfCEsZTk8d4qK8oE7rBDpgeo9qIVepcxfFbwm5uJmBz6ioSabiqf4HlniV9K7Om4I 4iDIQPIsDWlCNcZh9F0NTQUC/O496pUzf0LJK664S5dxBx5tuYTt5gyF9cQB5uSRFwCr LEoWbt/UotIwCbN8ZIAIX7miKYvfH/YnZGc9yJZcyffKOXtTotruQGkaVQ43V1Ag80Xl kFaIH4CvSDBuTBGSeVgYrGFL9g3Nv50TnscIcpzilHRIgKBuCWYKz+AxxbFNmAqrnfUu zoyw== X-Gm-Message-State: AOJu0YwZQYxQUi/aAfc1RKZAw/rJRnmYF9SNS7FEcQi8r833c1VcYeAE 5Cay8Qv4oaZh3f/pjLXkPzgZ5cp57+sqlM1hThp1qg8dXesI6omnrXKia6VcYO5O/5SKW4vTzAp CPlDV X-Gm-Gg: AY/fxX7iLrDG4zKsxZpUucEj7bfVvEBBFIDKm0eG9UyrRikptYV+sT414NWlo1BHR56 neuLhAX+azVH2Dn3eLb3yaKBxUQJnaHud0g6HnuIp9PzJwVtDMiEVSqLQ2j7Yw2iAJh1zcm+ZIB n76ODT8s7j+CkI1UL9kQBZ219oByRzKS+HICFbLr07m2ejE+FPcQGXyIkJyssKdtg/0dfImrQw9 qh/96CeJ5aHu+NLPK9DpG/RMZI8gcN43IRVjMX9BjRPJqdTl2XybQR2fC+pdNeQnuRty87YNkZz A0LKwGn8NdsFqUTyS/qZIS5b/nEBEhNIlc3EJulxRPsSrFZsLL1bkNZr8AV+D3itAtJsvxpIlim rZ0O3UQSt4D11WGlIWnIJWS27uNCa5eu5kE94+VZVuRYp1E1tqYpT4SFjO01vhCciEM4fz+2m7Q DwRKiN+Dq5K/5Gwn8= X-Google-Smtp-Source: AGHT+IFg3xV2gW/RwJSjplPlVf9W1qWvTBF6RzlOUdR5mVzRDt6DQLTiIxH6E4GP+uNSJPDW7HEBsQ== X-Received: by 2002:a05:7022:e20:b0:119:e56b:9590 with SMTP id a92af1059eb24-11f34bf9f44mr20860406c88.21.1766006460351; Wed, 17 Dec 2025 13:21:00 -0800 (PST) From: Gustavo Romero To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, philmd@linaro.org, peter.maydell@linaro.org Cc: gustavo.romero@linaro.org Subject: [PATCH v2 2/6] target/arm: Add a _MAX sentinel to ARMASIdx enum Date: Wed, 17 Dec 2025 18:20:14 -0300 Message-Id: <20251217212018.93320-3-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251217212018.93320-1-gustavo.romero@linaro.org> References: <20251217212018.93320-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=gustavo.romero@linaro.org; helo=mail-pf1-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: 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: 1766006554691158500 Content-Type: text/plain; charset="utf-8" Add a sentinel to the ARMASIdx enum so it can be used when the total number of address spaces is required. Signed-off-by: Gustavo Romero --- target/arm/cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 39f2b2e54d..00f5af0fcd 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2336,6 +2336,7 @@ typedef enum ARMASIdx { ARMASIdx_S =3D 1, ARMASIdx_TagNS =3D 2, ARMASIdx_TagS =3D 3, + ARMASIdx_MAX } ARMASIdx; =20 static inline ARMMMUIdx arm_space_to_phys(ARMSecuritySpace space) --=20 2.34.1 From nobody Mon Feb 9 23:21:46 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=1766006571; cv=none; d=zohomail.com; s=zohoarc; b=AgyfoWdBR7cD4tSoXsRqWHfxNVzqeFEnrIRZJ/ChMLcvSSCIOx49H63s18TSgz2BzVjNTJH/L6yuhylgYCzTfWNJM6ysbfVZJZ4rcEltquY5QO+h7VvwpWp2F4FcXs72mgwV0wD4CSikFotIA9bz14bEu6sP6c1086IFfIwSAUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766006571; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=P6rMJ3udbgIpgAiy6d31R0Vx2kkWCqkcA13MTheL8sQ=; b=nfO0999Qs0XQhFWBnU619vL2k8VJp0mjg2T35ZF9au23rTyfqLMU3dZH1n0WFQuv2Qk0pLqb16RORLefftzeHHZGPO+PNyKL6KBqgQP+zkjBVCqZmT4dJmdP9yzNFdomRCL2erhR8cme4dqKP0YhwjoZcs+I6VFuzHpgU0hmRQs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766006571448385.6269507882581; Wed, 17 Dec 2025 13:22:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVyxO-0000Af-QO; Wed, 17 Dec 2025 16:21:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vVyxH-0008St-1w for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:07 -0500 Received: from mail-dy1-x132d.google.com ([2607:f8b0:4864:20::132d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vVyxF-0004ZB-EL for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:06 -0500 Received: by mail-dy1-x132d.google.com with SMTP id 5a478bee46e88-2ae24015dc0so1081337eec.1 for ; Wed, 17 Dec 2025 13:21:04 -0800 (PST) Received: from gromero0.. ([191.8.216.160]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12061ef3383sm1852476c88.0.2025.12.17.13.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 13:21:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766006463; x=1766611263; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P6rMJ3udbgIpgAiy6d31R0Vx2kkWCqkcA13MTheL8sQ=; b=lnrjSTETKHTBsLS0MyHE5yt+7v0flwHb8IGz+AnCfNU6B+6QsTROZNyWjzxKErAQYF Zq/ZaKxyDGfxXfEGYIUWCoqfnhqt6rNFvF5cXChb4sfBUG+pfo5XvAll80xfXlLePBxs IaKuQdnpmQP6s+vn4k2QytsmQUsthDmJk8HcASVw2WmOheh+B+n1lqlyLopu1GOs9CYC FSVwZYBhEnpCP22mtHUNQybY9CB/5KGPS6vJGC37qfSibPV2u/8x+0dn5KRcnmvJGQx7 s92xjRVEO1DtI7lGEAig+7bheqdXuSqs877tZDdETvWlpXaHHZHzARjFHcmDuUA8/qLJ fvHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766006463; x=1766611263; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=P6rMJ3udbgIpgAiy6d31R0Vx2kkWCqkcA13MTheL8sQ=; b=dDt3/juqM5gZQ6huenF4k3vMTEPjRQY1YmM0bhqAkS2Eb4Hg9X08i5adEoVSw4rycN ZyjYfYQYrEhi5aCSXAkPgQf6RVoddy/n4bc5HoTPNvwrmx4A9reZIAXLqd0EuXUrwdCX bQnNf/NpavRhE5aUd4kS6TCrGByRicbdXqOoXMlXr8SwuvqpLEcpYbX2fy21Cyh31Li/ /NtHd+X7yg+2mhOigs+U06xYRtD3SLDHe0lugQ6nPDYLmvzLSZ/V05iIE7rqb5Geflap EqsZcJDV/NojZYT8rdhDGPQwrDcx8Q1XUC4ZSx4G1ucZknARqz4rtC2RaMQ0qrBrdAff h8ow== X-Gm-Message-State: AOJu0YxwUu+abK2wgQVKviWgI9qOh4JkfDXpKlJuKMrnJRxdpagamfhT dO9c7XN6mCP/Yqr2+8TFq295sX7hkZSKRnwfFUCGV1cWCAjgsbb/rMUCnQQED2dGqW+c6Vw9A3v hWYkN X-Gm-Gg: AY/fxX7MdyaIfLMjiRe6dUXCssd1sgl7X46olpwwU4YPMNMreK//QapSdSTv+AUFeEr e4ndbXT4ReicX/tpd3XFUIL8aqaaRQ6xViQRzZ8gBvBB4M56mvN4/H7bOZignL13AFwzBR1SpLl YXT6j9gnaxyLO99JIAd5kTiGKNHaHrobQkVvocZZ4Phm0Kj8whXUPP6WiKm49y2o0tCbGlrmgz7 iVoitCPph9P8yFwVnbNzZ9WWda/62r8yVdctuKoXWUk4vQ79O8Z2ablpTeB8SoexsQqmyav0YTZ slnMzxTcKMHhFmQJPhwkt4WQkduF7dDzIsOEqfPNUXp6I51rmhe/gfvxtYLxK44/Toz6yY42/K0 zvm+ubmVKfql7Nzkyv5ZCZOfL1Uri8V4+yFc5nbPRZ9lwOUoE0jG0u+ZTTlbat5PpWoM2LhEDPc 46m1Qz07MBaHhJSoE= X-Google-Smtp-Source: AGHT+IFrBbbLfgFSt3ipKNQ1FyQche183dMsWRyOxuuFRtR7CcPIeqi++oKWDmhkqCsx96QI4AKtcQ== X-Received: by 2002:a05:7022:ef13:b0:11f:3479:fb72 with SMTP id a92af1059eb24-12061938261mr763402c88.6.1766006462582; Wed, 17 Dec 2025 13:21:02 -0800 (PST) From: Gustavo Romero To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, philmd@linaro.org, peter.maydell@linaro.org Cc: gustavo.romero@linaro.org Subject: [PATCH v2 3/6] target/i386: Add a _MAX sentinel to X86ASIdx enum Date: Wed, 17 Dec 2025 18:20:15 -0300 Message-Id: <20251217212018.93320-4-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251217212018.93320-1-gustavo.romero@linaro.org> References: <20251217212018.93320-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::132d; envelope-from=gustavo.romero@linaro.org; helo=mail-dy1-x132d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1766006573409154100 Content-Type: text/plain; charset="utf-8" Add a sentinel to the X86ASIdx enum so it can be used when the total number of address spaces is required. Signed-off-by: Gustavo Romero --- target/i386/cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index cee1f692a1..783ad66d74 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2600,6 +2600,7 @@ void cpu_sync_avx_hflag(CPUX86State *env); typedef enum X86ASIdx { X86ASIdx_MEM =3D 0, X86ASIdx_SMM =3D 1, + X86ASIdx_MAX } X86ASIdx; =20 #ifndef CONFIG_USER_ONLY --=20 2.34.1 From nobody Mon Feb 9 23:21:46 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=1766006553; cv=none; d=zohomail.com; s=zohoarc; b=k9b3WKhsQ4zJ8ONSteDVQ8zUXYJxf3ZczPqovorgFvU9JRfpRt8qb8XZ2lWVp25wbvZtNFpCnWWhweRSEOe4Lvs1b8VyE/XSuTHX2qsP8E+L7DWfuhJgaUiYDfLlGGTXMbOofYv4I1J6H9HN5AoF3Melf86UBrSgiWYyC+Bi+tQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766006553; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vW3yF4FTRUZh5FCldFHo0wmFnTNC+Anm6XgXXn1BVVU=; b=IYCZPEnZIjZZyLj/LnjOsW8XXpHiPhxraV6h0pnTZxaxzPL4xJ8EsnGyMBRA20QGONuJtAxzWl7Mfem53d0STkTyyQuyakoDHWoB7lDHDPlLtSqIGkY+0BjgA6ngbSx/JS1y717Fj+GJ+Ydaw6xhQkNMzAMEn4KZjFV5zrudWpA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766006553498883.8866609088109; Wed, 17 Dec 2025 13:22:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVyxO-0000A6-DS; Wed, 17 Dec 2025 16:21:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vVyxJ-0008Tw-S4 for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:11 -0500 Received: from mail-pf1-x431.google.com ([2607:f8b0: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 1vVyxG-0004ch-OC for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:08 -0500 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-7aa2170adf9so5105738b3a.0 for ; Wed, 17 Dec 2025 13:21:06 -0800 (PST) Received: from gromero0.. ([191.8.216.160]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12061ef3383sm1852476c88.0.2025.12.17.13.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 13:21:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766006465; x=1766611265; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vW3yF4FTRUZh5FCldFHo0wmFnTNC+Anm6XgXXn1BVVU=; b=yiTbWMmN5Q1LhAFXtT/YtxQFbYI4oGW8xUYSYmQWGuAP4qolW9DBgPn6iFs3bvPSA2 AwFx1gAEVtXPDc88UWfyOclmqOTyUpf1z7LftsWKowLQvPn08iZZO/ncCQIv+qfMve3n srO9ENMCpnUmQAUWyiRE01JXDPz87K4ly7dJkMzHoB9/RGuH204daMWkbSN023sAkf91 +NeABE7pYj7xkjA1deQxr0PX/lRQSfpX2M739uduViXPdK81+GTXl1ElHnJVdKHa5C2y PUqmk7xE7iqJbNlFfCpQQFjOmEzW7nabP6UeHXRyMnfxdujjcRqaj1cIHbM0Ftkc3fT2 XCOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766006465; x=1766611265; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vW3yF4FTRUZh5FCldFHo0wmFnTNC+Anm6XgXXn1BVVU=; b=bVNS1dY/QLibyXy+495xxa81inn/cOa3tHOqn+HsSquFYPb884QuNCd5uzvwSRvsNk M3mk3jsOS7Q2a+dEpPKK8GXpcnFqTH3VPsSLcu46A1F/b109f95DNDHkz1STyGXieKdl RJUWdg7sMIg+1HA2wfJmacx0XcMwZzRV8AZBUUk7nVYTrmoo+C4PoT/hmlKcyV/PbFM7 k68K5vy0rOVKu/vqVf3CfrxhOmobGK26TniNVrze6XCoO6Ed1SC4ADIXmJzZKcK69KZ9 ixRMGYzT5P18XfOm4UzGvd+QH3KKKpFKISZqmDmqjX94c7vdYqQtyR1zMFIBzWYllvOg ZEiA== X-Gm-Message-State: AOJu0YxLOYyzq2+1EeXxnKXUsbm3vwKr7CQY/SzWkyDMQAVABHf3E+lJ PqCj/t0tC26PHj3aQ9wFr5IXEPc6pvM35fiMNc1QnvUJrg+e8v/dlK6i/hvKRagxib0/WET0Uuw v8rOT X-Gm-Gg: AY/fxX7s7kjfbtKxadmQCSTLKAl6ck3k8OuZstBYAceikTmaiuN1aRdI9SDmyp72Uqb 4EPm+jGjmBqFYyx0YjKiOMHJj0T1CWkt1QQdi3PJJi/a4tspSKA84ppxPHdlvKHhoUw3GomvpTM jACbDjQ3stKj88qpl7vUSqY4uKxPf6Qb8y92Zt/TlLtmL0tXw/1ZaTVH9CfIDQFXxs9LARikGCJ ukHXr4L/KPhaMnPX94r1ldGQo/PGLHMlKqHepCZgRleBjBcFLk0rgOnR99giTzzQuOpirXUMmEr LlDYVGVxi33pKfsg0CG6aa6Q7i6+ITDBM6qMVcrrll19TzR3mzpuWlnUAHfQ7AjTzY8EY+ITkmX ujFJrWYuhOHS2VjGA1Tb0HIy98atGKVOh3JY5X7zvF2zM0Kf8bFmnJH/2bSQ55v9k2qnPZxdWq1 P15hx+cLDncVEdA+Q= X-Google-Smtp-Source: AGHT+IFKBgwJTEJ3iwBtGK7Fb7UZbh4PwkpG6DfYZPCkq/yhN1ytfbfPxplCVcnnfl9fuYwcE7L+kA== X-Received: by 2002:a05:7022:150b:b0:11a:23fb:16e2 with SMTP id a92af1059eb24-11f34bde2e9mr14045006c88.9.1766006464838; Wed, 17 Dec 2025 13:21:04 -0800 (PST) From: Gustavo Romero To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, philmd@linaro.org, peter.maydell@linaro.org Cc: gustavo.romero@linaro.org Subject: [PATCH v2 4/6] system/physmem: Rename cpu_address_space_init Date: Wed, 17 Dec 2025 18:20:16 -0300 Message-Id: <20251217212018.93320-5-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251217212018.93320-1-gustavo.romero@linaro.org> References: <20251217212018.93320-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=gustavo.romero@linaro.org; helo=mail-pf1-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1766006557393154100 Content-Type: text/plain; charset="utf-8" Rename cpu_address_space_init to cpu_address_space_add in preparation for the forthcoming addition of a new cpu_address_space_init. Signed-off-by: Gustavo Romero --- include/exec/cpu-common.h | 6 +++--- stubs/cpu-destroy-address-spaces.c | 2 +- system/cpus.c | 2 +- system/physmem.c | 4 ++-- target/arm/cpu.c | 16 ++++++++-------- target/arm/cpu.h | 2 +- target/i386/kvm/kvm-cpu.c | 2 +- target/i386/kvm/kvm.c | 4 ++-- target/i386/tcg/system/tcg-cpu.c | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index e0be4ee2b8..126f645354 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -102,7 +102,7 @@ size_t qemu_ram_pagesize(RAMBlock *block); size_t qemu_ram_pagesize_largest(void); =20 /** - * cpu_address_space_init: + * cpu_address_space_add: * @cpu: CPU to add this address space to * @asidx: integer index of this address space * @prefix: prefix to be used as name of address space @@ -120,8 +120,8 @@ size_t qemu_ram_pagesize_largest(void); * * Note that with KVM only one address space is supported. */ -void cpu_address_space_init(CPUState *cpu, int asidx, - const char *prefix, MemoryRegion *mr); +void cpu_address_space_add(CPUState *cpu, int asidx, + const char *prefix, MemoryRegion *mr); /** * cpu_destroy_address_spaces: * @cpu: CPU for which address spaces need to be destroyed diff --git a/stubs/cpu-destroy-address-spaces.c b/stubs/cpu-destroy-address= -spaces.c index dc6813f5bd..a86e8d4db1 100644 --- a/stubs/cpu-destroy-address-spaces.c +++ b/stubs/cpu-destroy-address-spaces.c @@ -5,7 +5,7 @@ =20 /* * user-mode CPUs never create address spaces with - * cpu_address_space_init(), so the cleanup function doesn't + * cpu_address_space_add(), so the cleanup function doesn't * need to do anything. We need this stub because cpu-common.c * is built-once so it can't #ifndef CONFIG_USER around the * call; the real function is in physmem.c which is system-only. diff --git a/system/cpus.c b/system/cpus.c index ef2d2f241f..fa9deafa29 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -719,7 +719,7 @@ void qemu_init_vcpu(CPUState *cpu) * give it the default one. */ cpu->num_ases =3D 1; - cpu_address_space_init(cpu, 0, "cpu-memory", cpu->memory); + cpu_address_space_add(cpu, 0, "cpu-memory", cpu->memory); } =20 /* accelerators all implement the AccelOpsClass */ diff --git a/system/physmem.c b/system/physmem.c index c9869e4049..4a0c1b74f1 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -775,8 +775,8 @@ hwaddr memory_region_section_get_iotlb(CPUState *cpu, =20 #endif /* CONFIG_TCG */ =20 -void cpu_address_space_init(CPUState *cpu, int asidx, - const char *prefix, MemoryRegion *mr) +void cpu_address_space_add(CPUState *cpu, int asidx, + const char *prefix, MemoryRegion *mr) { CPUAddressSpace *newas; AddressSpace *as =3D g_new0(AddressSpace, 1); diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 1640b20b4d..1902c510f9 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1681,7 +1681,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error= **errp) * * Catch all the cases which might cause us to create more than one * address space for the CPU (otherwise we will assert() later in - * cpu_address_space_init()). + * cpu_address_space_add()). */ if (arm_feature(env, ARM_FEATURE_M)) { error_setg(errp, @@ -2158,22 +2158,22 @@ static void arm_cpu_realizefn(DeviceState *dev, Err= or **errp) cs->num_ases =3D 1 + has_secure; } =20 - cpu_address_space_init(cs, ARMASIdx_NS, "cpu-memory", cs->memory); + cpu_address_space_add(cs, ARMASIdx_NS, "cpu-memory", cs->memory); =20 if (has_secure) { if (!cpu->secure_memory) { cpu->secure_memory =3D cs->memory; } - cpu_address_space_init(cs, ARMASIdx_S, "cpu-secure-memory", - cpu->secure_memory); + cpu_address_space_add(cs, ARMASIdx_S, "cpu-secure-memory", + cpu->secure_memory); } =20 if (cpu->tag_memory !=3D NULL) { - cpu_address_space_init(cs, ARMASIdx_TagNS, "cpu-tag-memory", - cpu->tag_memory); + cpu_address_space_add(cs, ARMASIdx_TagNS, "cpu-tag-memory", + cpu->tag_memory); if (has_secure) { - cpu_address_space_init(cs, ARMASIdx_TagS, "cpu-tag-memory", - cpu->secure_tag_memory); + cpu_address_space_add(cs, ARMASIdx_TagS, "cpu-tag-memory", + cpu->secure_tag_memory); } } =20 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 00f5af0fcd..f68552945e 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2330,7 +2330,7 @@ bool write_cpustate_to_list(ARMCPU *cpu, bool kvm_syn= c); =20 #define TYPE_ARM_HOST_CPU "host-" TYPE_ARM_CPU =20 -/* Indexes used when registering address spaces with cpu_address_space_ini= t */ +/* Indexes used when registering address spaces with cpu_address_space_add= */ typedef enum ARMASIdx { ARMASIdx_NS =3D 0, ARMASIdx_S =3D 1, diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c index 9c25b55839..a6d94d0620 100644 --- a/target/i386/kvm/kvm-cpu.c +++ b/target/i386/kvm/kvm-cpu.c @@ -99,7 +99,7 @@ static bool kvm_cpu_realizefn(CPUState *cs, Error **errp) * initialized at register_smram_listener() after machine init done. */ cs->num_ases =3D x86_machine_is_smm_enabled(X86_MACHINE(current_machin= e)) ? 2 : 1; - cpu_address_space_init(cs, X86ASIdx_MEM, "cpu-memory", cs->memory); + cpu_address_space_add(cs, X86ASIdx_MEM, "cpu-memory", cs->memory); =20 return true; } diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 60c7981138..dcc7e5eeae 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2744,14 +2744,14 @@ static void register_smram_listener(Notifier *n, vo= id *unused) &smram_address_space, X86ASIdx_SMM, "kvm-= smram"); =20 CPU_FOREACH(cpu) { - cpu_address_space_init(cpu, X86ASIdx_SMM, "cpu-smm", &smram_as_roo= t); + cpu_address_space_add(cpu, X86ASIdx_SMM, "cpu-smm", &smram_as_root= ); } } =20 /* It should only be called in cpu's hotplug callback */ void kvm_smm_cpu_address_space_init(X86CPU *cpu) { - cpu_address_space_init(CPU(cpu), X86ASIdx_SMM, "cpu-smm", &smram_as_ro= ot); + cpu_address_space_add(CPU(cpu), X86ASIdx_SMM, "cpu-smm", &smram_as_roo= t); } =20 static void *kvm_msr_energy_thread(void *data) diff --git a/target/i386/tcg/system/tcg-cpu.c b/target/i386/tcg/system/tcg-= cpu.c index 7255862c24..231a4bdf55 100644 --- a/target/i386/tcg/system/tcg-cpu.c +++ b/target/i386/tcg/system/tcg-cpu.c @@ -74,8 +74,8 @@ bool tcg_cpu_realizefn(CPUState *cs, Error **errp) memory_region_set_enabled(cpu->cpu_as_mem, true); =20 cs->num_ases =3D 2; - cpu_address_space_init(cs, X86ASIdx_MEM, "cpu-memory", cs->memory); - cpu_address_space_init(cs, X86ASIdx_SMM, "cpu-smm", cpu->cpu_as_root); + cpu_address_space_add(cs, X86ASIdx_MEM, "cpu-memory", cs->memory); + cpu_address_space_add(cs, X86ASIdx_SMM, "cpu-smm", cpu->cpu_as_root); =20 /* ... SMRAM with higher priority, linked from /machine/smram. */ cpu->machine_done.notify =3D tcg_cpu_machine_done; --=20 2.34.1 From nobody Mon Feb 9 23:21:46 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=1766006582; cv=none; d=zohomail.com; s=zohoarc; b=lWG6toSVoiw04BQwqlww11IA95vjvtwFO5PsKSb/WkxZjyL24i5aVsI0TLqwKHfDRxV+lFMSOJjpF7NpbQ5UKDXZydP4gV8NVPm2LUOnu5G5yrXKYJICI7XYqRBUjiG/fwRnlOrV+XgjAF8Rvozk1sYYsltXad1Omi0OKyZs4pY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766006582; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4ANPNEdMCjohC/SqbWuEPORpYMejuUnEzpSC6wthoj4=; b=CZZGssSPVGUPhEWPUUG42zKZ9AowMJfHNYXQ/oSjdQmVeGeZSbV+0pAvqn1lx31nF6JD9JRz+nLAIG+s7SBMBYEJpIFfHmOdrm6Zg2E3loTmoy19R6V/iX1lDFIXA7LWo/0ZjjjcBUGvOOgN09u0PLJKXMJ0on3z1lfRWhlHuJY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766006582251136.51303953499405; Wed, 17 Dec 2025 13:23:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVyxO-00009l-4C; Wed, 17 Dec 2025 16:21:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vVyxL-0008Ut-5j for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:11 -0500 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vVyxJ-0004dO-J3 for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:10 -0500 Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-34c84dc332cso4267185a91.0 for ; Wed, 17 Dec 2025 13:21:08 -0800 (PST) Received: from gromero0.. ([191.8.216.160]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12061ef3383sm1852476c88.0.2025.12.17.13.21.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 13:21:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766006467; x=1766611267; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4ANPNEdMCjohC/SqbWuEPORpYMejuUnEzpSC6wthoj4=; b=ArkIQO8BcitG1puK5VNVftNQz8GV1GTT4zXgyavZK+RycCCDj1A5GIUfxtYaenX4ja EdnE7TVQbGcfmWOdsvYOJ5nYPehBh4Vw/pcJoEkAOAHvLqkV5jyD2pkuAiGBsdp5hZLp jEcaO0KkyG86SlufJaU/gd7I7fGOqywzqmGxc7omDjifX1XwGRlLIvf3poS5+3a1LL7g W2CvOmzY0a0vRYqlMlawfty0dt8GZIDCFYPSNH8o9h6eGlRzjWOsyp6vKJ9pSCh87ulA NaqdXHXJBI/ZytjWCT8kuyHstKnnhwWP5gmurnd4IyU39y6oJk/xEyI8yzMpV9T7GW+i o3Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766006467; x=1766611267; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4ANPNEdMCjohC/SqbWuEPORpYMejuUnEzpSC6wthoj4=; b=I9yoT8xgIGKH8tiKvQldrpFoBYMoHjiT5BqfOFiO0qhGolejd3eZ0WbVDs1G2ZOiBo 9qlsEFdwZd/NSl1gnzqfGhvtXHR+L4ZfJwic957DD5mKKfgTyQdbG/NOtT36RdHFdAIj ZjDn8Q4H8hdI0AQyKUupNXfpLmgq/VdOLxbrq9ET9F1fYTuZlQrtWcukMPXaoj5LD4OC HExbkUgf0j20atp/xkoGbK0YiQb2emv7gHqVlMxk9usr1snTuRBbNYzG41Cn0MXWS1qC E8/XYAeELN6pMAZAkFmMJCeeEOLUvn2UkEQJa2RMfsEQHoIYn/5pKncPYDBb11uUNcid btXw== X-Gm-Message-State: AOJu0Yw82WzQ+eCwxqGDH4BZrxnUHEwF1BgPPglKFxqWHqjTYPjfvN+Z i2fzfIow5fXvKPRn8gk/yOkdpLtvsWuqXc9gZazlEj90Kc4MOOyg5I7NUFFd5dpoJ58vQq8Rl9z UjeCL X-Gm-Gg: AY/fxX7kPyBrb0bk6/Bd7MvUrwNKR12rHe0hQwrscfJAc+AtROuQ22NKNZSkzPQTynV pw3tC698Coaht4++v46Q0fKIuaNQi3dt4cdrgAwjnjUw47Qnb/ITgYp2QcOZcRyj4/Un6zHF+wO fX2qjFS1p2RMTR6+ONtk+2x23f0izsEbjFJvh5deIX6hIaD5PTzOS4smHLnux59ev18I9Dcc88t t7Rthlplq8hKtamSQOP5szZLs9uodhekwtSAfjYFyB9lGm+esZDfr86w+70tl9nPv1zNksMcGPy Iyg96wr3BWgh+XnCUHvjcnC1/cgQSPNqILIqqvDlhEvsbGv6SoBij9r9q7n8IMIgUCRHLkNVfvS EG+dXZ8iQS64BQK7c3/TL2d7JD022OyjfWDA8lcvgCO+90O7vq0Tll82hOFy5U9LyAaN20hdQ66 QnPfVe+bmPI9wWENU= X-Google-Smtp-Source: AGHT+IEIbgn0/kfIHH+oQnIQi9s/ItN1W3x5eycWesXz/1IC06oQt9pAOmIHYjpqnYNqn3lw4MtG3g== X-Received: by 2002:a05:7022:7e84:b0:11f:2c69:32 with SMTP id a92af1059eb24-11f34bd9069mr13503187c88.7.1766006467089; Wed, 17 Dec 2025 13:21:07 -0800 (PST) From: Gustavo Romero To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, philmd@linaro.org, peter.maydell@linaro.org Cc: gustavo.romero@linaro.org Subject: [PATCH v2 5/6] system/physmem: Add cpu_address_space_init Date: Wed, 17 Dec 2025 18:20:17 -0300 Message-Id: <20251217212018.93320-6-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251217212018.93320-1-gustavo.romero@linaro.org> References: <20251217212018.93320-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=gustavo.romero@linaro.org; helo=mail-pj1-x1029.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: 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: 1766006583721154101 Content-Type: text/plain; charset="utf-8" Add cpu_address_space_init to enforce the invariant that cpu->num_ases is set exactly once, preventing bypass of the Address Space API. Signed-off-by: Gustavo Romero --- include/exec/cpu-common.h | 19 ++++++++++++++++--- system/physmem.c | 8 ++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 126f645354..1ab63eac9f 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -101,6 +101,19 @@ int qemu_ram_get_fd(RAMBlock *rb); size_t qemu_ram_pagesize(RAMBlock *block); size_t qemu_ram_pagesize_largest(void); =20 + +/** + * cpu_address_space_init: + * @cpu: CPU to init the number of address space(s) + * @num_ases: number of address space(s) in @cpu + * + * This function must be called before calling cpu_address_space_add and + * it sets the total number of address spaces that can be added to @cpu + * using cpu_address_space_add. + * + */ +void cpu_address_space_init(CPUState *cpu, int num_ases); + /** * cpu_address_space_add: * @cpu: CPU to add this address space to @@ -114,9 +127,9 @@ size_t qemu_ram_pagesize_largest(void); * The target-specific code which registers ASes is responsible * for defining what semantics address space 0, 1, 2, etc have. * - * Before the first call to this function, the caller must set - * cpu->num_ases to the total number of address spaces it needs - * to support. + * Before the first call to this function, the caller must call + * cpu_address_space_init to set the total number of address + * spaces @cpu can support. * * Note that with KVM only one address space is supported. */ diff --git a/system/physmem.c b/system/physmem.c index 4a0c1b74f1..2666dbc272 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -775,6 +775,14 @@ hwaddr memory_region_section_get_iotlb(CPUState *cpu, =20 #endif /* CONFIG_TCG */ =20 +void cpu_address_space_init(CPUState *cpu, int num_ases) +{ + assert(num_ases > 0); + assert(cpu->num_ases =3D=3D 0); + + cpu->num_ases =3D num_ases; +} + void cpu_address_space_add(CPUState *cpu, int asidx, const char *prefix, MemoryRegion *mr) { --=20 2.34.1 From nobody Mon Feb 9 23:21:46 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=1766006517; cv=none; d=zohomail.com; s=zohoarc; b=BoO61tABxW0sPdA3PUzPI58N21aAHFGNlbr/MKWLi1G3AOi1yD6sKoqM8D3n3hIsxaDT3uc93pNKoemxc3hm+GkBCWunI2GvJAFZM/3VP+FYqhBqNQahV3BWf6jzxIUDN+TcF7Zw7MWqKqEpHkUelZ9HTjF1hiLMpB/9mwhzRGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766006517; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uL2mCK6rnb99hwd+Wqz4LI6bREO75gA3FJH4GnyvXvQ=; b=NtGmFctDVSWEFVU5z5vfQijsdhQ522mYFJMzOX8LMwtTptLglcPdzw36GWE9K5zIWvcN4d8PEHZUJD0QjV6d7jC4aRHk9XbKKQedsk5ABYWv4b9mx5ymNMrvQy7TQvGc3yxM3IMm/RO73d3pd7nGbMeNXBuNkT2NNkBM+WwLo8M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1766006517748170.96712512177328; Wed, 17 Dec 2025 13:21:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vVyxQ-0000C1-VB; Wed, 17 Dec 2025 16:21:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vVyxM-00007M-MO for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:12 -0500 Received: from mail-pf1-x432.google.com ([2607:f8b0: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 1vVyxL-0004dq-0j for qemu-devel@nongnu.org; Wed, 17 Dec 2025 16:21:12 -0500 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-7acd9a03ba9so7097583b3a.1 for ; Wed, 17 Dec 2025 13:21:10 -0800 (PST) Received: from gromero0.. ([191.8.216.160]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12061ef3383sm1852476c88.0.2025.12.17.13.21.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Dec 2025 13:21:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766006469; x=1766611269; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uL2mCK6rnb99hwd+Wqz4LI6bREO75gA3FJH4GnyvXvQ=; b=blbz8FkqBdFUHzFdtzUlxBkAAGig06krgmO2BcQOGDQBsBChagwg61w9oTDHJffOkY x7q/o74lIrhbvmdYWTpUeRuzhXAGea836f2MzfC5i3hg+TVLVXi1W+o0XrrSr4svHpun hL+JTSv90oscokIbJoiNZuXOby0r+rCC7zYycwTzSxEUAnBPA3+HtqfSwRESPckDiV9H Dh4ZprX2TII+8nQ6rzCnwFU4lo6J13Cr7qYAc8LUfWSTFcSFRQkzgPe9mh7K94v2SoMb 190Ob67//TKfL4jQxedKFWpi5Oe+xm4NkEnka0kDmJ5WjGEQvpMF4K1sLldDw9NO2ja6 A9hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766006469; x=1766611269; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=uL2mCK6rnb99hwd+Wqz4LI6bREO75gA3FJH4GnyvXvQ=; b=BvGDKsjctHgSHX1QoUFqww4rjoTJlDqYZbXtoBRGrX0sUBCUZBMklWJVaKB/Nls/U3 nTGK4eg/39lw7LMjuHWpwJi1+D8Lc6zRuPk248fu7r8fS/VkH9xWKce0ignW0yDeY4Wt K85ZyE7WkTmywJES8/zawkPf2cZ39wvYMfqIYkQXDG2RKt2zI9TSu6OxWjHRyzdBBx2F G/TMKlbqYHlN1YYdYfSmOZMQ+Ge/2r64v/dJ7J7DZDVln3QIBF7eEuZTmJJhF/HlUb49 gV3Cws6A55o9zuYp9fAxCTCqrClNxd/DoSgJrwa3Y4EsEu+dXlxn3LgCn0Ef5rt1RwEF N9dA== X-Gm-Message-State: AOJu0YweRkEQ291T5lDw3h+WVJMZqx6aOD8p5jdy9E27offnHyZcWHIa ncgwmyk0EfUbx7kiQvI8dMjbR1AH1u8zlXdypvkWKsl7DtAvRzSs/XQfe38AztfvVAsXvMDH2gJ 0d9gL X-Gm-Gg: AY/fxX7njvjtf5LREzMwQ6rKgvSUWitBXM2gRXiyQdJIpHhFQ+BdrmQLRZaf+3ndWlH Ss/R12Cr2YLuEMj0sw9C6Zou/oy2pPVMbeqn4RN+I3OIYgvov1gff8BNtT+iUY3o4/fdrVwKwnn dUiCAfF2AM/h2Zb4/CtpfO2u5qi9Uzk1A+kAeN3MWIFCO3/O18JgZfIl+447+Jv/6tcmGfS34d5 bBFcfeci8luRf6WEL4PpnTqjpmjjIw0eanV71HHFE1oB2aM+Ryr5iu4USRul11UHfTNZQf+Rf9Q fqddShXmbsGk5yzcafal4iJWOtCVTfbCNrxOsTaLbMPSY029XqouU4yKaQPyQzsym8wGse0IA9I Uk9JtJLf11x6J2n0KGao/WloJcXdeNj323IcTfpY3sIITSX3hj3/iSC9TMenvFbfh9JHrj5SVyK nJTO47dLVmCFzyIlmqvwi55BcNHQ== X-Google-Smtp-Source: AGHT+IG72lzChL8ifKR0ow59YOMJO8E+H2l9V6i5v8SneILZwhDj+kBGORNmvP48etxnHFShnT/big== X-Received: by 2002:a05:701b:2714:b0:119:e56b:9596 with SMTP id a92af1059eb24-11f34c4b478mr11234849c88.27.1766006469324; Wed, 17 Dec 2025 13:21:09 -0800 (PST) From: Gustavo Romero To: qemu-devel@nongnu.org, qemu-arm@nongnu.org, richard.henderson@linaro.org, alex.bennee@linaro.org, philmd@linaro.org, peter.maydell@linaro.org Cc: gustavo.romero@linaro.org Subject: [PATCH v2 6/6] system/physmem: Use cpu_address_space_init to set cpu->num_ases Date: Wed, 17 Dec 2025 18:20:18 -0300 Message-Id: <20251217212018.93320-7-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251217212018.93320-1-gustavo.romero@linaro.org> References: <20251217212018.93320-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=gustavo.romero@linaro.org; helo=mail-pf1-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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1766006518927158500 Content-Type: text/plain; charset="utf-8" Use the new cpu_address_space_init function to set the total number of ASes in a CPU instead of directly setting it via cpu->num_ases. Signed-off-by: Gustavo Romero --- system/cpus.c | 4 ++-- target/arm/cpu.c | 10 +--------- target/i386/kvm/kvm-cpu.c | 3 ++- target/i386/tcg/system/tcg-cpu.c | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/system/cpus.c b/system/cpus.c index fa9deafa29..54be6a3faf 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -718,8 +718,8 @@ void qemu_init_vcpu(CPUState *cpu) /* If the target cpu hasn't set up any address spaces itself, * give it the default one. */ - cpu->num_ases =3D 1; - cpu_address_space_add(cpu, 0, "cpu-memory", cpu->memory); + cpu_address_space_init(cpu, 1 /* Number of ASes */); + cpu_address_space_add(cpu, 0 /* AS index */, "cpu-memory", cpu->me= mory); } =20 /* accelerators all implement the AccelOpsClass */ diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 1902c510f9..67ad6f0a6e 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2148,15 +2148,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Erro= r **errp) unsigned int smp_cpus =3D ms->smp.cpus; bool has_secure =3D cpu->has_el3 || arm_feature(env, ARM_FEATURE_M_SEC= URITY); =20 - /* - * We must set cs->num_ases to the final value before - * the first call to cpu_address_space_init. - */ - if (cpu->tag_memory !=3D NULL) { - cs->num_ases =3D 3 + has_secure; - } else { - cs->num_ases =3D 1 + has_secure; - } + cpu_address_space_init(cs, ARMASIdx_MAX); =20 cpu_address_space_add(cs, ARMASIdx_NS, "cpu-memory", cs->memory); =20 diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c index a6d94d0620..dbb04ef051 100644 --- a/target/i386/kvm/kvm-cpu.c +++ b/target/i386/kvm/kvm-cpu.c @@ -92,13 +92,14 @@ static bool kvm_cpu_realizefn(CPUState *cs, Error **err= p) kvm_set_guest_phys_bits(cs); } =20 + cpu_address_space_init(cs, X86ASIdx_MAX); + /* * When SMM is enabled, there is 2 address spaces. Otherwise only 1. * * Only initialize address space 0 here, the second one for SMM is * initialized at register_smram_listener() after machine init done. */ - cs->num_ases =3D x86_machine_is_smm_enabled(X86_MACHINE(current_machin= e)) ? 2 : 1; cpu_address_space_add(cs, X86ASIdx_MEM, "cpu-memory", cs->memory); =20 return true; diff --git a/target/i386/tcg/system/tcg-cpu.c b/target/i386/tcg/system/tcg-= cpu.c index 231a4bdf55..ab72c5ff7b 100644 --- a/target/i386/tcg/system/tcg-cpu.c +++ b/target/i386/tcg/system/tcg-cpu.c @@ -73,7 +73,7 @@ bool tcg_cpu_realizefn(CPUState *cs, Error **errp) memory_region_add_subregion_overlap(cpu->cpu_as_root, 0, cpu->cpu_as_m= em, 0); memory_region_set_enabled(cpu->cpu_as_mem, true); =20 - cs->num_ases =3D 2; + cpu_address_space_init(cs, X86ASIdx_MAX); cpu_address_space_add(cs, X86ASIdx_MEM, "cpu-memory", cs->memory); cpu_address_space_add(cs, X86ASIdx_SMM, "cpu-smm", cpu->cpu_as_root); =20 --=20 2.34.1