From patchwork Fri Feb 2 15:36:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 769208 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp973074wrc; Fri, 2 Feb 2024 07:37:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IFrx3RUEc1GiBcDbXmGI6NP5Jq2SXehZzop8MtGewXVvHeqgRpT2eTqEc0qlcNR6rS2I5/I X-Received: by 2002:a05:620a:5307:b0:783:38e3:a0f1 with SMTP id oo7-20020a05620a530700b0078338e3a0f1mr2547093qkn.4.1706888258112; Fri, 02 Feb 2024 07:37:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706888258; cv=none; d=google.com; s=arc-20160816; b=ULW/D9rn1rocZJlpkDQ+V6TVKP8nSMpdVdvnzaFVNjPqR5VX5RgjM89/8GP5iB9ppu mQW8kDSDG6R1BgBORAS4/bkkzDpOAodgavPZXocQKrkVMdpf8MnXlboq32uFQK1wkhXv I3xUuz3wdN5uuSrVWBBxfAC7jCUgttM/AUFtVxVnMpWKnguFeML6Ldu7g7+2DHDyZN4c +C3d8lvaqdD5UU0ljsfXMiHNR860gD4GTy5ZCdhBM2/+VReP0zEXKOCPENzFmuHh6F7r /vG6hMcApdT1kc2gUEd9KcBfmBsi0N3aExjHJCEypwxPWVsRNsSeI0sMjKUIg+T6NCrA qSLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=5StY4SEF1HqNavbZgDZFaGtFNMi7VFPlW6TJWe8PFDk=; fh=hGCeoLa+0D82jJDvkeVub24eQ6NnHR88jibNSs+xsII=; b=tqJjxnm9ZSI8AdWqnwZhAgtPVKFPwm/ogs283eIRuhRJHQVnvM1CYsq0HEFIJ5urp3 4DT5kChSe46/aILw/GmY+ddTA08/xfU7a/UThm0J3pK9q/vYAhUP7Y9eJYLfOYOTniKi dxcqg8MVg9Btgwoq2doqOvTQBNdz7SE9rL9IipzOUtTMeGZ/KsslAdEuKinaZjS7YhqI jZ+nPs3TtnzDAyorZfGmh1CUWjiXzQiJyycIKvES3G60JQ5RqIvQKyxFppdtYfFHhi/5 pEnaZp3r/KpYoQJu02T4o7v/skPvSMzl9PtpN5D/h5Ulvh0YyR9vrYv0OulI65dYn7jc DMhw==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="AN3R/cLW"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCWSbdf5WA5lUxLxx3ee7jq1q/xG+gLOIsAAmGS4bBa4Go5L099SUv+mfu9MsPDvTtUOLIGCrk9k4xFX80xwS4PI Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h4-20020a05620a400400b007854a5dd4aesi2502643qko.770.2024.02.02.07.37.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Feb 2024 07:37:38 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="AN3R/cLW"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVvb4-0000L6-Gb; Fri, 02 Feb 2024 10:36:54 -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 1rVvb1-0000KA-M1 for qemu-devel@nongnu.org; Fri, 02 Feb 2024 10:36:51 -0500 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 1rVvaz-0004Tx-CE for qemu-devel@nongnu.org; Fri, 02 Feb 2024 10:36:51 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40e8fec0968so20019535e9.1 for ; Fri, 02 Feb 2024 07:36:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706888208; x=1707493008; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5StY4SEF1HqNavbZgDZFaGtFNMi7VFPlW6TJWe8PFDk=; b=AN3R/cLWeUNdW6G5mioLSQQWObYdw2Ic6Rpe29zIXZNHmIQp++zbGBtf/gXC/gtb2x ZV9ldLT+3PGyB1di5HtBUAfz3tM8qOyD0r4Mi7S/6zzolw60yZVf0xUvJzWWQh+UsNO4 N0dTscO6irzuI5B8AVGBZSJJUAUHSA96vM4fUVsQwFEEsFZmyXwSSJFfbpyOgR+agYBV M2JZFDXX5vp/Kjs1L60QnwHZ/ztIEGLfGNUB2BxwogFBiuXmjDT2KqWi+J76ESLpeHvv sbqlId2pwI8xHvPCdEGDtbLCZX+wXEHKyk/mqu7foksFdHByozn43txfCprFrwRSEaHB n+AA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706888208; x=1707493008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5StY4SEF1HqNavbZgDZFaGtFNMi7VFPlW6TJWe8PFDk=; b=aJeatF2/UUlx/0xF8G/dzdPa2Lq7zuzDkPAdlWXXS1suBkY2EwXQo6KEBaHSCToLc6 Zty72gQFvI7KxhalIZQo2LiaTxlAofZYlZ2ZfsOkXYnv0fKBwkodKRsARyR9d0S+u94z VoB8wDTOFIQvPiyJBaXPBdjNYXRpCAtkc/JLsb9A2JPuyHm7Kii5tGgVsptU3+CrjFvc vjR4qp0Iz60sAKkt9VFxoISlhc86+VHVRwfhPT+3easfQVQu41BddokRbwY7EWSukq0K kAvyxbh3/z6ASlQMlxBH2LIBTlL5vaHIXXctknzVi66uYKdTl2fJiIJBrfpL6+E5eNGv G6PA== X-Gm-Message-State: AOJu0YwNTCQdllQ4prujMjiKhB9eLEOfyxkbMg4I8tbjTaWxIar0xskY 02x7mJVPPMAmJAtgtiKtqFU6N8hdg7X/HN+iWNw+UT+A243DFnW+zoat3v+C03jQKkV5sgUhz5i b X-Received: by 2002:a05:600c:3c88:b0:40e:fce3:3daf with SMTP id bg8-20020a05600c3c8800b0040efce33dafmr6802597wmb.19.1706888207980; Fri, 02 Feb 2024 07:36:47 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id k2-20020a05600c1c8200b0040fafd84095sm214735wms.41.2024.02.02.07.36.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 07:36:47 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 20/36] hw/arm/vexpress: Check for CPU types in machine_run_board_init() Date: Fri, 2 Feb 2024 15:36:21 +0000 Message-Id: <20240202153637.3710444-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240202153637.3710444-1-peter.maydell@linaro.org> References: <20240202153637.3710444-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Leverage the common code introduced in commit c9cf636d48 ("machine: Add a valid_cpu_types property") to check for the single valid CPU type. Remove the now unused MachineClass::default_cpu_type field. Reviewed-by: Richard Henderson Reviewed-by: Gavin Shan Signed-off-by: Philippe Mathieu-Daudé Message-id: 20240129151828.59544-9-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/arm/vexpress.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index f1b45245d5d..1a14c1933e9 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -783,22 +783,30 @@ static void vexpress_class_init(ObjectClass *oc, void *data) static void vexpress_a9_class_init(ObjectClass *oc, void *data) { + static const char * const valid_cpu_types[] = { + ARM_CPU_TYPE_NAME("cortex-a9"), + NULL + }; MachineClass *mc = MACHINE_CLASS(oc); VexpressMachineClass *vmc = VEXPRESS_MACHINE_CLASS(oc); mc->desc = "ARM Versatile Express for Cortex-A9"; - mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9"); + mc->valid_cpu_types = valid_cpu_types; vmc->daughterboard = &a9_daughterboard; } static void vexpress_a15_class_init(ObjectClass *oc, void *data) { + static const char * const valid_cpu_types[] = { + ARM_CPU_TYPE_NAME("cortex-a15"), + NULL + }; MachineClass *mc = MACHINE_CLASS(oc); VexpressMachineClass *vmc = VEXPRESS_MACHINE_CLASS(oc); mc->desc = "ARM Versatile Express for Cortex-A15"; - mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"); + mc->valid_cpu_types = valid_cpu_types; vmc->daughterboard = &a15_daughterboard;