From nobody Sat Feb 7 06:03:31 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=1766528897; cv=none; d=zohomail.com; s=zohoarc; b=DzNg0S28CpnN1h59KxoPTZyWLcRdSBcUNqHThl9Y8QsiA+E1E6+Uo31eiveD1TVevV+3Nofy8G30sWT/yWRxE5oFWD/fljO1wKO1GILQU/y51pyP2F1tsQlU1fOuiaB6z1fftclHpQeennsmn93IFer+E87uuPAHgVatNuGD8Jk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766528897; 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=H34PpAp+RsLh81tuaCiqjKt+NN/jKeIiXmpeVpEL1+uELReVDtKoCbcBYmhZfMxQ7t34EhXpnXCArZehu0T/yIJtGYYk5xTMtAjaf8iEbve6tP1YLJERyanVYEA7M+hxiAPnJyYI6nuODTSWmLZFlRmBuFjg3X/ZDWw4ItJhcm8= 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 1766528897916959.3184927877546; Tue, 23 Dec 2025 14:28:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYAqX-0005Xv-0l; Tue, 23 Dec 2025 17:27: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 1vYAqV-0005WP-0B for qemu-devel@nongnu.org; Tue, 23 Dec 2025 17:27:11 -0500 Received: from mail-dl1-x122c.google.com ([2607:f8b0:4864:20::122c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vYAqT-0007NX-KR for qemu-devel@nongnu.org; Tue, 23 Dec 2025 17:27:10 -0500 Received: by mail-dl1-x122c.google.com with SMTP id a92af1059eb24-11beb0a7bd6so8933766c88.1 for ; Tue, 23 Dec 2025 14:27:09 -0800 (PST) Received: from gromero0.. ([179.93.129.179]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1217243bbe3sm62803123c88.0.2025.12.23.14.27.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 14:27:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766528828; x=1767133628; 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=HdKK4PNgm3qBR16Y9TyYu/kNDw6to1oCzlr38Yy7W38T06RwbvT5cnDWn98RYU1vxy Ws9BYn1nW8vOBdLy8dN7QlQ/ZxFBrUj4h3YT7UBWMJTPx/TL25Tz+sVVbw1T9qKXpW/Z YIwE27SlVmRrvdVQLWceqRU0yGtN5kEbnPQ92LxbPkyx5upvnop6AE9EkgGZZQypTIHO rpR6sTzRmmiJR3W1G9j5QgU3wAAeZ1I9m9A4tNVc+RCAIFSL+T8h8Do0hhFwDNIj+i9F ZQ4/yryfAe6SZFP93IN+ivyqGBau5kvl2hgHXTWgAdxAGOSLlBNuLkPXbEtXp/DsRtJy JfEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766528828; x=1767133628; 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=V7WvtPoZimSuCuHLXn2ufmgkTccwKLLXTO3mm+YgEoZoRDFdUgrihQtYj070L2pXVo M0AzNbB+U2n9nDFFJppGuXzMxnaGfXxaxDrbBiWRdPtcLLG6x9KngImszgbVWd91tF+r ZnszAoM7JlOYXzigc3X3RNLr9LC8y4v/3mbmEVnq0t9JFJDLc92zQTL9Meg6Vdf+r+cj Vso5vAWxsLu5/zmUA0a7KOQB3JjD/9RLH5gLv3l10CZXgj3yBNil+BOl0akeDyKgXO9p uYuIwKhmJmSbKoyHh5N2PuUBgLY4YKO7qaDlsVvObjsQS3i7dvn0p3LQB3PbrsZxEpmD kIFg== X-Gm-Message-State: AOJu0Yy8BwD9NpQbChFVjFe5G2Hbq3W2bQf+Q3+EmufZuXrbSKotBj34 nrLsPxR0oD2D1YG+aRr2W+C+ng8648cilwJrDkBDRXHqHuMOUAt6p4AJK9ngeMHMupK4C7TqqJU BZ/Tk X-Gm-Gg: AY/fxX5WgldUCe2FjLGxIb/NxDCmFQc9dxwxMYD4qRVjb3HEF8PJsHHmn4czo9ljviZ PuCriyy06fePsi0VLUPdbwKtnDRLmWxaQZWc0rnvUEIQeJPVRlJcy2cLYrr+Ke+4KqwQUqXFge+ UKysV5tLMb3ZwMW6MxJ9QpDzbiXRZbrpczJX7XGIqWTm2UaZTzSaIPAOYVwbmPbQThBVG48LpmZ RWxElnvZA9TDGzDmoHkUhVj230XLOrhRRjvBVxZ+tUfaWcUHI7OIzj2MdXJhhgk/bsbVX/hB0jz 0zBrXWNoqC2/GVd1NT9fYd/ulhwJZSDsqFwf7hjJVaf/1yooV/PQ6LdfsL/MzsfyD/SGT5xBSAW Gj7mgst/OI3CFcTPkaZcmeRSle1sXt4vBLrXshprB8NKejuANAfyaSmfn/zOucSoPoIO6eyYLTy fxaBYy8SlxKrC7uUv7 X-Google-Smtp-Source: AGHT+IH19+EvTqHNNFtNuRaE7xkCgFwDqAi0qHrZYmTJQ7d1jpYQGp39xBAw/i70s2RS1toCOubYew== X-Received: by 2002:a05:7022:d9a:b0:11e:3e9:3e92 with SMTP id a92af1059eb24-12061991f3bmr12231854c88.23.1766528827859; Tue, 23 Dec 2025 14:27: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 v3 1/4] target/arm: Initialize AS 0 first Date: Tue, 23 Dec 2025 19:26:46 -0300 Message-Id: <20251223222649.187935-2-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251223222649.187935-1-gustavo.romero@linaro.org> References: <20251223222649.187935-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 (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::122c; envelope-from=gustavo.romero@linaro.org; helo=mail-dl1-x122c.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: 1766528898333158500 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 Sat Feb 7 06:03:31 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=1766528889; cv=none; d=zohomail.com; s=zohoarc; b=asuLPyTNb9LQckGUa1aNXopRr+DjE6as0pnv8BXd+FehmHR7xUAXu4iA4ovxwG7RFOWFYmHWpj6IfMRwpYfVwJSjImA3XqGDbl2rqmwoOqAgs2O74J8CMkmqYMNPvDDWSe48y03/iKytC4eD72JfA7x4dwTZwxqb1GBreSwCQ80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766528889; 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=xOVaD0jg0/GjW5dyxIzZiWG1PvtxfZzn9U04k4yMi6U=; b=JnW7U6lG5Vp0HoiolKArbDYHMFNIk4nLZjK/AcjDIuSbZx5sPjFh4U3RAmh4it+TItq78nmHHxPNFfuhfDGmZy9uH8sDQWAlp2PT272WriCPO2GdWnL8lZGGiiwaU2S+T8rJaYtvbsT+lyBQ1totS698uhhdYqcJW/PwXhsiRXE= 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 1766528889216539.1794129943796; Tue, 23 Dec 2025 14:28:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYAqZ-0005Yj-2G; Tue, 23 Dec 2025 17:27:15 -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 1vYAqX-0005Y2-OD for qemu-devel@nongnu.org; Tue, 23 Dec 2025 17:27:13 -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 1vYAqW-0007O3-9D for qemu-devel@nongnu.org; Tue, 23 Dec 2025 17:27:13 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2a09a3bd9c5so47920215ad.3 for ; Tue, 23 Dec 2025 14:27:11 -0800 (PST) Received: from gromero0.. ([179.93.129.179]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1217243bbe3sm62803123c88.0.2025.12.23.14.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 14:27:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766528830; x=1767133630; 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=xOVaD0jg0/GjW5dyxIzZiWG1PvtxfZzn9U04k4yMi6U=; b=elyKkhQBOtSZKRqAjl+fy1gqu5qGueVGgOIVE0uJElMztvozW3JBrulSJ31mPsf3rd /c40noEzvGJ2o43E0fCcFYwEqU8YxNEPrFNpoPM8uo0xx9TKOSSHU+rWSpjL4ikZixjj YToovd8KQ64DvIz5fx0siVrgGuyVimfoyvAPBnXZ7toFKRjy/6PvCxOWHERI4ohhCqor I/WCPqt7c3nrBMFmxHsu9md3Yl0V8jRLhFhvvukCW/FFPBE6+C2rnCsqMQAJFhqTAWg6 xeWXPCGlPlpQcUH2B/KJ45gfi1YIXrReOW0Vjja+tOP3cdW9CQXPFDSA9mEFu+byAiv0 HjOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766528830; x=1767133630; 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=xOVaD0jg0/GjW5dyxIzZiWG1PvtxfZzn9U04k4yMi6U=; b=nveLa0PjP24PjEFtCPTB0xYEyUU3By6ab9y+yxEeUNW942xtLDOE6yRN+sb20IY/2E qQiR4ue06pavBmaCxQWZU2NMMIaCYge9LCTliPlWAJN933fLquwWwXIuXz4fXALsU/7B JfzN84m8ASZmGpXzpmAHmkBiWt1iLMCJSIiSDzuz9XaZGra4yU6hDSBAYgnPKB1+GVCq 85I/kcrtwrTk55X9pihXPwYf+tUMeKW6oW+TTo8rTAQTYmzqTjc4KGlSb27l6XTiDgJJ RVFU+Lf/QqIZG95SuPFURPawguBGt/UivukkiE2CdaK433nnrwW2c1oZdHEkuApksNzw MiZw== X-Gm-Message-State: AOJu0YztOc2Ynl/OWn79M9+IId4H3jcHSxlAkVFu7aouD99aKKu1M4IO a950oZELPs87QUdB690DOKF/Wfr51bty0jzeH+kVFzqE4rt0wUDwmd2P4Vl/NbCkQNotWRVcwbf 4mh5x X-Gm-Gg: AY/fxX5eIgofrfqMQD3tyTMssGVQRXo9UjQz+mLbRs5yEBS0hsaGt8WgO9za/CcLB5e K5UjVzXYShihP9N88JqKTnEf3XfXwAg5ce9j1OeYeKJuQyP35knF2PLvPF3cR9fA1uFClbmoGvC l5pp4wZU0047gT417L21jUKO/uY3VrJc8IptcduXivTaNTgjDgh79LN0Atwxu5v5LFwJEvS0kwS 5jqywCn23mWtvpqblJ8jXqC2BfqGsek9c5mdac5QD6OLne81pBbULxUBOSIQrOEYb83aZgty2iz b/CNuaJZPEaxGYSWefKqO2ufUdRXvNOJ+ncIVibKY20NSNpppYH+lXtd+IbPmtV91Ek8b0HDU/6 COCR3i5xM0MAGhvDCuU9aVjfwIJKWh0ZKViN77Sywlj/JWYnr8vhtHMPrOEZh5uAdENsxHsF9Px FWpIuLPTpAbIUfaYX7 X-Google-Smtp-Source: AGHT+IExL8BskEM26aQ8zwIbFwIP4O2H971Oyx6pAs3XvZjPwjLfwQsIp4M5kujgSNzVIVbsOMmvKA== X-Received: by 2002:a05:7022:eac5:b0:11c:b3ae:c9f1 with SMTP id a92af1059eb24-121721ab82fmr17761991c88.1.1766528830024; Tue, 23 Dec 2025 14:27:10 -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 v3 2/4] target/i386: Add a _MAX sentinel to X86ASIdx enum Date: Tue, 23 Dec 2025 19:26:47 -0300 Message-Id: <20251223222649.187935-3-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251223222649.187935-1-gustavo.romero@linaro.org> References: <20251223222649.187935-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 (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: 1766528890284158500 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index cee1f692a1..ba0c4fa548 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2600,6 +2600,8 @@ void cpu_sync_avx_hflag(CPUX86State *env); typedef enum X86ASIdx { X86ASIdx_MEM =3D 0, X86ASIdx_SMM =3D 1, + X86ASIdx_MAX =3D X86ASIdx_SMM +#define X86ASIdx_COUNT (X86ASIdx_MAX + 1) } X86ASIdx; =20 #ifndef CONFIG_USER_ONLY --=20 2.34.1 From nobody Sat Feb 7 06:03:31 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=1766528877; cv=none; d=zohomail.com; s=zohoarc; b=Bh2MqVaimN9dFoM2E/G55XUxrwXJVwacsvl5I+PYvJUeSPbR747wBnCeSiix6K4Y/2N7ZBQSjY8CD/Ykiqk5Bm+r7NUi4wS8prwZ0qF+5AyntrMMzRw7zLQpA9RT8Rsnv2Sb+sGwGje/711WDanNWYUWvGvkzH6WE7OtnQvjtR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766528877; 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=IwRSR0ZKIOyzQJTFyNymlZJZGKDFvR8rJCkk+W5rX+c=; b=T8niQNlfYwU2vuOt3Uxnikg/ID9AHHnh1rCAIMX92Uiyrk5MqIGxGqCugkcbQ8dnbXc0HUTxbVSjCCReHKPdfcM7G+noyn7gy87TxAEifldO2X0wNZVr9fxCNTPuRA9K4lUJQxZ5alU8q6RZUCFzqYtMVAZ8lUtazCUZQgZjT84= 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 176652887784534.973655083787435; Tue, 23 Dec 2025 14:27:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYAqb-0005a2-V2; Tue, 23 Dec 2025 17:27:18 -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 1vYAqZ-0005ZJ-9R for qemu-devel@nongnu.org; Tue, 23 Dec 2025 17:27:15 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vYAqX-0007OL-UT for qemu-devel@nongnu.org; Tue, 23 Dec 2025 17:27:15 -0500 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-29f0f875bc5so78630355ad.3 for ; Tue, 23 Dec 2025 14:27:13 -0800 (PST) Received: from gromero0.. ([179.93.129.179]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1217243bbe3sm62803123c88.0.2025.12.23.14.27.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 14:27:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766528832; x=1767133632; 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=IwRSR0ZKIOyzQJTFyNymlZJZGKDFvR8rJCkk+W5rX+c=; b=MxnvKsyQauqR+iWnkGMmoNtYi032jUKgkhAvNvIaq0L1ymf5CiUqCgxVTSLxalQl8T 0P41vl6NYH7KMbCKqKYn1IdWiQwRxC0ZlPBh7zYOE+lcm/zR1rqw1n/P+eRi3Kk5DjU4 dZU0TX9ztKutVU25XnKf75bzd6wzE08l2oin1OAip2Wk7KOCAIZ1jvmyuMnlz7ETuEEh kZrPCZ02Q7Rd2gqowIddeF9UGa7F19skr17l6wSI18hVCbMZ8O2MTOyFl4LSqOXuuYPE ErCqv0jwDt/YNH8XjgyGJ+hhLtEGDWMbdOeyZh2qbWilJBpx111kPnsw1oVdk2EwQ0Ow WMDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766528832; x=1767133632; 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=IwRSR0ZKIOyzQJTFyNymlZJZGKDFvR8rJCkk+W5rX+c=; b=NCQfL7jTh0QoHD2X3HCA8LNmFInWFn2qLgZN+oo0cUZ0ZVAWVs5Xra9ib/W9lH6GPR gdZjCRoxrJR53+DNJnNxGDyJcanhf4wDaih7x3ji2NC68DXiYaIbBEH+6VusDbsHm2ch YSRicesaRsFABQHnvVGSHk9STw7pgsLX5iJ7ajBdDqEeHXxX/2Mx+ZwI5vmhiAHg+Pwc t90sE+KRoAfk6gi7W5IZQmjjynQ6A1bRkMASlASLC439arw9zf2O8OVB/qdqb6/Trxx1 Uxs2ZOfF+vkjOez4RYAi7SLUInFluoQYkqrogb5HkAG4yiD+lQ2xL/BH9az508kfOT95 qSNg== X-Gm-Message-State: AOJu0Yw9ip3YcqGczUzZLGXB/b7wsJdw3H8r2oOZX0OEaMW5aAxW9pYD LmN6E6gaNnynPrqbtb+03d8uA9mFxTJtliIkXFSdYl2W+lpHbXaAMswbZmzYNp66E7w5t+zXnYj hO2tn X-Gm-Gg: AY/fxX5cicQOAyFixWmP5YLf8PwG2fQbLLyE+5sCKADHFgHT2I9fHSbHpiDNBAp+9V4 i7s5jzrIQNhDzk2WJQKBUL7Dl7klMo3Er+SFH73UiB2cvG2ukUqbSyM83UvRzyC3rkyqhEzALOI dcN/AcUlSoIM/aiAGliiG4rc31vDP3c6C0+6upxFlnvmxaEsazBeVwwvqYER09FI+Q3zZSOGwKB zWd1PwXLivA3LkBimUqjTn/qhZxWZeo3bH3ZcyRb6QW37CLO4v41jpeY3P6sf554qQMhbJj6HAV hqE3qSSHqCM/vEwL31tPQZBVTSiwluBYxI+NBSuH+j3Sy1ykxdAlp+3/bEEWSVXWOm5s4nv0Q3x phCDMXnv9GboNxTSUNuWgGQMdb3sjDGkMxb23mdAnQwOYWAqOeEapYFyK9yQxv4/8WvfRv7br7y Xqn4BuxD4rbWtjHzB5OVWFg+UQOwQ= X-Google-Smtp-Source: AGHT+IEO3lREqjy9+6Sn4w54oXKPFg3D7NA3MwlquGvj/YDBBtmHGmNjCGxSBI+6U73zaB4/h7cXtw== X-Received: by 2002:a05:7022:799:b0:119:e56b:957e with SMTP id a92af1059eb24-121722ac244mr22058709c88.3.1766528832235; Tue, 23 Dec 2025 14:27:12 -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 v3 3/4] target/arm: Add a _MAX sentinel to ARMASIdx enum Date: Tue, 23 Dec 2025 19:26:48 -0300 Message-Id: <20251223222649.187935-4-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251223222649.187935-1-gustavo.romero@linaro.org> References: <20251223222649.187935-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 (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::62b; envelope-from=gustavo.romero@linaro.org; helo=mail-pl1-x62b.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: 1766528881083158500 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 39f2b2e54d..718d140712 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2336,6 +2336,8 @@ typedef enum ARMASIdx { ARMASIdx_S =3D 1, ARMASIdx_TagNS =3D 2, ARMASIdx_TagS =3D 3, + ARMASIdx_MAX =3D ARMASIdx_TagS +#define ARMASIdx_COUNT (ARMASIdx_MAX + 1) } ARMASIdx; =20 static inline ARMMMUIdx arm_space_to_phys(ARMSecuritySpace space) --=20 2.34.1 From nobody Sat Feb 7 06:03:31 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=1766528905; cv=none; d=zohomail.com; s=zohoarc; b=YIRSyFbHrK+0QgPKSQ+yS6VcoyEG+zTA314rl1oXDAxg3dobdnbS9A8sAaugWJAZOqJtUuX0EybbK2YO+G8ATMfpJAraHooNYejSBnOhtkdShSSwSfDh41hGrDBR1jR25aLdFY4K1q/9EGsUE8/riP/z7es5/Mg5+/ZWotbLf/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766528905; 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=LJYfQlBYDXhbhN9E1l5HO05rbwBk+2rXeM5gYl5pVHM=; b=IJhX7cA3hQjz/kSgwHhre03FOkn/OFYX8yXt4IFThPtdaaCzUUIazobDTZpM5ebH0Mc2aIxqUkqHr3OLEV5Cd34j7/uswGDpKujAn5dXVHYF2PF13iP0YdNrJd8gaQUz43Ck8pCRrLvEXsGKWEW5Wg/MlTUKIJP+ava9mfsFUwU= 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 1766528905375979.9232766301932; Tue, 23 Dec 2025 14:28:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vYAqd-0005ay-Mi; Tue, 23 Dec 2025 17:27:19 -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 1vYAqc-0005a7-Ik for qemu-devel@nongnu.org; Tue, 23 Dec 2025 17:27:18 -0500 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vYAqa-0007Ov-76 for qemu-devel@nongnu.org; Tue, 23 Dec 2025 17:27:18 -0500 Received: by mail-pl1-x644.google.com with SMTP id d9443c01a7336-2a0ac29fca1so47903555ad.2 for ; Tue, 23 Dec 2025 14:27:15 -0800 (PST) Received: from gromero0.. ([179.93.129.179]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1217243bbe3sm62803123c88.0.2025.12.23.14.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Dec 2025 14:27:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1766528835; x=1767133635; 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=LJYfQlBYDXhbhN9E1l5HO05rbwBk+2rXeM5gYl5pVHM=; b=VVjBoMfu2M6sWrLfaxgyaH2lOzOGxVcj3/JI06dhEvOefvDmsep4eqJ82RUXldmYbc 4nAn+PztNGBqJ2uj7zIxzbCh442hRLUrOSmGjhRuzvCxAcs7nnXv9cUsdZpfHQMGhh87 GQZzbjUhIMMSApJMKalAJE3NhzLf7VpEGLBmhEFn3z1k/OqhIt3Y6qMSsLKAobN5N5PZ m9ymURNGvHjZ/LaQqH/5c+sj2IcyddDaC3EsX0+UDJO3+vxtbd9gCr1ErNTnQgutPtYv CUfTfqI60Fm4BJWNOf/YV3VJEcd2DIHRpot2oenpXevL6Jitv2RZY0Cld23vMrORJ/CY hqag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766528835; x=1767133635; 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=LJYfQlBYDXhbhN9E1l5HO05rbwBk+2rXeM5gYl5pVHM=; b=KGGpgx95f3Li93C5FwkNDRau+CwANeF0kO/Kv5twffPL4/rYj3yvNSVmi5WW4PYVcq VPpzSZmsg5IW6MQD6oE44JS+HyUV0rkKjaNo8MeKOpvnGJX546LNwj5CAgleKQQgS1/m hzbY+J/uQOGIFAKeZJqn53WNWs8nRCS7T3BIalwIJdS3OpVkmdVsHdaLEsxqdbYYvhXg y5zciE61/tV7yAPhqO5vL/v6wrahlnJnuOU0cTPGA08kuyk2hQ4w/vIcg6QjhUErpqRP AusR/EKDT+QiHAKikjXP1AjoTkV37knarqJx4yClewd98HSnzQ+2yGC5UvT1zQc55INK YoUA== X-Gm-Message-State: AOJu0YwDpcxapFKr6IJ10maQiOBrDwOIcqae4DfvX7rPLKW9WD4+jDe3 sWY0gaM79Zmt3kEZmebypCdhpTIrP/PvBhgUhElTxnhEe8g8bqGtUOChb1prjPDLLPBKmHVE77y KYnV5glE= X-Gm-Gg: AY/fxX4oHgu6p7NHzRd3tGeqobGmaMbK0m+xrRQD0kPhE6Bl6eILC2/Mw17i4qj+wZs 0Wy2x/MUZsSZy277bXF/KWi59isVRvHKiJBp1o/Z+Hx3XkwHCqkaz+RxAklwGkkn/9Df1grjovA gR5QVORm1EXAFeIGOyko8MWad2V+oMazvgXGvmHLSK3FEBdAfWTzlXyXvZZqQEvw8jiwseVoV3D DsmxWsiGXz/VzVSN5fueNXKY/zxzMzK2qwxneTT8n5ttXOpKg3IpUyo0ArER0bEwKlmlG22cmcT LB6yPorwVzmkhnSkmUmTmA+x27xA+oreGeePLe9cxTEwNel50fcl2Ur6fVw2CM0LdPA5Ap+CKXU 5I/GxT+I0eFByiy1YBglm/JrVuRA6IwMsr1qcu68rMTkaXACxHZjxA/ed2uVoSlJ3BRq/a6nWyo mIhF+DiTGFlNwo1EHt X-Google-Smtp-Source: AGHT+IGWeHoGP9jfgKazqGkN9JN4cL1iZYDdWtOjtdaiGDCaOmCjShsfpwBmejsbAkyB36K6/60lmQ== X-Received: by 2002:a05:7022:503:b0:11d:f440:b760 with SMTP id a92af1059eb24-121722dd441mr15022063c88.23.1766528834451; Tue, 23 Dec 2025 14:27:14 -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 v3 4/4] cpus: Define total number of address spaces in CPUClass Date: Tue, 23 Dec 2025 19:26:49 -0300 Message-Id: <20251223222649.187935-5-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251223222649.187935-1-gustavo.romero@linaro.org> References: <20251223222649.187935-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 (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::644; envelope-from=gustavo.romero@linaro.org; helo=mail-pl1-x644.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: 1766528908358158500 From: Philippe Mathieu-Daud=C3=A9 Define upfront in CPUClass the total number of address spaces a CPU can use rather than allocating it on-demand in cpu_address_space_init() by allocating it in cpu_exec_initfn() and always releasing it in cpu_common_finalize(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Gustavo Romero --- hw/core/cpu-common.c | 2 +- hw/core/cpu-system.c | 6 ------ include/hw/core/cpu.h | 3 +++ system/cpus.c | 7 ++++--- system/physmem.c | 22 ++++++++++++++++------ target/arm/cpu.c | 1 + target/i386/cpu.c | 1 + target/i386/kvm/kvm-cpu.c | 1 - 8 files changed, 26 insertions(+), 17 deletions(-) diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index 8c306c89e4..2921d07506 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -309,7 +309,6 @@ static void cpu_common_initfn(Object *obj) cpu->cpu_index =3D UNASSIGNED_CPU_INDEX; cpu->cluster_index =3D UNASSIGNED_CLUSTER_INDEX; cpu->as =3D NULL; - cpu->num_ases =3D 0; /* user-mode doesn't have configurable SMP topology */ /* the default value is changed by qemu_init_vcpu() for system-mode */ cpu->nr_threads =3D 1; @@ -359,6 +358,7 @@ static void cpu_common_finalize(Object *obj) qemu_cond_destroy(cpu->halt_cond); g_free(cpu->halt_cond); g_free(cpu->thread); + g_free(cpu->cpu_ases); } =20 static int64_t cpu_common_get_arch_id(CPUState *cpu) diff --git a/hw/core/cpu-system.c b/hw/core/cpu-system.c index f601a083d1..b6a290b648 100644 --- a/hw/core/cpu-system.c +++ b/hw/core/cpu-system.c @@ -188,12 +188,6 @@ void cpu_exec_class_post_init(CPUClass *cc) g_assert(cc->sysemu_ops->has_work); } =20 -void cpu_exec_initfn(CPUState *cpu) -{ - cpu->memory =3D get_system_memory(); - object_ref(OBJECT(cpu->memory)); -} - static int cpu_common_post_load(void *opaque, int version_id) { if (tcg_enabled()) { diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 9615051774..f88a5729e7 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -145,6 +145,7 @@ struct SysemuCPUOps; * address before attempting to match it against watchpoints. * @deprecation_note: If this CPUClass is deprecated, this field provides * related information. + * @num_ases: Total number of address spaces usable by the architecture. * * Represents a CPU family or model. */ @@ -195,6 +196,8 @@ struct CPUClass { int reset_dump_flags; int gdb_num_core_regs; bool gdb_stop_before_watchpoint; + /* Total number of address spaces. */ + unsigned num_ases; }; =20 /* diff --git a/system/cpus.c b/system/cpus.c index ef2d2f241f..638e558153 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -715,10 +715,11 @@ void qemu_init_vcpu(CPUState *cpu) cpu->random_seed =3D qemu_guest_random_seed_thread_part1(); =20 if (!cpu->as) { - /* If the target cpu hasn't set up any address spaces itself, - * give it the default one. + /* + * If the target has not set up the address space 0 (main memory), + * set it. Address space 0 is special and has an alias kept in + * cpu->as. If address space 0 is set up cpu->as is always !=3D NU= LL. */ - cpu->num_ases =3D 1; cpu_address_space_init(cpu, 0, "cpu-memory", cpu->memory); } =20 diff --git a/system/physmem.c b/system/physmem.c index c9869e4049..c06bd5ce06 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -775,6 +775,22 @@ hwaddr memory_region_section_get_iotlb(CPUState *cpu, =20 #endif /* CONFIG_TCG */ =20 +void cpu_exec_initfn(CPUState *cpu) +{ + + /* + * If the total number of address spaces for CPUs is not defined expli= citly + * by the arch the default is 1 address space. + */ + unsigned num_ases =3D cpu->cc->num_ases ? cpu->cc->num_ases : 1; + + cpu->cpu_ases =3D g_new0(CPUAddressSpace, num_ases); + cpu->num_ases =3D num_ases; + + cpu->memory =3D get_system_memory(); + object_ref(OBJECT(cpu->memory)); +} + void cpu_address_space_init(CPUState *cpu, int asidx, const char *prefix, MemoryRegion *mr) { @@ -795,10 +811,6 @@ void cpu_address_space_init(CPUState *cpu, int asidx, cpu->as =3D as; } =20 - if (!cpu->cpu_ases) { - cpu->cpu_ases =3D g_new0(CPUAddressSpace, cpu->num_ases); - } - newas =3D &cpu->cpu_ases[asidx]; newas->cpu =3D cpu; newas->as =3D as; @@ -831,8 +843,6 @@ void cpu_destroy_address_spaces(CPUState *cpu) } g_clear_pointer(&cpuas->as, address_space_destroy_free); } - - g_clear_pointer(&cpu->cpu_ases, g_free); } =20 AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 1640b20b4d..cd73991f9f 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2391,6 +2391,7 @@ static void arm_cpu_class_init(ObjectClass *oc, const= void *data) cc->gdb_read_register =3D arm_cpu_gdb_read_register; cc->gdb_write_register =3D arm_cpu_gdb_write_register; #ifndef CONFIG_USER_ONLY + cc->num_ases =3D ARMASIdx_COUNT; cc->sysemu_ops =3D &arm_sysemu_ops; #endif cc->gdb_arch_name =3D arm_gdb_arch_name; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6417775786..5f6fc176fd 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -10106,6 +10106,7 @@ static void x86_cpu_common_class_init(ObjectClass *= oc, const void *data) cc->get_arch_id =3D x86_cpu_get_arch_id; =20 #ifndef CONFIG_USER_ONLY + cc->num_ases =3D X86ASIdx_COUNT; cc->sysemu_ops =3D &i386_sysemu_ops; #endif /* !CONFIG_USER_ONLY */ #ifdef CONFIG_TCG diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c index 9c25b55839..855edd164d 100644 --- a/target/i386/kvm/kvm-cpu.c +++ b/target/i386/kvm/kvm-cpu.c @@ -98,7 +98,6 @@ static bool kvm_cpu_realizefn(CPUState *cs, Error **errp) * 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_init(cs, X86ASIdx_MEM, "cpu-memory", cs->memory); =20 return true; --=20 2.34.1