From nobody Tue Nov 26 17:46:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1705991976; cv=none; d=zohomail.com; s=zohoarc; b=BQWXdtwWEMSQp6YRbWlEAIvHc/RaQ5GRKcqmxzS09poMG/tnGN6JxDZVz8zWrcDg7UlkQWovKk3HM250zEXd+dRbrF8wYD9AVSSqxR8xyj39Qo9JtudCGVrB6Tz6jG5ICUC5Nk0bMDTpDPHx4pCYJJucoJxdka92Rn+7lhfPOz0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705991976; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yTFI6OnsG8Ecm0s/RbMlXPNe90MeYhDYsKxltFeRfZI=; b=A6zXB8ZkkO6m6wwY5AAOdiJfDPNiElOIWcxay5Ca3/NsWwgqPih2nEGQKWmxAsxGfOiZdyfcMuK+bf7Q0qeQYlPGCEVCb+T2hfl85ONJNocY9oAnMz1GYCRIfNqUpTohROesJ0fTpJ2k159fZC1HA5l33EibUv3tAtRrsssLBzg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705991976768822.1387285996426; Mon, 22 Jan 2024 22:39:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSARF-0003Xk-2A; Tue, 23 Jan 2024 01:39:13 -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 1rSAQx-0003Vu-C6 for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:38:55 -0500 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSAQv-000846-Mg for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:38:55 -0500 Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2cf050ea05fso8822271fa.3 for ; Mon, 22 Jan 2024 22:38:53 -0800 (PST) Received: from m1x-phil.lan ([176.187.194.78]) by smtp.gmail.com with ESMTPSA id vq7-20020a170907a4c700b00a2cf537042asm12380825ejc.192.2024.01.22.22.38.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 22 Jan 2024 22:38:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705991932; x=1706596732; 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=yTFI6OnsG8Ecm0s/RbMlXPNe90MeYhDYsKxltFeRfZI=; b=oJwAg8EU+ZjxEEPGkaiHSj7GScmTA7JqL9TBS/puFHXLyrU6JFSBA+rCBx3N/HnMfb IDiyVtkA3vM0LtUcBEANJVK6q00oFxXw9icv0LA4NhxVDrn3baC5gtia+mms/iZ+V5cm GLagQyEqpfXlZl+lxwvNfizfSVOHo8IGCpJ/LLSJvwMikL3+zhiZRoIusjyt2vEVcsjz TVOZQ2SESw8AQYqF6ENdM9Cq/AMt+khuoXjLAZI+CFE2TUIv/O8ZwMgR6GE803AnQ6uK xRieGOOjBd+WHBSc4LBBcgScU5Rb6UwB3AJeYTimu0sC4VCIQWoxJ0VKEnHrc+UhOlcP oFHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705991932; x=1706596732; 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=yTFI6OnsG8Ecm0s/RbMlXPNe90MeYhDYsKxltFeRfZI=; b=E5XKdcTYamq6nmh9ZewQxOzge1Sne7J5+aQs25SqDcNBigVmKdVShO0gWJJTRVQHmm RAsP6A5kxWuqQux36wwKpixCOdpYV/c/8USyDXIwetEcKRuMylDagGylNd2eaEKMcJ2H YcQZXQJicb7UedpMcSf9G/x8PHSmV6vTF/wnKSrT1b2VP2PbT+F8z6fC+TtEGjrzgwFw 2RlBSW2DWz198loRLi/SiSHE1jQYHxGW9gJTArBFKJ8pLO6FtxJhFIMzKfW3REFqPFzs jHeX2iN7ME8Q8iA9vkt+JOHwLFOccdCennysThGw9H7U+5Yj/S69KRNCb6pfsT4ibVU2 ei4Q== X-Gm-Message-State: AOJu0YyDATWDg+mWUq/KE/yK8aTpqZadDN1y35YSQvE+P8zjCElOj/yw QkHNCtbGlzmtk5w5IMVU/a+PnxtmumUhffxXKZvyXrPK0LOVqIZ5ZCjoMeTnijCj57zb89o69rA HR1M= X-Google-Smtp-Source: AGHT+IHmOUKjjg7ARvmCwbeb9jxrzOc/Wvb/99SO601GPXl4nwo4GcFazSNQcrVNMTUrgnJkrtZnAg== X-Received: by 2002:ac2:538f:0:b0:50e:ac2a:6b6d with SMTP id g15-20020ac2538f000000b0050eac2a6b6dmr1784891lfh.119.1705991931669; Mon, 22 Jan 2024 22:38:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Alistair Francis , Gavin Shan , Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, Igor Mitsyanko , Joel Stanley , "Edgar E. Iglesias" , Rob Herring , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/8] hw/arm/exynos: Check for CPU types in machine_run_board_init() Date: Tue, 23 Jan 2024 07:38:35 +0100 Message-ID: <20240123063842.35255-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240123063842.35255-1-philmd@linaro.org> References: <20240123063842.35255-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::236; envelope-from=philmd@linaro.org; helo=mail-lj1-x236.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1705991977394100001 Restrict MachineClass::valid_cpu_types[] to the single valid CPU type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/exynos4_boards.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c index b0e13eb4f0..01c7618a67 100644 --- a/hw/arm/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c @@ -34,6 +34,7 @@ #include "hw/qdev-properties.h" #include "hw/boards.h" #include "hw/irq.h" +#include "target/arm/cpu-qom.h" =20 #define SMDK_LAN9118_BASE_ADDR 0x05000000 =20 @@ -150,12 +151,18 @@ static void smdkc210_init(MachineState *machine) arm_load_kernel(s->soc.cpu[0], machine, &exynos4_board_binfo); } =20 +static const char * const valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("cortex-a9"), + NULL +}; + static void nuri_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "Samsung NURI board (Exynos4210)"; mc->init =3D nuri_init; + mc->valid_cpu_types =3D valid_cpu_types; mc->max_cpus =3D EXYNOS4210_NCPUS; mc->min_cpus =3D EXYNOS4210_NCPUS; mc->default_cpus =3D EXYNOS4210_NCPUS; @@ -174,6 +181,7 @@ static void smdkc210_class_init(ObjectClass *oc, void *= data) =20 mc->desc =3D "Samsung SMDKC210 board (Exynos4210)"; mc->init =3D smdkc210_init; + mc->valid_cpu_types =3D valid_cpu_types; mc->max_cpus =3D EXYNOS4210_NCPUS; mc->min_cpus =3D EXYNOS4210_NCPUS; mc->default_cpus =3D EXYNOS4210_NCPUS; --=20 2.41.0 From nobody Tue Nov 26 17:46:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1705992019; cv=none; d=zohomail.com; s=zohoarc; b=EL3ITerJFr4InoLP28dBpP6n5+p8kCpzxdRTlrotAT24UHLYVC+5WFR60mpxpC/TyW7WMDLCR51FqLdEGOkK8F5MlPNdjw/Lgtuman9ZU+3XwE3H301PTQTsM/JQe4vxA7S7L6PVCUFmp3AlwEAozhq62dAdYvlwxSfUzM0mtXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705992019; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=i77zJu4XGXBVApw9vLRB2i1/pQOfnONi4E/tNbGXicU=; b=gFsvGJfLxNYqqzGVVM6aB6fZBPTclRC823jR812cXVwOsuRAMc1OJ3T7LiN1hefxD5jpHulxKaNjK2LZ5mrd3r3LjyeqRPS0EFdlXT+W3/HRb6rLY1XuHEbCjNiCKAA9H6mmB1FvNrj8gRQOq1oCFyZbQI6WDJI7OCAXmbNz1F8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705992019947373.0697316197213; Mon, 22 Jan 2024 22:40:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSARK-0003hg-Mr; Tue, 23 Jan 2024 01:39:18 -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 1rSAR5-0003Wy-8U for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:06 -0500 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSAR2-00084U-Ot for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:02 -0500 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-55783b7b47aso4442998a12.0 for ; Mon, 22 Jan 2024 22:38:59 -0800 (PST) Received: from m1x-phil.lan ([176.187.194.78]) by smtp.gmail.com with ESMTPSA id dm24-20020a05640222d800b0055c1433be60sm2864216edb.50.2024.01.22.22.38.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 22 Jan 2024 22:38:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705991937; x=1706596737; 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=i77zJu4XGXBVApw9vLRB2i1/pQOfnONi4E/tNbGXicU=; b=S1b2+tOH6PTVbzHapEHhdghVd18Nqe7Z9tSKB4B2Hrher6PoizNnuhKjVeWEHizX6F xlVgLYU6n+Re7HDT+4vN5cE025ATlC1ttBhiutawL5MYl3R5T731hriytpDEbOADkpZ9 hajsUBEkvdR9CQiYAtwLd9kCwGf5hzpDRjOQMLW/4Dis3Y7S6z70GlA+/+DoRjJMHpFM 5lGYTul5oiPjsmKwE/EvwhpkcNENyLqMlgCZaFcP+tvPQTsqnOuIuzqtTxVy6uLdWXqG O4AL1viAVEgEYNPIhjrLj3jloB/3utqY9iAY+uZ7QDkx3Mz9ne0tO6rnZR5yKx/5WGUs IORw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705991937; x=1706596737; 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=i77zJu4XGXBVApw9vLRB2i1/pQOfnONi4E/tNbGXicU=; b=EAGuWT5F0BeXMTW3rXNZMK6jppSNEX7r+fdg6ce2BiUFVS7mlpcl6JTGLCkyTULgsZ N3FKRcun+8mfOGZe5Qhww8A4tYCuLU0Cg/dZ8FWQBjn6wUWeRCra0/fK4oQtiZPgsJDV YJrphZxApPkrbU5iX7gxmrcfC+usqFdUECUnhSopQ5EyDmrA+7vCVUVJV63NRJfYXVTy +fN+YCVKulRTgtljI4AqDBJ059YNOC6yxXlIHAgcUjecBxeq5pRO6Uch3lvOLDsTJhDk Sll0KUadUnrvILLk+/81gfziXQjjuc0/GnDW+qPeCeOHr10qEHEltjKxla2vO+1hHWNK ZjJA== X-Gm-Message-State: AOJu0YwXiqpPf0ab76NuyIaRe/zVmUeZTHkhTkVWu8mMIZVpN3znYpAQ hUn/zHSK9SdSB2l7BHrHT1C8DF8ZgxHcMbaLqfdESj85w8k8/boYrcVHNCdQ0aizLfEq2GyhoND A6QQ= X-Google-Smtp-Source: AGHT+IFi07VBZVjQDkREKXZik2eUBCTs7lSYTU8lbQU47Yaa3HA2AK2ktEuhwJvZbbuQVNDj31o1FQ== X-Received: by 2002:aa7:c3c7:0:b0:559:f1b6:bf6b with SMTP id l7-20020aa7c3c7000000b00559f1b6bf6bmr572472edr.68.1705991937548; Mon, 22 Jan 2024 22:38:57 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Alistair Francis , Gavin Shan , Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, Igor Mitsyanko , Joel Stanley , "Edgar E. Iglesias" , Rob Herring , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/8] hw/arm/highbank: Check for CPU types in machine_run_board_init() Date: Tue, 23 Jan 2024 07:38:36 +0100 Message-ID: <20240123063842.35255-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240123063842.35255-1-philmd@linaro.org> References: <20240123063842.35255-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=philmd@linaro.org; helo=mail-ed1-x52d.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=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1705992021569100003 Restrict MachineClass::valid_cpu_types[] to the single valid CPU types. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/highbank.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index e6e27d69af..67677eb651 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -344,10 +344,15 @@ static void midway_init(MachineState *machine) =20 static void highbank_class_init(ObjectClass *oc, void *data) { + static const char * const valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("cortex-a9"), + NULL + }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "Calxeda Highbank (ECX-1000)"; mc->init =3D highbank_init; + mc->valid_cpu_types =3D valid_cpu_types; mc->block_default_type =3D IF_IDE; mc->units_per_default_bus =3D 1; mc->max_cpus =3D 4; @@ -363,10 +368,15 @@ static const TypeInfo highbank_type =3D { =20 static void midway_class_init(ObjectClass *oc, void *data) { + static const char * const valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("cortex-a15"), + NULL + }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 mc->desc =3D "Calxeda Midway (ECX-2000)"; mc->init =3D midway_init; + mc->valid_cpu_types =3D valid_cpu_types; mc->block_default_type =3D IF_IDE; mc->units_per_default_bus =3D 1; mc->max_cpus =3D 4; --=20 2.41.0 From nobody Tue Nov 26 17:46:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1705992034; cv=none; d=zohomail.com; s=zohoarc; b=fJfZnJi81LCHQKKEMVrwJfqLms+KmrXx98ZoUnOnc9+3CG00HdgBsI06AXJqXcD8r/Soon55XPg8QWdAcuaSRbL7dAoqtjDSU/w6+tsDGSyfA0UJdszMA5FJ/we0Dm26GIr1VDruiUAe64BgJYy+P620sSNO1LB7TMw/wsjCb+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705992034; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2RjX1tFrRGVlM1BwnlKhE6JoLvLjIml7FEvFQ9cMoCw=; b=m9RsXwkIiR7u8iZiK9ZGN009LrDVwcev6tzF2NgB1Qwl9hU1G1qtqPikFukXBtBx3NdGHrryqoCaUFC4eBn2eXjBQ/qfK1n5F3QiekRaFa/3/6LER8uhiY0J4nB9T03+mHnb5aCAnnACPWGECG8X6/T8pw8QhoIUlkiIni6vaFE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705992034088216.06073972620607; Mon, 22 Jan 2024 22:40:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSARL-0003kB-IS; Tue, 23 Jan 2024 01:39:19 -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 1rSARA-0003Xg-Ew for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:12 -0500 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSAR6-00084v-Sa for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:06 -0500 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a26ed1e05c7so433118466b.2 for ; Mon, 22 Jan 2024 22:39:04 -0800 (PST) Received: from m1x-phil.lan ([176.187.194.78]) by smtp.gmail.com with ESMTPSA id z19-20020a170906271300b00a2ae0aa9002sm14101678ejc.40.2024.01.22.22.39.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 22 Jan 2024 22:39:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705991943; x=1706596743; 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=2RjX1tFrRGVlM1BwnlKhE6JoLvLjIml7FEvFQ9cMoCw=; b=bUtvC4xtbaL2Z5BRd/WvRIMcbQdHCbcbdut6pEPkXQhjVttlsfAdN9HACh5f96SLc/ Bb9d9pL6TRMs3PeUpZngTNxbz9QSWlE3mQZumdfqI+Y98+KwZ4FSi6tmsTUe9TAwt7Kd E6//oY7dkAK5OIaUaehWOaasXPzeT1JMB7aQ8zY8yrTRDGUf74nYav4bJifP8LzhPeRX DNOKblEF9g7tUPn2a90gcn/97C1GEcW+sIXQCftAnFxbSSVXdxJV1XsfMODf8ZoVIebM xMnnLDWC7oiaH7cTTBDyhCUBJdavBQ1oUXi+3t3/9gD1ig65q/CL1Dsi8UoGG2E0FfIb G00g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705991943; x=1706596743; 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=2RjX1tFrRGVlM1BwnlKhE6JoLvLjIml7FEvFQ9cMoCw=; b=fWudRwvK6W9ixZgQj9kegYhIwLL3Wa5UVIgpW6Vl9cM8f31AJXFOeGuxZTq6y7+JKL 2ex7K7le2orLikQ5OgK6Y/GHDNbUEqopePfj5u5Z0A/lbB08BD6HaHEo014dzcgLoYxL v7kTrxSMOqDCfw8qQevJAPPPc7IsANwhPqoOX0Xp3a7CfPLSNAwoTUqVfwl5WElkjYZs ppAEHAONcCVQE2i3VO27J2/mRUuoepcJR/fCN9W3uAU0T2Ht3o/VQtqqPnQ2lgTp0Ojh 4JtLzWIUkkgyBa8YSyjJ5q8IYPdPbUrqUhKw4VAP+fWNGcIWR9fVFI0IUEcrIxSYc5C4 9n4g== X-Gm-Message-State: AOJu0YxqirAqifCjG7GKcnXNQ3V3Hp5gdL5itKan/IlzL3YTJkWu0R07 uf3tJ6v1uNkyYusWAV1g1iseX2xLvgSU7ByF6Xt5YGLUUdsRgAo2oRGuNWKOq+KJBnUB4gi9c/I O/WE= X-Google-Smtp-Source: AGHT+IH8CEEAWEge+Yj9AnKTu/LhfRV72ETCYupaXb457vSHypXsgUtlGf72o8VzPe0PZO2AAndrgg== X-Received: by 2002:a17:906:ba83:b0:a30:d603:5ed0 with SMTP id cu3-20020a170906ba8300b00a30d6035ed0mr34022ejd.144.1705991943341; Mon, 22 Jan 2024 22:39:03 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Alistair Francis , Gavin Shan , Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, Igor Mitsyanko , Joel Stanley , "Edgar E. Iglesias" , Rob Herring , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/8] hw/arm/vexpress: Check for CPU types in machine_run_board_init() Date: Tue, 23 Jan 2024 07:38:37 +0100 Message-ID: <20240123063842.35255-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240123063842.35255-1-philmd@linaro.org> References: <20240123063842.35255-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=philmd@linaro.org; helo=mail-ej1-x632.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=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1705992035697100003 Restrict MachineClass::valid_cpu_types[] to the single valid CPU types. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/vexpress.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index f1b45245d5..a3561a1b56 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -783,22 +783,32 @@ static void vexpress_class_init(ObjectClass *oc, void= *data) =20 static void vexpress_a9_class_init(ObjectClass *oc, void *data) { + static const char * const valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("cortex-a9"), + NULL + }; MachineClass *mc =3D MACHINE_CLASS(oc); VexpressMachineClass *vmc =3D VEXPRESS_MACHINE_CLASS(oc); =20 mc->desc =3D "ARM Versatile Express for Cortex-A9"; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a9"); + mc->valid_cpu_types =3D valid_cpu_types; =20 vmc->daughterboard =3D &a9_daughterboard; } =20 static void vexpress_a15_class_init(ObjectClass *oc, void *data) { + static const char * const valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("cortex-a15"), + NULL + }; MachineClass *mc =3D MACHINE_CLASS(oc); VexpressMachineClass *vmc =3D VEXPRESS_MACHINE_CLASS(oc); =20 mc->desc =3D "ARM Versatile Express for Cortex-A15"; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a15"); + mc->valid_cpu_types =3D valid_cpu_types; =20 vmc->daughterboard =3D &a15_daughterboard; =20 --=20 2.41.0 From nobody Tue Nov 26 17:46:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1705992037; cv=none; d=zohomail.com; s=zohoarc; b=U5eQrvVftM0wZNJgeAeOnpZIYehtnHOwd/+NsUH4/0uwZNjo8vUZIa1Zbzhg7CE5SRLWzxZtS4Ki7z3fqbwgTLSKM5n5UTMcKbHpQxgx/Xr6uLsIgLPKFsotZUSkWpDFHWGp4UGEb1YTLU/e6/P5G9VfiBB+2EhduWeVyDvABJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705992037; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TGD5FLvwAQGOZbUBjumYjpCbltGmL2kWHmZW0fC4bQw=; b=UvFrwuW5KYGIQ9ZT6RpmWb13Y+CJRSv0YAS3444zmEvWHG4Cdm1mJclv1v203WJNoCyb+Zdm7g9smBJ3HEjR32csuBbBAwBy+JGFLKQdKX9G6My2zQZ1o/wTnw34m/CHnvNTfmfRDXGWOvMLTllmULQtFk52rbesYafsCMJgwKg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705992037836847.6260791759046; Mon, 22 Jan 2024 22:40:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSARP-0003lm-83; Tue, 23 Jan 2024 01:39:23 -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 1rSARE-0003YF-Ba for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:12 -0500 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSARC-00085H-R0 for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:12 -0500 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a308db01df6so131907166b.0 for ; Mon, 22 Jan 2024 22:39:10 -0800 (PST) Received: from m1x-phil.lan ([176.187.194.78]) by smtp.gmail.com with ESMTPSA id tj3-20020a170907c24300b00a30982ea105sm796938ejc.42.2024.01.22.22.39.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 22 Jan 2024 22:39:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705991949; x=1706596749; 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=TGD5FLvwAQGOZbUBjumYjpCbltGmL2kWHmZW0fC4bQw=; b=Wx3QmEKNfmy5DWwig7dxnedD/Y67Z+1/RP6+05kDmz+x3XPwmMgDn6eRhP95++Mch5 tGkqY6OVS4SWk1M2XCCvJi87c+qje9O4bNGPFWkyKeyd+naSN22w4SwAfsKruQD2xe5F bCk7J6V8qKGnn0p5Gb8ErCEku6rtWCzccqdg+cKChc8fg6CGBudxyFcrAzyQwho8Quy/ aczH9Lu7Oo3mXwbF17oODeyPh0eIkOCmDmgNZkg8M6b1Z8KcUHRVCsvzVNY/aMmGE8QW EOz5rppqAlf7dC8Pn0JC0AbhLsB8JmR9K2irBHbfZoXyHam5BdeotwZr4ctYWrql1wGj 8fsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705991949; x=1706596749; 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=TGD5FLvwAQGOZbUBjumYjpCbltGmL2kWHmZW0fC4bQw=; b=iwmC5XMew3YTh02JGBfZ6dUrzxXzLBp4FoEYQvO4PofQIFg8k9qm9CEM2ernhZYP2h rHr3iTRLpm8aQhEEuviG3wog6eDhl1OGAqmgToK79+Q55+VY0Gp2onctYDD411EP9Wib 3HO/DAplJxzI6sBLFUtduIH8ZAdLwSn2AJ4e75RSBdhGgpM4C+IzfKYRi1tNWaNEOoee SRtolMzw9WduJ5nFVcDcAjlmK39TDEaIN2PVjUAuB0tDRY62U0w2E8fnU0Mkq46UmVY2 mPV/yv5EaNflV5wCc0yuiQquZajekYop3kAojACEMSrOZEBuZrgJHdh8tNKqh4YEjAKX Y0TA== X-Gm-Message-State: AOJu0Yy/qScclHDrKTU1pOLHpxCwfTIco5NX2NzgmpBg4VsJLwVs+F30 xjmWo/m+Mol7Fh96qWEbOlPnSa3GNh8zUk4VtSQVM47r9ZRuQrcyw+VDKKYRZJPzVPHwxGcGjVd oGek= X-Google-Smtp-Source: AGHT+IE39a1Ddlk182Vwb1wKOGjDhDjdOIObhPFlOKYOCpJTl5rtIiky22F7ptTZXhXYN8KHljaj1A== X-Received: by 2002:a17:906:1748:b0:a28:d1d7:c255 with SMTP id d8-20020a170906174800b00a28d1d7c255mr1280066eje.204.1705991949062; Mon, 22 Jan 2024 22:39:09 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Alistair Francis , Gavin Shan , Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, Igor Mitsyanko , Joel Stanley , "Edgar E. Iglesias" , Rob Herring , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/8] hw/arm/aspeed/2400: Check for CPU types in machine_run_board_init() Date: Tue, 23 Jan 2024 07:38:38 +0100 Message-ID: <20240123063842.35255-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240123063842.35255-1-philmd@linaro.org> References: <20240123063842.35255-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=philmd@linaro.org; helo=mail-ej1-x632.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=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1705992039687100003 Restrict MachineClass::valid_cpu_types[] to the single valid CPU type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater --- hw/arm/aspeed.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index cc59176563..e0e0877b1d 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -1147,6 +1147,11 @@ static int aspeed_soc_num_cpus(const char *soc_name) return sc->num_cpus; } =20 +static const char * const ast2400_a1_valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("arm926"), + NULL +}; + static void aspeed_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1175,6 +1180,7 @@ static void aspeed_machine_palmetto_class_init(Object= Class *oc, void *data) amc->spi_model =3D "mx25l25635f"; amc->num_cs =3D 1; amc->i2c_init =3D palmetto_bmc_i2c_init; + mc->valid_cpu_types =3D ast2400_a1_valid_cpu_types; mc->default_ram_size =3D 256 * MiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1192,6 +1198,7 @@ static void aspeed_machine_quanta_q71l_class_init(Obj= ectClass *oc, void *data) amc->spi_model =3D "mx25l25635e"; amc->num_cs =3D 1; amc->i2c_init =3D quanta_q71l_bmc_i2c_init; + mc->valid_cpu_types =3D ast2400_a1_valid_cpu_types; mc->default_ram_size =3D 128 * MiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1211,6 +1218,7 @@ static void aspeed_machine_supermicrox11_bmc_class_in= it(ObjectClass *oc, amc->num_cs =3D 1; amc->macs_mask =3D ASPEED_MAC0_ON | ASPEED_MAC1_ON; amc->i2c_init =3D palmetto_bmc_i2c_init; + mc->valid_cpu_types =3D ast2400_a1_valid_cpu_types; mc->default_ram_size =3D 256 * MiB; } =20 --=20 2.41.0 From nobody Tue Nov 26 17:46:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1705992025; cv=none; d=zohomail.com; s=zohoarc; b=BoJclAU1v7AOD43xe/yGAz7Uo49/+KTSpFSKXFX696N8K7+eybvhcFv3rnXkVZcpYT9/bX9KHkOtS0F98t/G2RK9oXNZVVPi2KFXmSo62S9BvTF4Zb3Sg/iEVLrKIc7WSVPQw7YHokQXOPqg/ULISlANdZT2D9epmfV98DLfB3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705992025; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ce+1xoISDEqzphDfXb+KFJwfSUtAI/2aaWKElbLspcc=; b=CGjQc7aTWFNDi0QaHnYD68pq8Nw3KLv0jxEtfbj2lSHGCqTk+ryPJ5+U7IrjMHO5NLT+lrfSyhh/cUFD9kcEfm6t+AvxKQbMdnDleEkWl7X2IkGIV9mbKZZ+sGRCGIYzE+j8v8HOcmDzvPSzTzDRpNK0/P9OxOnWUYyrH5JNrU8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705992025955456.6944045305172; Mon, 22 Jan 2024 22:40:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSARM-0003lJ-Bx; Tue, 23 Jan 2024 01:39:20 -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 1rSARK-0003iL-Ne for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:18 -0500 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSARI-00085s-U8 for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:18 -0500 Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2cdebb968feso45380861fa.1 for ; Mon, 22 Jan 2024 22:39:16 -0800 (PST) Received: from m1x-phil.lan ([176.187.194.78]) by smtp.gmail.com with ESMTPSA id vx4-20020a170907a78400b00a2d62a515e8sm11264326ejc.212.2024.01.22.22.39.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 22 Jan 2024 22:39:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705991955; x=1706596755; 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=ce+1xoISDEqzphDfXb+KFJwfSUtAI/2aaWKElbLspcc=; b=JHXiUwNszo6n9td+0KFwL4FbdF8xQC40nZfab4bz9rChyLWeEOSspcI+NDfqHLHkhX KtHTqmL4UleGsuCPiLJlPTo1odSI2MlyyLWPj6P8L17C0RLzhJXVRgNWb1EqfwGKtRQx G/4gng6nBkYlzH1UVNkyvXZwk32VS0xtz96Ly/uqF71ABnvO8A3kNOGCdmfm5tyVy1na YDaXh3nDf3VTeZM40sRTXgBQE3RjfqleSlRPCiE4BwFzE3VfHDsXZrbJS/CteRT13nH+ rn9FjwRU+jthwkMLi64QEL1kjdiGQwAS8XbPfceGuzGTTzexE83JmJQ+TLoYqzM1gzSU WTyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705991955; x=1706596755; 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=ce+1xoISDEqzphDfXb+KFJwfSUtAI/2aaWKElbLspcc=; b=q4j+U+9nm88lcj3KY3h64nT2a/zPiIqhuTao4ZKB8/bmHzYPlUnUq4OtI+GfbW2s4E L6dl6nje+u8st/MpLLdnKPMq7V6tAMHwgRJw77coDU9mSpetCnwxCLcrMU801t/V+tYZ rH8tdt0DltJ3u1HDe8Afy1bwPxOFcFrSSCyU1Bceorni+CHSgx31pvlmbsoyOFBmCjhE JqYdEM/K3tYFdrMBO3jA61YWW8xRb1NSAVXpMIX1lWX7LvM2Zk6Y5//+tlC0Q+VSHHGz F78cQXLJDZ1e00US+AaVQ5QwkxYoj73wnEjeW8PBTG+sQUowYnPnFzHkKDR7HQ3nuX90 lhKQ== X-Gm-Message-State: AOJu0YxoNfxVkF8QSK5MovOfJY3AJ0LZ5gOrWzUmFz8R/UVvX/I1XVER DfADC7Lf4pWPUGtCgkgNMxTqu43EpOJco6boEzgbWpvvVSNBmbAZdUeTl5I3lhdKCh8dTCOvajs eAiA= X-Google-Smtp-Source: AGHT+IHl0pbqLWKHoBxjvlx5Tf17dDP6DoRfRrflwwpHVy48/RhkSo6mMOqY7otpani6xs09RKPxXA== X-Received: by 2002:ac2:46e7:0:b0:50e:885d:4d1d with SMTP id q7-20020ac246e7000000b0050e885d4d1dmr1893073lfo.37.1705991954947; Mon, 22 Jan 2024 22:39:14 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Alistair Francis , Gavin Shan , Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, Igor Mitsyanko , Joel Stanley , "Edgar E. Iglesias" , Rob Herring , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 5/8] hw/arm/aspeed/2500: Check for CPU types in machine_run_board_init() Date: Tue, 23 Jan 2024 07:38:39 +0100 Message-ID: <20240123063842.35255-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240123063842.35255-1-philmd@linaro.org> References: <20240123063842.35255-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::230; envelope-from=philmd@linaro.org; helo=mail-lj1-x230.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1705992027737100006 Restrict MachineClass::valid_cpu_types[] to the single valid CPU type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater --- hw/arm/aspeed.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index e0e0877b1d..df627096d2 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -1152,6 +1152,11 @@ static const char * const ast2400_a1_valid_cpu_types= [] =3D { NULL }; =20 +static const char * const ast2500_a1_valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("arm1176"), + NULL +}; + static void aspeed_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1236,6 +1241,7 @@ static void aspeed_machine_supermicro_x11spi_bmc_clas= s_init(ObjectClass *oc, amc->num_cs =3D 1; amc->macs_mask =3D ASPEED_MAC0_ON | ASPEED_MAC1_ON; amc->i2c_init =3D palmetto_bmc_i2c_init; + mc->valid_cpu_types =3D ast2500_a1_valid_cpu_types; mc->default_ram_size =3D 512 * MiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1253,6 +1259,7 @@ static void aspeed_machine_ast2500_evb_class_init(Obj= ectClass *oc, void *data) amc->spi_model =3D "mx25l25635f"; amc->num_cs =3D 1; amc->i2c_init =3D ast2500_evb_i2c_init; + mc->valid_cpu_types =3D ast2500_a1_valid_cpu_types; mc->default_ram_size =3D 512 * MiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1271,6 +1278,7 @@ static void aspeed_machine_yosemitev2_class_init(Obje= ctClass *oc, void *data) amc->spi_model =3D "mx25l25635e"; amc->num_cs =3D 2; amc->i2c_init =3D yosemitev2_bmc_i2c_init; + mc->valid_cpu_types =3D ast2500_a1_valid_cpu_types; mc->default_ram_size =3D 512 * MiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1288,6 +1296,7 @@ static void aspeed_machine_romulus_class_init(ObjectC= lass *oc, void *data) amc->spi_model =3D "mx66l1g45g"; amc->num_cs =3D 2; amc->i2c_init =3D romulus_bmc_i2c_init; + mc->valid_cpu_types =3D ast2500_a1_valid_cpu_types; mc->default_ram_size =3D 512 * MiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1306,6 +1315,7 @@ static void aspeed_machine_tiogapass_class_init(Objec= tClass *oc, void *data) amc->spi_model =3D "mx25l25635e"; amc->num_cs =3D 2; amc->i2c_init =3D tiogapass_bmc_i2c_init; + mc->valid_cpu_types =3D ast2500_a1_valid_cpu_types; mc->default_ram_size =3D 1 * GiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1324,6 +1334,7 @@ static void aspeed_machine_sonorapass_class_init(Obje= ctClass *oc, void *data) amc->spi_model =3D "mx66l1g45g"; amc->num_cs =3D 2; amc->i2c_init =3D sonorapass_bmc_i2c_init; + mc->valid_cpu_types =3D ast2500_a1_valid_cpu_types; mc->default_ram_size =3D 512 * MiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1341,6 +1352,7 @@ static void aspeed_machine_witherspoon_class_init(Obj= ectClass *oc, void *data) amc->spi_model =3D "mx66l1g45g"; amc->num_cs =3D 2; amc->i2c_init =3D witherspoon_bmc_i2c_init; + mc->valid_cpu_types =3D ast2500_a1_valid_cpu_types; mc->default_ram_size =3D 512 * MiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1398,6 +1410,7 @@ static void aspeed_machine_g220a_class_init(ObjectCla= ss *oc, void *data) amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC0_ON | ASPEED_MAC1_ON; amc->i2c_init =3D g220a_bmc_i2c_init; + mc->valid_cpu_types =3D ast2500_a1_valid_cpu_types; mc->default_ram_size =3D 1024 * MiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1416,6 +1429,7 @@ static void aspeed_machine_fp5280g2_class_init(Object= Class *oc, void *data) amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC0_ON | ASPEED_MAC1_ON; amc->i2c_init =3D fp5280g2_bmc_i2c_init; + mc->valid_cpu_types =3D ast2500_a1_valid_cpu_types; mc->default_ram_size =3D 512 * MiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); --=20 2.41.0 From nobody Tue Nov 26 17:46:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1705991971; cv=none; d=zohomail.com; s=zohoarc; b=K9Y96PPqQ4VnsviuJm7ubMyGfzBux5G4lGurXouWbZDRHdKkfw0BWwgrWxz0b4BsN3tbVhcTe0ohf570C/7ZIxqWkN6vNg9p0lXCPtbI/f/wj5Ldv1j/Joz919D7eVgvfkqi/YrnKhetrH0KsjuXcfLUEz96WC8J2SB0G4j3c7g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705991971; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=d2C77azz43915zIuIoKlnCQM/jW1+ruzYffMI8d4fYY=; b=aKjnS6I55F//oubV3vv8gLW2zWA1i9QkV4VwVTJtor1Lc9BtyPanhHuwgJIaChsByGYYdtTMQri5cqhds8XStS/pX9KZTYQonJnlm2MfjbwYb+tVppoB3XKi/ej3hXYKs+9S+wFp+iIIu54xNyZOrXOwLqGBh03l5r49mhx2oCI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705991971102810.5184717862803; Mon, 22 Jan 2024 22:39:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSARS-0003o2-3K; Tue, 23 Jan 2024 01:39:26 -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 1rSARQ-0003n6-Kz for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:24 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSARP-00086K-00 for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:24 -0500 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a2dc7827a97so424850566b.2 for ; Mon, 22 Jan 2024 22:39:22 -0800 (PST) Received: from m1x-phil.lan ([176.187.194.78]) by smtp.gmail.com with ESMTPSA id jx21-20020a170906ca5500b00a30d9c47f92sm16896ejb.15.2024.01.22.22.39.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 22 Jan 2024 22:39:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705991961; x=1706596761; 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=d2C77azz43915zIuIoKlnCQM/jW1+ruzYffMI8d4fYY=; b=rK18/Jg2pkaOJHGccEXn5j5jujHqc4prwNyUwF0uxEACcDZ3l56TDNuoFTjDNxa7uB XtbKI9uOApkA81oKt10uSpGDaEeuTSnunB7etdwAdMwjAda7ryBiMQpJlhb9SHxlg8lW SZxZKrFWogO7xET09dLKHCCN1/7+8XD+O9juGSh0ZzG4LKeXtXVMfAe8kZFps34RbJND +gE1XYebodIew67yVvx8gytg4NVGfKpvUaapj231sEn8lSZAQUGlLCTixz00fkpFZKCQ SumsevgH/UYeBbz9mdrp+TUMZYpqBRjFlpe+hM5a2J9MsiErJ/qyWBUgSho5bN3cHgQN gjcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705991961; x=1706596761; 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=d2C77azz43915zIuIoKlnCQM/jW1+ruzYffMI8d4fYY=; b=lwKG7h35nbXUuqYaVPBWfBH0PaZensJUQUIINQjEAVUH/5zpO0FGGYi04TYdPVO7Mn Xl94GqGDZttGcqJJ31WXTU2UeuLzmkgSeyl2NDXdHFiYw1heakJ912ng5Qz9Edb5Tuc5 VJJwvSByTPxnRuCLkRuHHk19dJkeqvycXM5BnCR4x6ZMmz1Muufk7EShfDkXBkzfKGkd ehItlet8GOo2x7v9JFId52DSJJE0dzWcznQ8ZxGi8s/8OY3U/GhsYTMh7j8uwjkEqBnK sA/YUZ52jjzayVmzJZtHq7FEMAhQ2G2bsb5pNPAf7NKMZxDzgB3OujlPjrktD5BIFSLE u9iA== X-Gm-Message-State: AOJu0Ywjvv1JJMTUQckKmL63Dn4LLZuE/5NGPSrp7x30jyTdXYwWsQ8O txCw1HyEeOxY+atjG7SAidpb87TujG1g9d8FEwtw2z0YvQVJnUOfx/N3jaqsrsDSyAwmvzeHQkI JyF8= X-Google-Smtp-Source: AGHT+IEj8i4UpNbA6phQkKEIgn78CvYE8sF5Tzho+WkHlTmKNpLq4f3yqkeChak6w51ttYTbEHSR1w== X-Received: by 2002:a17:906:4ac7:b0:a29:335f:4248 with SMTP id u7-20020a1709064ac700b00a29335f4248mr2660526ejt.45.1705991961146; Mon, 22 Jan 2024 22:39:21 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Alistair Francis , Gavin Shan , Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, Igor Mitsyanko , Joel Stanley , "Edgar E. Iglesias" , Rob Herring , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 6/8] hw/arm/aspeed/2600: Check for CPU types in machine_run_board_init() Date: Tue, 23 Jan 2024 07:38:40 +0100 Message-ID: <20240123063842.35255-7-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240123063842.35255-1-philmd@linaro.org> References: <20240123063842.35255-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.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=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1705991973365100003 Restrict MachineClass::valid_cpu_types[] to the single valid CPU type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/aspeed.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index df627096d2..393c97d55e 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -1157,6 +1157,11 @@ static const char * const ast2500_a1_valid_cpu_types= [] =3D { NULL }; =20 +static const char * const ast2600_a3_valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("cortex-a9"), + NULL +}; + static void aspeed_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1373,6 +1378,7 @@ static void aspeed_machine_ast2600_evb_class_init(Obj= ectClass *oc, void *data) amc->macs_mask =3D ASPEED_MAC0_ON | ASPEED_MAC1_ON | ASPEED_MAC2_ON | ASPEED_MAC3_ON; amc->i2c_init =3D ast2600_evb_i2c_init; + mc->valid_cpu_types =3D ast2600_a3_valid_cpu_types; mc->default_ram_size =3D 1 * GiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1392,6 +1398,7 @@ static void aspeed_machine_tacoma_class_init(ObjectCl= ass *oc, void *data) amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC2_ON; amc->i2c_init =3D witherspoon_bmc_i2c_init; /* Same board layout */ + mc->valid_cpu_types =3D ast2600_a3_valid_cpu_types; mc->default_ram_size =3D 1 * GiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1449,6 +1456,7 @@ static void aspeed_machine_rainier_class_init(ObjectC= lass *oc, void *data) amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC2_ON | ASPEED_MAC3_ON; amc->i2c_init =3D rainier_bmc_i2c_init; + mc->valid_cpu_types =3D ast2600_a3_valid_cpu_types; mc->default_ram_size =3D 1 * GiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1471,6 +1479,7 @@ static void aspeed_machine_fuji_class_init(ObjectClas= s *oc, void *data) amc->macs_mask =3D ASPEED_MAC3_ON; amc->i2c_init =3D fuji_bmc_i2c_init; amc->uart_default =3D ASPEED_DEV_UART1; + mc->valid_cpu_types =3D ast2600_a3_valid_cpu_types; mc->default_ram_size =3D FUJI_BMC_RAM_SIZE; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1492,6 +1501,7 @@ static void aspeed_machine_bletchley_class_init(Objec= tClass *oc, void *data) amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC2_ON; amc->i2c_init =3D bletchley_bmc_i2c_init; + mc->valid_cpu_types =3D ast2600_a3_valid_cpu_types; mc->default_ram_size =3D BLETCHLEY_BMC_RAM_SIZE; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1631,6 +1641,7 @@ static void aspeed_machine_qcom_dc_scm_v1_class_init(= ObjectClass *oc, amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC2_ON | ASPEED_MAC3_ON; amc->i2c_init =3D qcom_dc_scm_bmc_i2c_init; + mc->valid_cpu_types =3D ast2600_a3_valid_cpu_types; mc->default_ram_size =3D 1 * GiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); @@ -1651,6 +1662,7 @@ static void aspeed_machine_qcom_firework_class_init(O= bjectClass *oc, amc->num_cs =3D 2; amc->macs_mask =3D ASPEED_MAC2_ON | ASPEED_MAC3_ON; amc->i2c_init =3D qcom_dc_scm_firework_i2c_init; + mc->valid_cpu_types =3D ast2600_a3_valid_cpu_types; mc->default_ram_size =3D 1 * GiB; mc->default_cpus =3D mc->min_cpus =3D mc->max_cpus =3D aspeed_soc_num_cpus(amc->soc_name); --=20 2.41.0 From nobody Tue Nov 26 17:46:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1705992025; cv=none; d=zohomail.com; s=zohoarc; b=iWTtCQ1WcomSA/p/rDaneIIUfnNezFtRKQm3I/MVe12vdVqC0FikIGZrWR61wGDnfMaYIqbqBxMNxMBFsvwmHUopdpSGSAoIRQtw9sxsnPMCTPZTycG7nMHxaEQRA6wDqu676AY7PowrIPyChpQUbNDwYLc37JOMljY2xIAQyNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705992025; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ONN8zUFU0/kjuTx5JtjFzfx6OgyKBiCsAIN6XbeS+GY=; b=Xz5w35llp/oa8DUhSZDtp5lYt2wteoKyVEle3hGVouCIaRAeDMSUc16IAajSGvry1LoXnCUMQGM5btQuZPfieLOlfAuiy5Q9LEfNxb5hDvhB+69M2w7ub3zoXmzlBoXTHA1K77VVVPJhKeMNFm14hXa/oDogfOTOErMoP1fFrsI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705992025956280.10505367928226; Mon, 22 Jan 2024 22:40:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSARY-00044X-0U; Tue, 23 Jan 2024 01:39:32 -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 1rSARW-0003y2-06 for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:30 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSARU-00087N-H9 for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:29 -0500 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-55a3a875f7fso4285060a12.3 for ; Mon, 22 Jan 2024 22:39:28 -0800 (PST) Received: from m1x-phil.lan ([176.187.194.78]) by smtp.gmail.com with ESMTPSA id bt16-20020a170906b15000b00a2ada87f6a1sm14122434ejb.90.2024.01.22.22.39.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 22 Jan 2024 22:39:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705991967; x=1706596767; 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=ONN8zUFU0/kjuTx5JtjFzfx6OgyKBiCsAIN6XbeS+GY=; b=ONb2HzlNHOnMwe8CIcIOp+2+6v0KJjzMp3PFIZxST/a2YGw+W5WYkrHL/459iAXDzV qAn3knJSniTpzncKDhCLNyEbhKwcNuW8IrZK3dcPWqQdDs+iTeOym4U6MVYee23sm45/ 8ZcBYeknWSzngARyjiS2ArsmM0z53HOz/Ew0lM3BUqUL5Sm/q2+Bq7bog5BApJK7BZ45 Jvb+SnQVsmEcIXQ43tTh4Fs69srMfkparCDQrgv0q8ff8XDs6Ne9VuO03HovEwPIYwm4 5ejPG9WwyAKQ2DauN1mx8c5SXAl3rFUX0QCelVD1oAU+ycmSPiyKD7NmxjojTth89aPr S48Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705991967; x=1706596767; 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=ONN8zUFU0/kjuTx5JtjFzfx6OgyKBiCsAIN6XbeS+GY=; b=OmB73safn8WWz+LfcK1vVNVng9634c15PWDZVlikFRqaKqK/f9UpGRv7KHR9WeGKN6 KFl97tpg2s0CZudgnamkyivO1zn4khPVWIw2VHqgLnKReovukpE9hh44NLEYBADKNyZg WuTQhGuA99jixhqdZ+chi27KVqU0c3vsF2fOZTlMvV/ANUWjkMReQO2usLXJuG86rV0s rEPi9Z/cdyo5n/vbOZWo+mEgJnRHrCYArS0VM+dHqRx0KbwINeS/sFU2OllyKlIJjaLi At07GPxAGjCQI+Z/VTtKmyDQQkcltaH3B0nrFV3NTJcxCESvV55rlAWs0K6Gf5QoUyk6 RuHw== X-Gm-Message-State: AOJu0YyX7XQdfwFtXX/gvtdBQBIFCkskTz78kk4dGlRR8eL2fxc6H7KO +xLQnKlwWpxAvR75mK509k0mszZle1qGqvtmPpK5CSu3/AiUlfnmlb8AkHYntswkGAvdH9ODzyL q8Ns= X-Google-Smtp-Source: AGHT+IHuL5e+9tPUyEFbWPPDTIg5ou+khhcIfuw2z/J2l9i74JMMdvkHLlDlHX4e6VtC931gwL9gRw== X-Received: by 2002:a17:906:d52:b0:a30:b7a5:c34e with SMTP id r18-20020a1709060d5200b00a30b7a5c34emr276658ejh.17.1705991966915; Mon, 22 Jan 2024 22:39:26 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Alistair Francis , Gavin Shan , Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, Igor Mitsyanko , Joel Stanley , "Edgar E. Iglesias" , Rob Herring , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 7/8] hw/arm/aspeed/1030: Check for CPU types in machine_run_board_init() Date: Tue, 23 Jan 2024 07:38:41 +0100 Message-ID: <20240123063842.35255-8-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240123063842.35255-1-philmd@linaro.org> References: <20240123063842.35255-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=philmd@linaro.org; helo=mail-ed1-x532.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=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1705992027736100005 Restrict MachineClass::valid_cpu_types[] to the single valid CPU type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/aspeed.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 393c97d55e..62d08899d8 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -1162,6 +1162,11 @@ static const char * const ast2600_a3_valid_cpu_types= [] =3D { NULL }; =20 +static const char * const ast1030_a1_valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("cortex-m4"), /* TODO cortex-m4f */ + NULL +}; + static void aspeed_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1613,6 +1618,7 @@ static void aspeed_minibmc_machine_ast1030_evb_class_= init(ObjectClass *oc, AspeedMachineClass *amc =3D ASPEED_MACHINE_CLASS(oc); =20 mc->desc =3D "Aspeed AST1030 MiniBMC (Cortex-M4)"; + mc->valid_cpu_types =3D ast1030_a1_valid_cpu_types; amc->soc_name =3D "ast1030-a1"; amc->hw_strap1 =3D 0; amc->hw_strap2 =3D 0; --=20 2.41.0 From nobody Tue Nov 26 17:46:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1705992000; cv=none; d=zohomail.com; s=zohoarc; b=CJ2BFQ5bKlvT+eceH9gU6iWJTrcjDB0y/w8q+ibjBpH6Rw6gaT5clBIXehDYiTOV8kK5fdYe6ooL2usC4CfJCMZ9KqGd7hzOnZP39yguU+a4xRjnjnQXqg3i+qt0wrFHmyp6ZKwoEEXbEdr9nVcmi6Y8azDAIikiZwidvQp/Mec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705992000; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=39OP9EE9lF2EcfOzamU8x35qcADjGnzDFDx/nFOBMLk=; b=iRmab516ZAclniQ0yFiqisIEofvvQ9nPHfyE6wG63Az25Xlzo9ew6E5DASbVHI+MAfH0UPAUf5PRCacSCaYzJ/hZOY0zmnsQ5PGTQYRGJSIxHXVmuX5TylAUz4QSOt2qNJXvGQWIaAjLh/42/yDbYwmfJPheLNXcveamb6iPfH8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705992000894852.6938833944449; Mon, 22 Jan 2024 22:40:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSARg-0004AJ-Ry; Tue, 23 Jan 2024 01:39:40 -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 1rSARc-00048k-Qp for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:36 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSARb-0008AB-As for qemu-devel@nongnu.org; Tue, 23 Jan 2024 01:39:36 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40e8fec0968so50963985e9.1 for ; Mon, 22 Jan 2024 22:39:34 -0800 (PST) Received: from m1x-phil.lan ([176.187.194.78]) by smtp.gmail.com with ESMTPSA id c21-20020a17090654d500b00a2ad1182e36sm14134270ejp.9.2024.01.22.22.39.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 22 Jan 2024 22:39:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705991972; x=1706596772; 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=39OP9EE9lF2EcfOzamU8x35qcADjGnzDFDx/nFOBMLk=; b=EIOczz3LhfvJ4hYnFW7VCm3+2+m/ZkvDJJdq5uhzDH5cKjTVdiZSSt28TvVtrCjGWA gPKpsDmvmhyFXCvJas3L2uWvpmqUnlbzRApRm24MrgZ6wGn+wcBs1xTw6Q8N2/E/nuVc 25/nb7zynPqDlR0GEl8/NOTA9U4MED/NNRuSofSFdF/iqa0XAri/ZqMjMTeh+8USrtRj CHQQ3NLQYIa947NNRqbXt4vIls0PmiBhB5aFsO/ps3sDhsvOVQ5Cxa7LTbd6ppkRFRxX 2qlBRfpifx8gXBrybJd7oNjGvkoqZD3T2GcxJfR8VKV/ZW0AHmINV+3E8liU6EWg6Smz KthA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705991972; x=1706596772; 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=39OP9EE9lF2EcfOzamU8x35qcADjGnzDFDx/nFOBMLk=; b=HKtDCuEpGRG2gTOhP7ZwNg81pM/IZZeBUfyVcVCPT6W9vNPpQ1K/pkd8qOsE0dYCDA Lb05gmOINL1zTl2B1eDb/YMYlW0ZLiP+svdKt/obWBElwtmHq+TfGawPdCyy/jUjnAZ7 a6bFRdvtm52Zu0i6Ih0t1bHxPzGxvM4bGhgBM3cL3KpL1Z2q1BDDvo9H6d9AdlxqmDOd xzFAEMm+XygyfBLtE0uojqrJDFWU000gzUlqe65e8Pcu9UGA8e0ssf3+FuvE4to4ZuX8 7PoGnYkj94yFPO1i7jAjbqgmBeKMEQhUAuo4NuqIhaaRpmkrapkNyFPxhjwiafyJAroN 3VBw== X-Gm-Message-State: AOJu0YweuClxAQS4zXkis8vIytHCxvQNb1kMeRRj1AI1ZHNrATz711vV fEYSqB0CoWDUbXxSZgPiUrV0SLj1L8/+fWFUIMNlBZPfK47SwKfEZqTLpNNJVCLCxmsBUcm8DCf dAQE= X-Google-Smtp-Source: AGHT+IEDbiHmqBlmZZBK+ETn6jUjhUWKBsiRVDTufvBTAvrdo6/JbZ3APqx8VxqrYAAFIsFsBqVhnA== X-Received: by 2002:a05:600c:c19:b0:40d:889a:4eab with SMTP id fm25-20020a05600c0c1900b0040d889a4eabmr228878wmb.87.1705991972759; Mon, 22 Jan 2024 22:39:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Alistair Francis , Gavin Shan , Andrew Jeffery , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-arm@nongnu.org, Igor Mitsyanko , Joel Stanley , "Edgar E. Iglesias" , Rob Herring , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 8/8] hw/arm/zynq: Check for CPU types in machine_run_board_init() Date: Tue, 23 Jan 2024 07:38:42 +0100 Message-ID: <20240123063842.35255-9-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240123063842.35255-1-philmd@linaro.org> References: <20240123063842.35255-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1705992001480100001 Restrict MachineClass::valid_cpu_types[] to the single valid CPU type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/xilinx_zynq.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 66d0de139f..6ec65d4780 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -355,6 +355,10 @@ static void zynq_init(MachineState *machine) =20 static void zynq_machine_class_init(ObjectClass *oc, void *data) { + static const char * const valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("cortex-a9"), + NULL + }; MachineClass *mc =3D MACHINE_CLASS(oc); mc->desc =3D "Xilinx Zynq Platform Baseboard for Cortex-A9"; mc->init =3D zynq_init; @@ -362,6 +366,7 @@ static void zynq_machine_class_init(ObjectClass *oc, vo= id *data) mc->no_sdcard =3D 1; mc->ignore_memory_transaction_failures =3D true; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-a9"); + mc->valid_cpu_types =3D valid_cpu_types; mc->default_ram_id =3D "zynq.ext_ram"; } =20 --=20 2.41.0