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 D05D9CCF9EB for ; Wed, 29 Oct 2025 21:49:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vEE2F-00030E-8W; Wed, 29 Oct 2025 17:48:51 -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 1vEE1u-0002rG-RT for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:48:32 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vEE1q-0006vS-Ng for qemu-devel@nongnu.org; Wed, 29 Oct 2025 17:48:30 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-427084a641aso290131f8f.1 for ; Wed, 29 Oct 2025 14:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761774499; x=1762379299; 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=ScX5jHXkPCfHiRHa3/7k2dJ6cTMKBNtK3/vaUFB2OeQ=; b=oVgKoV3rz48NwsmebP+lTtFqbKIuPcaqk0Gv2hjY/e2fjKQNWwpUXUmIDqDmptIo29 MB5A2dW/Rf92YMKBpLfjJO57bWQo91yxjy+tUIDyY0yKUwbNqjuhMlTwSA6mephzChzf SQPxHyN1U3KE3cXgN+D0rZdSMz47sX3gN568ePwhl6KuBAjEsWhneU67dGkS1aKARNeM Zrg6p00T4sHCbgazbvT8MQ95vFtP7eSNl22P0yF7OcJfmjYMP1dpZRIrrHjlOZa08PLG r9eSLaa+3aWiDRvMLR4IPYSJ2wifVM08u1OPhTmyeZWecp0zMS7iPYoHcfJPPjUCBeeC 2pdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761774499; x=1762379299; 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=ScX5jHXkPCfHiRHa3/7k2dJ6cTMKBNtK3/vaUFB2OeQ=; b=LGbEApg2Ch8Fk/PtVMxrzrOwpU4D7GGe9eNMj4o7hjiLk3wJfPojv7L5pfKb+heyRW +g+6PcVbK8wyOuzs6perEvpS9eDg2a0o7pL7QN20G9DiVpK+xkeGFeO5Lg1xWJlHudpH YoFmkRtqa5cG429Gq7RJMsua7Fxc+nlFouTc65zhOeKtzB8gwGx6T08HF6gwhFuX7btX mQx7Gp2ZojQUtroRpi1oHE6cROs1Ujwi9Lhc6f8Ba+Gr4Pe+XjANnF+icabrnTlDnRw/ mEeU3did0FGSe6DukS0FjMg780fSie9kIz63hTfT8kJ/YyxreHXqPQx3L9carMVLWD3z aFQg== X-Gm-Message-State: AOJu0Yxs7w9xIDkc3Ob1zowmKJSnXbpBckC/SLyd8GmQgQJR0J9RjJz8 0Km/cFSFvxVIuid4m4eJILnUMgysnn99Wm80YE85ohStJ9KVOZ1RI7eZVbjeGPUBUYcOx5H01jw S/+5h2Uw= X-Gm-Gg: ASbGnctqliQe/wvldKN1GbzPnI4kBMcdqVfyXCBB/SlSM0DLjnKRMyZMV5u6dxhOqif wvN/p3HPTDotATb+9CO1kjfQRZy8nF6CvWGKZBGRuvCxwOWUhp16D5vfZ1xY5qHCbvqchFidczC voILzDhW5zLoiCC8UnLI9UzHpprvKLCIjFzWwDcO4P1CyvYWwdoB6oaaVk+tixP1zSvh4TfNFmz 1R+FpykBVKdgyW3GAW17L5YXE4AX98HChQ4kv5cc8rGtqsGJEGrfFjyiTzqNi0I9H6HaGlNOAUQ 1J7FACO52iTtVeqyMVvsroQE0E+8QbdbpRQFC11awVD86zytiDT0TehpuS/KaiBRa+6REUr+wHl 7/PJQMg2vpnjmJRsTWQaF4tigGbqw9l4sYBNBSRdj66UtMTwou2YqwJz+QuATXMUCdhKKuN1dlv AdJ7LzU7vZiJbULE0+MR0k32FIwA6oFGN6unsF8jkcntr1wVTjJFzLc248cLOI X-Google-Smtp-Source: AGHT+IFOUMbfkddgnKumzQ9hcae4vW+5GaUyJXzVdBdODD2pm54cktBkgz56wlSn80mF+gsLZOS8aw== X-Received: by 2002:a05:6000:40cb:b0:427:241:91c2 with SMTP id ffacd0b85a97d-429b4c97bbbmr745180f8f.30.1761774499223; Wed, 29 Oct 2025 14:48:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952db99asm28506026f8f.32.2025.10.29.14.48.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 29 Oct 2025 14:48:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PULL 08/23] hw/arm/virt: Check accelerator availability at runtime Date: Wed, 29 Oct 2025 22:39:45 +0100 Message-ID: <20251029214001.99824-9-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::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 It is not possible to call accelerator runtime helpers when QOM types are registered, because they depend on the parsing of the '-accel FOO' command line option, which happens after main(). Now than get_valid_cpu_types() is called after accelerator initializations, it is safe to call the accelerator helpers: main + configure_accelerators + qmp_x_exit_preconfig + qemu_init_board + machine_run_board_init + is_cpu_type_supported Replace compile-time check on CONFIG_{ACCEL} by runtime check on {accel}_enabled() helpers. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Acked-by: Peter Maydell Message-Id: <20251021210840.60112-1-philmd@linaro.org> --- hw/arm/virt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index e19da6fd901..d3809754460 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3260,7 +3260,7 @@ static GPtrArray *virt_get_valid_cpu_types(const MachineState *ms) { GPtrArray *vct = g_ptr_array_new_with_free_func(g_free); -#ifdef CONFIG_TCG + if (tcg_enabled()) { 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 @@ -3274,13 +3274,13 @@ static GPtrArray *virt_get_valid_cpu_types(const MachineState *ms) 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) + if (kvm_enabled() || hvf_enabled()) { 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"))); -- 2.51.0