From nobody Tue Feb 10 03:38:57 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=1760998503; cv=none; d=zohomail.com; s=zohoarc; b=GSQz7P8kR3qhdQu+5Ky9sRLXisq8ERC37o0Zs78pMn2ABtP+deIAAfGcoJGCXgDodZfMG1motlcTjsdIlKA0CYOSi3M1x/HhHj88hw1SXGzxG9stba/rlqFg/FyimvguEyQ/DNlrWtnzyJ0pVT+tUXJTaoxSZy6l/9eJoThIkkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760998503; 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=VyUZ3dUUvHSOpFdYXBtExya1pV/LCHz+vT6iC7/BDnw=; b=M8Q0MHHVmyIg07mC4Uhi8vokxTe+r5TOan3UkHDFJxnnRC4ZAws3vyDg5ihzDQZxaMiV2QWT4MTdJHr6fwOWe3PGxkmbha9UYoJLHxKXoJVx2QS6unudOiUg0tFhPfFgsNrLsozWIetXUejmkt8xUSP6mfRGvKmN3IFr2D/W15k= 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 1760998503895448.15176439816423; Mon, 20 Oct 2025 15:15:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAy8q-0005Mh-Sj; Mon, 20 Oct 2025 18:14:12 -0400 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 1vAy8k-0005Jq-IL for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:06 -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 1vAy8g-0006Vw-6V for qemu-devel@nongnu.org; Mon, 20 Oct 2025 18:14:06 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-4282fba734bso1170767f8f.0 for ; Mon, 20 Oct 2025 15:14: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-427f00b9f71sm17258998f8f.37.2025.10.20.15.13.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998440; x=1761603240; 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=VyUZ3dUUvHSOpFdYXBtExya1pV/LCHz+vT6iC7/BDnw=; b=T2agEUZhosHHE6Fhe4jhP88vb6p2/sseID80w4LCA9VrUtqwK3P1gYNX3Eo7laLHWd hsb323vkYHqhnXzUyH5AbJkudAIGAnVleX85rPUjoVKc+9NHHW3K+TeqRFfhZ54JGMSf DfvU+OKBRGxU/8IbgT4Ho7eL4mzm5IsAaAEUkIWORZJSuYpkTfmgWgSyNlir6axiCqUj XTFN0I2NtpYm9N/wLQD7rSlP+WhtM8SeO2frvpoNigtSkB4vvydcHmjzBQAeiDQ1N+ek 6aeR7ctBsKDBFd+aNMb0VBTFR7YDNbyqJL6zJnB9TQ4qg/CPWa6Q/KUMyOtbGAA/r1/b jMXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998440; x=1761603240; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VyUZ3dUUvHSOpFdYXBtExya1pV/LCHz+vT6iC7/BDnw=; b=NpSpN8nLsV7VDCF701VE608vE1kQxRt6bRGWZZv6qcDk0MrDj2Yr3O4382jwFdIBHX zhL9kXgJxtUey+dwkN8N+Qf9PIUJwTAGJBPtYWqQE9x5hFH9Z5Woh9O0vkcCmpN9ZDr5 ZyBAMmri2wBc3gOCNvLLWua6haJrDKYldY7Io32Mj0lrYL+PSiyMTpd1q1FigoXotpDo xLJ0CdGp5TpIV7c9NOFjHfwWbwlCKWOXcIEt7KL52N4a6ubsYXJ8huA95/5gWrmut48P Uog/91kwZyzBdiB//0dHnLZkKse/cnQZZVrn8TP8SkJV/ahE5jDT65Y8/Y3JRKSQD0Oy NXTw== X-Gm-Message-State: AOJu0YwfVAgkRcl/bPIeSpfcWdBvcFcqCGAN6bwLuB5ckawBfmugBJ4h 5wVTyuJR1b/RzGTJeJvuUkpeJQOSIcJr4jRoAWF1yXsrFserB925jxbE7TZuD5VqqgPOe9a00ez Cp239+mA= X-Gm-Gg: ASbGncsiR2Dg4SU0BAsDWqH9Mz5/loSG3jL2aUaXO9p/jVnNYq8OoS4yPyid891CQFG MbjJpzO4U0TzmLDwUcXnJqPRp8v5qcmfuJ3EbzCpmIa1R+KbI2XYnbtbs/wlBTG95q0WBmpbPx7 e/5psc5maGstP7Q1DE5au4jmxY0aW9VCxn37EiSSvrREPgWXga4HNpOjv/GNhdhWnL6ILWizynO bbaNYRO4dpaU7/HSn0fzoLkTdqmgSNz+7Fhz863M5jfAhqUBAPuPTA7zVbjc9dGLQ6md9hdGE3x wWlZBmyWvaOIsWxadAny02FivY3lZoDY5/IztIu2e0yvdkas/OLXiUm8MgK7AnJtkFPZOjXP2aG nPYYaldlpIx9RWOAfWKf3EdKd7lgfd2Xb7UGnxIgCbO5tU+23APxPGfbot041BwdcweCP3Oe+Ao vkl5vyBY98lFKeghmtPrzY6+9TjhvxJ9IXn+Oku0jOCFERP7rwHL+XrU/7cwh6 X-Google-Smtp-Source: AGHT+IEJtMOVSNaJwysnOpGCfnCMJeJxRLV26eQH04CrGWlYnYFkfyfRhAVaXw5FIMCMxfv3dqmoiw== X-Received: by 2002:a05:6000:2406:b0:427:a27:3a6c with SMTP id ffacd0b85a97d-4270a273c43mr8085781f8f.63.1760998440006; Mon, 20 Oct 2025 15:14:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , qemu-arm@nongnu.org, Anton Johansson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH 15/30] hw/arm/virt: Register valid CPU types dynamically Date: Tue, 21 Oct 2025 00:13:20 +0200 Message-ID: <20251020221336.66479-5-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020220941.65269-1-philmd@linaro.org> References: <20251020220941.65269-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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: 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: 1760998506204158500 Replace the static array returned as MachineClass::valid_cpu_types[] by a runtime one generated by MachineClass::get_valid_cpu_types() once the machine is created (its options being processed). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- FIXME: Richard comment: >>> Why do these need to be strdup'ed? >> g_slist_prepend() expects non-const. >In a few patches this become a run-time check: > if (target_aarch64()) { > ... > } FIXME: Pierrick comment: > It seems it would be more easy if get_valid_cpu_types simply return a con= st* char* const (same as existing valid_cpu_types), and caller does not hav= e the responsibility to free it. > This way, the list can be built either with a static array initializer, o= r with a dynamic GPtrArray, that we keep under a local static variable, so = it has to be built only once. We can debate the leak introduced but I don't= think it's really a problem. --- hw/arm/virt.c | 59 ++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 20e3f1094cb..e19da6fd901 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3256,36 +3256,41 @@ static int virt_hvf_get_physical_address_range(Mach= ineState *ms) return requested_ipa_size; } =20 +static GPtrArray *virt_get_valid_cpu_types(const MachineState *ms) +{ + GPtrArray *vct =3D g_ptr_array_new_with_free_func(g_free); + +#ifdef CONFIG_TCG + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a7"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a15"))); +#ifdef TARGET_AARCH64 + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a35"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a55"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a72"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a76"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a710"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("a64fx"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n1"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-v1"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("neoverse-n2"))); +#endif /* TARGET_AARCH64 */ +#endif /* CONFIG_TCG */ +#ifdef TARGET_AARCH64 + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a53"))); + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("cortex-a57"))); +#if defined(CONFIG_KVM) || defined(CONFIG_HVF) + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("host"))); +#endif /* CONFIG_KVM || CONFIG_HVF */ +#endif /* TARGET_AARCH64 */ + g_ptr_array_add(vct, g_strdup(ARM_CPU_TYPE_NAME("max"))); + + return vct; +} + static void virt_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); - static const char * const valid_cpu_types[] =3D { -#ifdef CONFIG_TCG - ARM_CPU_TYPE_NAME("cortex-a7"), - ARM_CPU_TYPE_NAME("cortex-a15"), -#ifdef TARGET_AARCH64 - ARM_CPU_TYPE_NAME("cortex-a35"), - ARM_CPU_TYPE_NAME("cortex-a55"), - ARM_CPU_TYPE_NAME("cortex-a72"), - ARM_CPU_TYPE_NAME("cortex-a76"), - ARM_CPU_TYPE_NAME("cortex-a710"), - ARM_CPU_TYPE_NAME("a64fx"), - ARM_CPU_TYPE_NAME("neoverse-n1"), - ARM_CPU_TYPE_NAME("neoverse-v1"), - ARM_CPU_TYPE_NAME("neoverse-n2"), -#endif /* TARGET_AARCH64 */ -#endif /* CONFIG_TCG */ -#ifdef TARGET_AARCH64 - ARM_CPU_TYPE_NAME("cortex-a53"), - ARM_CPU_TYPE_NAME("cortex-a57"), -#if defined(CONFIG_KVM) || defined(CONFIG_HVF) - ARM_CPU_TYPE_NAME("host"), -#endif /* CONFIG_KVM || CONFIG_HVF */ -#endif /* TARGET_AARCH64 */ - ARM_CPU_TYPE_NAME("max"), - NULL - }; =20 mc->init =3D machvirt_init; /* Start with max_cpus set to 512, which is the maximum supported by K= VM. @@ -3311,7 +3316,7 @@ static void virt_machine_class_init(ObjectClass *oc, = const void *data) #else mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("max"); #endif - mc->valid_cpu_types =3D valid_cpu_types; + mc->get_valid_cpu_types =3D virt_get_valid_cpu_types; mc->get_default_cpu_node_id =3D virt_get_default_cpu_node_id; mc->kvm_type =3D virt_kvm_type; mc->hvf_get_physical_address_range =3D virt_hvf_get_physical_address_r= ange; --=20 2.51.0