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 0CFC9CCD19F for ; Mon, 20 Oct 2025 22:15:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAyA6-0007pY-Hl; Mon, 20 Oct 2025 18:15:30 -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 1vAy9s-0007c1-WE for qemu-arm@nongnu.org; Mon, 20 Oct 2025 18:15:21 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAy9p-0006m4-4E for qemu-arm@nongnu.org; Mon, 20 Oct 2025 18:15:16 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-47103b6058fso34364355e9.1 for ; Mon, 20 Oct 2025 15:15:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760998510; x=1761603310; 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=hifM9suh5wepCIBGkBJ4va7j8JgZZOPIRU8jpQmVeDQ=; b=AIBepaDzIyUIqOFchuVUYyEjZymgvY0Djhf8cL/DjsrYe79tTSF118SLp5zglxlnfh Njp8ppQXbvRLptxrSZkQS/Mvoj30xPLZTxz8SFfdq/oZTXUh4tv3dbT9pmSfBLyBnXIT u93gdpI6qyUicjIdVH/jOF9KdRoEL2QHGTuJdfJJiwkDf65Bn2BVbyxH1w4h+1epYVk0 dP1LnA+ZLyPl9eaOlOGSxPZuzI7aHGG7qYl83JekXMhTNAQbQxJ1suCd/cEiR8Q1EeB8 WzNoasbacD2+TQXAz0rpz8zdb2yJRsSVy4Lf4m7NtqTdc1SnIIeqjWo6MvaSNx+HyqrM RjVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760998510; x=1761603310; 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=hifM9suh5wepCIBGkBJ4va7j8JgZZOPIRU8jpQmVeDQ=; b=E4I5MLsCKuSxNrm4v+0LpHRRZVlABdr84HwTJT2EMFXiwmuyA0n1nFtYGxEzdiaFt1 H+QaNZz4XC/Wg8KKa0FsuvxNoyyibk0x3gk+8Qydv1fdEH69n1wwPYFs34+8boQE8P3j 3g/B6m0vDXM8ulXOhJLauU+U2V7T8o1hmuV5xDYhB7lVpdbjMCK31d/osN21HK+Y2qVa Pbv1QpvVhldySSOvsyE7446b1iRHMqS/+1HwW7D5v914sepxQM3kkvDhxYB+qviulvFY 5kD4j7CorRNd27VFY57zg5333qc5B7Vyg9wd2wkWi/zBU2g912DOMWDX2iJCke/HkDGD m57Q== X-Forwarded-Encrypted: i=1; AJvYcCU3QJirFiV/KmWNxo1BCi4QqMoi7+aE0F/O1DvRe0HqthWjiL86FQ2HqomMYztTKl8xC7CSEo04Wg==@nongnu.org X-Gm-Message-State: AOJu0YwH06WoRilY7k8lRDG0y/LNOj6LcuGQf/275zflanQdjjjxmMsK /dl+VqybpRrZnhueMQZSlOV4wsRIPyKb2lukAx8o2zUKMjWqNUtWl9EX36Lc9AieRwU= X-Gm-Gg: ASbGncvB+ZQjNF3i439EbYRCynjy/I92NdbRP/i9H6bU+VWJmFqMl34ztVVsiP2+/w4 tZQN58IruisXR4TkWfL4Tbrmosh9kMl9wrXHvd/0ZWGs1pDhPGTj9r2zzsD4stlO15Dfj6J8Dfw T680GK2Bn1vWmluaMPjxU+jbLuqHe8YSXjnE//foLMYWj7qWc09iDQiMAVdiPAUsjdcp4pqh6cp VjX27ZZuw6d57VAnojP6dDwduJ/m5GuDyHdNH1YDF6s+MRoENhZkBu2A8Ne/yBeOjUOIwyJKYDt e0rIrJFYv10mAxhQWGc8exhfFYyoRjks+I9gLJPEBFOqoKUql0jit4bA//Zpd1psJhvQTJpIcZu mgTapwBQdV/6fUtfLJVR/v6+drUGD0gw/ASu/iTfi/LPF7KauJ0N9yuP5OjHFL5xipGxr1uUM8+ attL3xDbEL2ajORqoGr5sRmAo+X8xYEsmm8sfFgtUlyUTDEpNePQ== X-Google-Smtp-Source: AGHT+IFOrZjMlZ2sNGyYYceBLSbSiyyaBm/koSJZAxswCBVRztwE4rEdZwTKx1UXtnC6iuB+Y5ckBQ== X-Received: by 2002:a05:600c:3b98:b0:46e:6339:79c5 with SMTP id 5b1f17b1804b1-4711724b354mr142959405e9.5.1760998510615; Mon, 20 Oct 2025 15:15:10 -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-4711c487dfesm237090065e9.17.2025.10.20.15.15.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Oct 2025 15:15:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Peter Maydell Subject: [PATCH v6 16/30] hw/arm/virt: Check accelerator availability at runtime Date: Tue, 21 Oct 2025 00:14:54 +0200 Message-ID: <20251020221508.67413-1-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: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=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 --- 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