From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 901F2CCF9EE for ; Wed, 29 Oct 2025 21:48:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE17-0001sD-Cn; Wed, 29 Oct 2025 17:47:41 -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 1vEE11-0001q8-Tr for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:47:36 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEE0s-0006f9-HV for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:47:35 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3f99ac9acc4so355429f8f.3 for ; Wed, 29 Oct 2025 14:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774436; x=1762379236; 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=0F9dkqnaiLK5i79x81WOHwn6K6egaqNgTaEtafHPCr0=; b=CUcbxd0VmdCEGMXEGe9+kFkiNY5/1kDB98HMmjRm1z4wCyz+/SXXLgInFotyppCapB R3amJOX34OYH2y/DfMtSGIxhSenNSMpuoaH1QT9Ht/gzzRLwbwEe3oy5HFNIZvETdgAF mUSYFSibvnuZ54+P5SqbiRKpejoVYuXbe9hzYEH2Ei54vtrp0uOR2g1GGGGIpfHnhtM1 7vCtT853hetfj19/4lewGS6w8WHkEG4fZBdf8EHO5RnVnekolrDadxQWAITnNdcpOdNb ZHymE/KF6z6DhW14iAXjwbUr2vy/9SWRcjJxXy3SYvu1dCzS3XeXDcb46tg2RjK8mGR0 V+mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774436; x=1762379236; 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=0F9dkqnaiLK5i79x81WOHwn6K6egaqNgTaEtafHPCr0=; b=LJm/eMeRQJK0B8UHXfj4WH7XM9YFmZHMQQZluf54hkzLdUOoZ4DCzg+9cGmg/Ho1ks /EFf1G7osiTK9VPY8H9SGn6jSiCGOeX5/SpEb7u0WMDL+6jNs/Hyeq/XPcNPDhmr8XQ/ LX+/wwCeV5ts+GjmxCueqYMvwy5DruW4vqRzJLhfs3D1/nOHGIFtaOq5rlKRni4B8d+d mLBVuTgPkjJsbdc5qcDYJs3XZ+h5J3h0/F+/az619dcm4qFZ6TpqOXGXAErwi8mR6sRy LK4SUqPuGSbFvmV7irX0WuG82j1DqX6pE3dZd+8xc0Xm2RMatPP8gE6FULujjUGjtZYr rlBQ== X-Gm-Message-State: AOJu0YzeCAoJ+YH3BQE47lXtv/HigxJ0oJCnFbNRFTaPrOvtPSDXUzev Rh5Y1a0IfMQlfDHoJ0cukjKBG/SCF49+PrdHYW5YdmsQo+G0bwY0GeT1I03pIrnudAaMtfbompz lLVmNov0= X-Gm-Gg: ASbGnct0UVLpddoKOrOJdB0vXbbWiwOXTaMO6rIcTd1jiwPLVwVjtnAABo4a+/CDlCe PaTzFQVowXStvK3fscJD1bm8/RAdSluPPkGSXxrkxDByFBSXJnkOJSDR2PrWWsl2F3eV1FWZud2 JTxT+bfmgajlA3hgqvmtFJuInncQHZtVo2R1z8VrbH3HL0AtROvluOhsOgso7bqT73nvK162qAM PtRHkPXR6+e6Fqaf73+dOqCj/7vKeE/4SRmd9RZN8NEszYv5niXvNM5ZYoWx4lx/+1oWSMou214 X/J+ubWmIdLmikfMjG2fn1N/WrdJov4WF1tiMNegvRevUyH2Zen3rUHzFj7du6wbwIXr9hboiqD UX0PG2XhDhOuE84tarakxW5NJLpMJcf7CkhmVUEeFf74JSz9Ac+WhsKt1AMmFw2FZjX8Zz30iIA nX98f3dz0kc4cwO/JPCNKPkLcRqWE7naP5xRDQpuRr9agkekeE3homlR92Dddx X-Google-Smtp-Source: AGHT+IGqU9counotP5u54GGujGRLojSBOi9LQfM5EnPd82R3Ph39GT9k8UzuoF1WJgfRtRZTGHql/w== X-Received: by 2002:a05:6000:2f85:b0:3ff:17ac:a34b with SMTP id ffacd0b85a97d-429aefc03f0mr3717688f8f.42.1761774435935; Wed, 29 Oct 2025 14:47:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477289b3956sm4427905e9.10.2025.10.29.14.47.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:47:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 07/23] hw/arm/virt: Register valid CPU types dynamically Date: Wed, 29 Oct 2025 22:39:44 +0100 Message-ID: <20251029214001.99824-8-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029214001.99824-1-philmd@linaro.org> References: <20251029214001.99824-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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é Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021211135.61179-1-philmd@linaro.org> --- 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(MachineState *ms) return requested_ipa_size; } +static GPtrArray *virt_get_valid_cpu_types(const MachineState *ms) +{ + GPtrArray *vct = 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 = MACHINE_CLASS(oc); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); - static const char * const valid_cpu_types[] = { -#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 - }; mc->init = machvirt_init; /* Start with max_cpus set to 512, which is the maximum supported by KVM. @@ -3311,7 +3316,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) #else mc->default_cpu_type = ARM_CPU_TYPE_NAME("max"); #endif - mc->valid_cpu_types = valid_cpu_types; + mc->get_valid_cpu_types = virt_get_valid_cpu_types; mc->get_default_cpu_node_id = virt_get_default_cpu_node_id; mc->kvm_type = virt_kvm_type; mc->hvf_get_physical_address_range = virt_hvf_get_physical_address_range; -- 2.51.0