From patchwork Fri Feb 2 15:36:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 769205 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp972999wrc; Fri, 2 Feb 2024 07:37:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IEnysVMpdzpr/vPRGcwPWLu6wJaMOiDzymg25d7Fxeq/rxEsd9g2aQEmVB4eiB77K6o0RGl X-Received: by 2002:a05:620a:178e:b0:785:3ffa:68a5 with SMTP id ay14-20020a05620a178e00b007853ffa68a5mr4796678qkb.5.1706888244764; Fri, 02 Feb 2024 07:37:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706888244; cv=none; d=google.com; s=arc-20160816; b=0kaUZ0qe1q6mdKB+Bzy4WBJuzGsJBasg7yYBbktvaxGvTFq9kRoC5GPf5LlDQIvSpG GYMU0DA22p93xaRitQK6/YEsAdh41PGsxuOb5V47KWxyYg9GEVzspZMK8YYTb32onPxN Hzf3Sf661DjiW94lkCqG6QF9Z9QqMxxif260Faob1ChKQXFvOTuE8LYO5+gIvwgP4hv1 eoRy1RszFqjirjqVlyC5+CZuVTYLmxDJExEPU5NYXDOmdiTjTDNPGKj/QOvLDAw20Fsi NMT0+vQmAt0wK2yrRtbXNJV1abN/0iYnJk9kZ8P1RUMLb/dc7Khg9MItV0rcTknxMStO JBCw== 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=EKrB2domJrpD/QjC1zd65Q0KKvruCC/azVIk/m6fgxM=; fh=SQ6MiDLb/VjypMmPtSWn9HaPtotBcqYxb7EtjVWE0Lo=; b=TApBk+l+Dj7xkdb3ctEAmglVf1CdGh6PkFui/2MQuBSIIjE7o3Rc7NRkbcj5ZCuGGd Zyz3CjH7KjBoQWsRfRIdaSE0ZTd4JK8fFLOiqEdXkqBS7Q1/mPSkeBqTPgAZGVd1dC37 LPbPQM7OLuzvYowoymqczQf0a1BnwbQxt/GcY6cToTLlQaI5YmyDX87l68o9UivVjM8+ ynYqzjJo0pHIrHCnrAO/tXaTGDdO1A0TvFbkHPCskGkE9pgAJ3Fq+mrUWAOUT0IJfurk X1Xbv28vGXOxEen0s8gnnOwSI5MzwhZl4EiNpDLv5eCIIoENTt2Nyl8vXsZGa5vwYAEt hL1A==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mJCr46VP; 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; AJvYcCUQgU427tfsIBQDXWftCYOq7y50S+Gbp5e2WRHXjPMsPGq9Afw4Tld5hvEFiI3ILYGJ9cToVovT53GhwiEG5jQN Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id pj31-20020a05620a1d9f00b007855d68e2aasi819029qkn.93.2024.02.02.07.37.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Feb 2024 07:37:24 -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=mJCr46VP; 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-0000L8-H2; 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-0000K8-KL for qemu-devel@nongnu.org; Fri, 02 Feb 2024 10:36:51 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rVvaz-0004Tu-96 for qemu-devel@nongnu.org; Fri, 02 Feb 2024 10:36:51 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40e8d3b29f2so18559465e9.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=1706888207; x=1707493007; 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=EKrB2domJrpD/QjC1zd65Q0KKvruCC/azVIk/m6fgxM=; b=mJCr46VP4EZmKK7aeFN3DBN/ptheCsAv3c1dP6OGUw6ZOUbfZKauUYcq0W8XkjUtEz FJUH7zRV4UhS+OJvOtY8k8AXJOhptnREcKWtfuHcOmEJtm2HOvHeOuPEgu1RBpe/sxmR /pgeBfv2wM/vWikawAusjR0KwLPzZEbe8wpUp/C0vhRxVPMXrnzbwrXwcUUIzDjRkQSZ IupqhE0Bo9RhfUE6yRbNFXbqrNZmkSFTnj6COXutzY9be84NBkGBwmyUVqBJGH/4c2Hi XlfAaeLNhB7Vb0AIz3xSAbU16Wz+xaPR97w02UvDfrTwD61sfPVBwLmfI1vcDMX/F0TL 4Wuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706888207; x=1707493007; 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=EKrB2domJrpD/QjC1zd65Q0KKvruCC/azVIk/m6fgxM=; b=o1i4r7geRqNGwCsBIpXjsImbP3hVNikWRP/JySW3ZfFXuqGiQkBgi0eRPZjHM+QHuo M0jZsbfFvTetYdj6SFc/Rh0DXt3QNH8mF1JNmgInFuONGRsLgJE0amC7XrjZFDLUOv8p Vs4vQbW1mrar/BnV80FdPMU0m4QFKzhLob4r8/ypDIlFc+Yunh81xnDNvK8s/8b/Bi5O 9J0r+ts2vdG889AAUF8i9AGG5vN71lMsaXsHtRbQCFImfKjEsgrtPHvuCA9c7zRIMFlO oFdKYwANZNRmU8RnvdFZTqimvSozYKpl8z/sEknC4HDWFOuLZ/v5iM9ydVU2bC8FW10b GMGg== X-Gm-Message-State: AOJu0YwQlsxz1/+sTDn30YH4+fnlD6EZUtjTzvQZ4Ksm3W17m98UJLHb NCF0n22Ee8eKisMSbxn284Swi5T9bikDbyL5QD08VVRX9JKXkRVky/GxwAN0eayON0WXUtfCn40 Q X-Received: by 2002:a05:600c:1c99:b0:40f:afb9:ca10 with SMTP id k25-20020a05600c1c9900b0040fafb9ca10mr4114894wms.1.1706888207623; 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 19/36] hw/arm/npcm7xx_boards: Simplify setting MachineClass::valid_cpu_types[] Date: Fri, 2 Feb 2024 15:36:20 +0000 Message-Id: <20240202153637.3710444-20-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::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.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é The npcm7xx Soc is created with a Cortex-A9 core, see in hw/arm/npcm7xx.c: static void npcm7xx_init(Object *obj) { NPCM7xxState *s = NPCM7XX(obj); for (int i = 0; i < NPCM7XX_MAX_NUM_CPUS; i++) { object_initialize_child(obj, "cpu[*]", &s->cpu[i], ARM_CPU_TYPE_NAME("cortex-a9")); } The MachineClass::default_cpu_type field is ignored: delete it. Use the common code introduced in commit c9cf636d48 ("machine: Add a valid_cpu_types property") to check for valid CPU type at the board level. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Message-id: 20240129151828.59544-8-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/arm/npcm7xx_boards.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index 2999b8b96d0..e229efb4472 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -465,7 +465,6 @@ static void npcm7xx_machine_class_init(ObjectClass *oc, void *data) mc->no_cdrom = 1; mc->no_parallel = 1; mc->default_ram_id = "ram"; - mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9"); mc->valid_cpu_types = valid_cpu_types; }