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 26207C4725D for ; Fri, 12 Jan 2024 13:54:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rOHyg-0005jq-Lt; Fri, 12 Jan 2024 08:53:44 -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 1rOHyW-0005eo-5Z for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:53:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rOHyQ-00014u-9x for qemu-devel@nongnu.org; Fri, 12 Jan 2024 08:53:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705067603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YLQeK9JPN153qq4oML3PXAtaSLTSsAR4OAWzDWUTomw=; b=JrZRcb0oqCz3DvEkOhgdVuqfkC/jnHF7xKswBse51fkH6fBZw7Vyq/l6Qnlr3uT5SgdTYK TSb5V1//2g3JRcSmKgVsgSadG/Kqe38l3o7DmtkpqM5GAcwqXhIZqvpgMh9aARdeMZgBFq wiqO9WhhWRYnkzXCOvTZf9dfxoNTZzM= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-496-lfRjC8NOO5ai_dbpu73Hxw-1; Fri, 12 Jan 2024 08:53:19 -0500 X-MC-Unique: lfRjC8NOO5ai_dbpu73Hxw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 36B0D29ABA00; Fri, 12 Jan 2024 13:53:19 +0000 (UTC) Received: from localhost (unknown [10.22.8.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F0820492BC6; Fri, 12 Jan 2024 13:53:18 +0000 (UTC) From: Cornelia Huck To: Gavin Shan , qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, peter.maydell@linaro.org, philmd@linaro.org, richard.henderson@linaro.org, shan.gavin@gmail.com Subject: Re: [PATCH] hw/arm/virt: Consolidate valid CPU types In-Reply-To: <20240111051054.83304-1-gshan@redhat.com> Organization: "Red Hat GmbH, Sitz: Werner-von-Siemens-Ring 12, D-85630 Grasbrunn, Handelsregister: Amtsgericht =?utf-8?Q?M=C3=BCnchen=2C?= HRB 153243, =?utf-8?Q?Gesch=C3=A4ftsf=C3=BChrer=3A?= Ryan Barnhart, Charles Cachera, Michael O'Neill, Amy Ross" References: <20240111051054.83304-1-gshan@redhat.com> User-Agent: Notmuch/0.37 (https://notmuchmail.org) Date: Fri, 12 Jan 2024 14:53:11 +0100 Message-ID: <875xzyodyw.fsf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 Received-SPF: pass client-ip=170.10.133.124; envelope-from=cohuck@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.09, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 On Thu, Jan 11 2024, Gavin Shan wrote: > It's found that some of the CPU type names in the array of valid > CPU types are invalid because their corresponding classes aren't > registered, as reported by Peter Maydell. > > [gshan@gshan build]$ ./qemu-system-arm -machine virt -cpu cortex-a9 > qemu-system-arm: Invalid CPU model: cortex-a9 > The valid models are: cortex-a7, cortex-a15, (null), (null), (null), > (null), (null), (null), (null), (null), (null), (null), (null), max > > Fix it by consolidating the array of valid CPU types. After it's > applied, we have the following output when TCG is enabled. > > [gshan@gshan build]$ ./qemu-system-arm -machine virt -cpu cortex-a9 > qemu-system-arm: Invalid CPU model: cortex-a9 > The valid models are: cortex-a7, cortex-a15, max > > [gshan@gshan build]$ ./qemu-system-aarch64 -machine virt -cpu cortex-a9 > qemu-system-aarch64: Invalid CPU model: cortex-a9 > The valid models are: cortex-a7, cortex-a15, cortex-a35, cortex-a55, > cortex-a72, cortex-a76, cortex-a710, a64fx, neoverse-n1, neoverse-v1, > neoverse-n2, cortex-a53, cortex-a57, max Alternatively, we could skip any NULL returns from cpu_model_from_type() in is_cpu_type_supported(), but I guess leaving out not-provided cpu types in the first place is cleaner. > > Reported-by: Peter Maydell > Fixes: fa8c617791 ("hw/arm/virt: Check CPU type in machine_run_board_init()") > Signed-off-by: Gavin Shan > --- > hw/arm/virt.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) Reviewed-by: Cornelia Huck