From nobody Sun Sep 28 17:07:16 2025 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1758871176; cv=pass; d=zohomail.com; s=zohoarc; b=mnYXcbB9MzjrfR7LwuWgzlSRktGboluIQb7sJF6HcFPsEuh7xt0dwP4h05ekr1ntUPKLDVhdd98iUvJqQ6XDsJ1byVZ1SNuuYb7bpqCxiUZCCvu5bGegs93GsB3l47j6869sl9es5O1bLz7/I2GGyepjOVQ1IarOLAkPkzTQnRs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758871176; 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=5iZb/aLlzlNcGIYWGAJYFwm42DZ1TqAeWTLIrnw8Vl8=; b=dlJ3SE5aHl87+6SPAEvRG1+tM5wsVWE+J9LJK/TeGkRbtX2CSIswIG3hEbn4+9AbVIr+YeYmVRIYuoXXcB7ODr3JPYhCzk+2Y7Xt9+5RHsBGREugx2w9YTIyNB7ZhURgIVo9yCtjOwasNJS7hl18shORmPyMlPurFVQyBAYaLfM= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175887117619239.96901320186862; Fri, 26 Sep 2025 00:19:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v22dP-0002eJ-DY; Fri, 26 Sep 2025 03:12:51 -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 1v22b3-0007On-E7; Fri, 26 Sep 2025 03:10:25 -0400 Received: from mail-northcentralusazlp170120005.outbound.protection.outlook.com ([2a01:111:f403:c105::5] helo=CH5PR02CU005.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v22ab-0006lz-GC; Fri, 26 Sep 2025 03:10:19 -0400 Received: from SA0PR11CA0179.namprd11.prod.outlook.com (2603:10b6:806:1bb::34) by CH3PR12MB8282.namprd12.prod.outlook.com (2603:10b6:610:124::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.11; Fri, 26 Sep 2025 07:09:41 +0000 Received: from SN1PEPF0002BA4C.namprd03.prod.outlook.com (2603:10b6:806:1bb:cafe::f5) by SA0PR11CA0179.outlook.office365.com (2603:10b6:806:1bb::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9160.10 via Frontend Transport; Fri, 26 Sep 2025 07:09:41 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by SN1PEPF0002BA4C.mail.protection.outlook.com (10.167.242.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9160.9 via Frontend Transport; Fri, 26 Sep 2025 07:09:41 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Fri, 26 Sep 2025 00:09:27 -0700 Received: from satlexmb07.amd.com (10.181.42.216) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Fri, 26 Sep 2025 02:09:27 -0500 Received: from XFR-LUMICHEL-L2.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Fri, 26 Sep 2025 00:09:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KuLJUVzEG7b4BbwXQBxvQQcjUS+P8G+HCaC8bD6YwBrQT8xfnM40fqKZrwItbjpB8GTBx69/i1zamG+gu7/b9epjkLRm6E8z/7FL7q9U1nYNnpBRNi9RqYtfX46V05q+2k50pHgBaadPeMKZ34P1C2YLzBR1DEctmpEVUoovOwrMrDxUoTxrOiF9CfzRip/TflphsXQutfm0AIv20Pzd69ofcArYcDLF89GMFdSCicYxdhLAeUxpKpb5wTsd/Xz4m5XApJuPcrgdLCloztJRPAXYb5Bh0D+WgWBwT+rmBDAGjW6fU+r22L/2HXarxD0nzUIEn4MwYUzaWdAzPcxGRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5iZb/aLlzlNcGIYWGAJYFwm42DZ1TqAeWTLIrnw8Vl8=; b=PE8ejOiYqFv84w4/2UhK9qoOXL15BQ3qfWKk6T8k5ps6X2KqahCNIHPha3nPG3t7UfVGV1s/hpWxmDNoDPSFiKWrKpxMTU3uvDM8Vb1Xio6OsHJ2h20WIkll8kh1YWgeTYyAynbysMtzWz+6D8nFtQ5mo4qG+ulewcYbqvNaeAeGuKPai35YmgokTbmUwN0vT0HONg3Q7f62HITDOGDA4H90RybKnry6oyr8iyz2bVLU7Glq0uSUcWuGcysctSqrJRbaJ1kmhcX/f4JAex3uCCwxkzLobGG7zN02+j9Ryl9tYElddK80GQXff00UVLWPw0245ZsPnBR7Ed96XTfqyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5iZb/aLlzlNcGIYWGAJYFwm42DZ1TqAeWTLIrnw8Vl8=; b=vjb10Mq4tXxTtCe5rs71ijoXNKEsqeYvgxoEYQWnO1/hYbtn62Wg4xG9B8TZ5V1IoXOcOfLvQva/KW4ZK2nEqti3VqGjBTZzO0UmSl5o5+BOggL9zGepFbgnyzYhRxec1Ptjy3XKT/7Ci6hX9nz2DFhsFdmbK5V0zEzciesCFGM= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; 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 (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C From: Luc Michel To: , CC: Luc Michel , Peter Maydell , Francisco Iglesias , "Edgar E . Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , "Frederic Konrad" , Sai Pavan Boddu Subject: [PATCH v6 42/47] hw/arm/xlnx-versal-virt: split into base/concrete classes Date: Fri, 26 Sep 2025 09:08:00 +0200 Message-ID: <20250926070806.292065-43-luc.michel@amd.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250926070806.292065-1-luc.michel@amd.com> References: <20250926070806.292065-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002BA4C:EE_|CH3PR12MB8282:EE_ X-MS-Office365-Filtering-Correlation-Id: 97cedba1-c950-4a91-aa85-08ddfccba9d6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?j1WS+l73+4bQY0Lp03TlWQVXuJmG7bzK5p2erS+hetZg8Ly8a5Q1CluCSk9w?= =?us-ascii?Q?4KkFE/jP9JjiuRrpS2lnzwNfxa2ZinE321qgt7z50IOuOr7LApqashNujbED?= =?us-ascii?Q?657BOUZuNI3qcIN2svvbZDARp20YB2/MhyECzzl7lHODIiM3UfHj4m2E8Cn3?= =?us-ascii?Q?WG1yYS3EDlQcd3TjGViY/S/XK6dbbJPbFFgBTSXadN8jqYald/H0V9zXg2hv?= =?us-ascii?Q?eHSCnzx48kEDbUxdjfDmSAjsbPLeWW/VXg6lKiJ/758ysk24PsvzUtwdkVWp?= =?us-ascii?Q?8oxnSQX+eb5IE7QTvfzb/CaRQOl56oD0G/Xjnk5oK3PDuONjFX6wRGVbHTTe?= =?us-ascii?Q?PTa7oyUSmKcJLo56gUSgJWWhbEfzxVU8UszCNkcbIrJnUENwxzxcPfusdE58?= =?us-ascii?Q?wLd9sixI98gASrQEMfy4x5DxHlpjzi9vmyvvchNo03ImVZXzNwHbHD7Y5Bc8?= =?us-ascii?Q?JWboTnFWDzRHhj68uvynI4JP1O9lg0Z3vd/TAM2+qDpnhPLbBDuEDJn39dVU?= =?us-ascii?Q?hecLahwiZmQmJ663AMMo/I1AEf/BUFW2Jc8G3/qtDqzXf6N4WW0JjLDRZjWz?= =?us-ascii?Q?fBjwbBTX+cAk64MO4pRDmQ+MRRthxUsEXsLergEuOU+lLYcd2Ojz8AfRSD7S?= =?us-ascii?Q?mHIIRGMayFuSm2hbutIHAknMHK0FbMBlqlt516swqoiM6TvwQTaLMlZvLN+Z?= =?us-ascii?Q?TP9GvjvV3JpQT3nJ3psaPQ2pOPsGEDuACw35z4+SY12UI3C9d+/HKDwDZLmr?= =?us-ascii?Q?e1lDeftIq8PY70rkr1lnUVASFagXnh3KpuX9Oh3PTa8EMP8aDCEIxD5eIN2y?= =?us-ascii?Q?80w0A+lb6Bk0OOfFUor7rjq95xGizdN1Dp5h2iLRLu0cpw347JQT9z+XHeB/?= =?us-ascii?Q?48Py+sAvPWUWwJ9Ioi6wCHtQ45RrGapu+dXpHZ1n85FhQE9bIjaiAFcersYU?= =?us-ascii?Q?69T348SfrXbUpbm9wmFJjN9+ebBEJlU1B1Kj0NMwtKzikPKI/Sv8ouWLdv98?= =?us-ascii?Q?YewizTGddcepaT4aN2N7y1hk8Hwe43OYSSUl0ioCHD2P7G0pbgsD4pZwRFcj?= =?us-ascii?Q?F/MXihZtGd51zzWcMYbKBI2hM3oZ4g78uMwwDviHCsn1RGGd1Vm9e496+Y7A?= =?us-ascii?Q?DM0oWxjom46gvAJurfCkbFF4SPixeKJiqVM9AK78439kOIz04cmfaACawnFn?= =?us-ascii?Q?IG0RFUfv631emZh/VuaOQOReeWad3nQsqKLu24khcnM3i7WgGXCJrx3XPcPi?= =?us-ascii?Q?rRCLP8slLYIJfjoy9h10r8DpT6s5X/1uG1Bm+zV2RPQyDNVf20r6MkdfiqOd?= =?us-ascii?Q?U5h2qpf8WUXWgR+k0TwR4JfgacLrJt6LYD0g/Uueb7a2kFASJRIRjIp1bN3s?= =?us-ascii?Q?ZZAG+MEYCFGbyrwWC0XhpkU2l+sYndmYEZ5eVll97wJfNH6p4vPT0qkWv7/4?= =?us-ascii?Q?ygkseSn99L+3Ic8tki0YnRrdpszwiOPG73mbLXxb9Z4aMlZG7vw1B89cXF3u?= =?us-ascii?Q?BpFKT5+M1Oo5wPzk2GNFY3DdZt6i8By1tbph?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2025 07:09:41.3714 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 97cedba1-c950-4a91-aa85-08ddfccba9d6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002BA4C.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8282 Received-SPF: permerror client-ip=2a01:111:f403:c105::5; envelope-from=Luc.Michel@amd.com; helo=CH5PR02CU005.outbound.protection.outlook.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FORGED_SPF_HELO=1, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01 autolearn=no 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 @amd.com) X-ZM-MESSAGEID: 1758871178593116600 Content-Type: text/plain; charset="utf-8" Split the xlnx-versal-virt machine type into a base abstract type and a concrete type. There is no functional change. This is in preparation for the versal2 machine. Signed-off-by: Luc Michel Reviewed-by: Francisco Iglesias Reviewed-by: Edgar E. Iglesias --- hw/arm/xlnx-versal-virt.c | 74 +++++++++++++++++++++++++++------------ 1 file changed, 52 insertions(+), 22 deletions(-) diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 6ef56103a75..f9abb9ed639 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -24,12 +24,15 @@ #include "hw/arm/boot.h" #include "target/arm/multiprocessing.h" #include "qom/object.h" #include "target/arm/cpu.h" =20 +#define TYPE_XLNX_VERSAL_VIRT_BASE_MACHINE \ + MACHINE_TYPE_NAME("amd-versal-virt-base") +OBJECT_DECLARE_TYPE(VersalVirt, VersalVirtClass, XLNX_VERSAL_VIRT_BASE_MAC= HINE) + #define TYPE_XLNX_VERSAL_VIRT_MACHINE MACHINE_TYPE_NAME("amd-versal-virt") -OBJECT_DECLARE_SIMPLE_TYPE(VersalVirt, XLNX_VERSAL_VIRT_MACHINE) =20 #define XLNX_VERSAL_NUM_OSPI_FLASH 4 =20 struct VersalVirt { MachineState parent_obj; @@ -50,10 +53,16 @@ struct VersalVirt { bool secure; char *ospi_model; } cfg; }; =20 +struct VersalVirtClass { + MachineClass parent_class; + + VersalVersion version; +}; + static void fdt_create(VersalVirt *s) { MachineClass *mc =3D MACHINE_GET_CLASS(s); const char versal_compat[] =3D "amd-versal-virt\0xlnx-versal-virt"; =20 @@ -191,27 +200,28 @@ static void sd_plug_card(VersalVirt *s, int idx, Driv= eInfo *di) versal_sdhci_plug_card(&s->soc, idx, blk); } =20 static char *versal_get_ospi_model(Object *obj, Error **errp) { - VersalVirt *s =3D XLNX_VERSAL_VIRT_MACHINE(obj); + VersalVirt *s =3D XLNX_VERSAL_VIRT_BASE_MACHINE(obj); =20 return g_strdup(s->cfg.ospi_model); } =20 static void versal_set_ospi_model(Object *obj, const char *value, Error **= errp) { - VersalVirt *s =3D XLNX_VERSAL_VIRT_MACHINE(obj); + VersalVirt *s =3D XLNX_VERSAL_VIRT_BASE_MACHINE(obj); =20 g_free(s->cfg.ospi_model); s->cfg.ospi_model =3D g_strdup(value); } =20 =20 static void versal_virt_init(MachineState *machine) { - VersalVirt *s =3D XLNX_VERSAL_VIRT_MACHINE(machine); + VersalVirt *s =3D XLNX_VERSAL_VIRT_BASE_MACHINE(machine); + VersalVirtClass *vvc =3D XLNX_VERSAL_VIRT_BASE_MACHINE_GET_CLASS(machi= ne); int psci_conduit =3D QEMU_PSCI_CONDUIT_DISABLED; int i; =20 /* * If the user provides an Operating System to be loaded, we expect th= em @@ -239,15 +249,15 @@ static void versal_virt_init(MachineState *machine) if (machine->kernel_filename) { psci_conduit =3D QEMU_PSCI_CONDUIT_SMC; } =20 object_initialize_child(OBJECT(machine), "xlnx-versal", &s->soc, - TYPE_XLNX_VERSAL); + versal_get_class(vvc->version)); object_property_set_link(OBJECT(&s->soc), "ddr", OBJECT(machine->ram), &error_abort); =20 - for (i =3D 0; i < versal_get_num_can(VERSAL_VER_VERSAL); i++) { + for (i =3D 0; i < versal_get_num_can(vvc->version); i++) { g_autofree char *prop_name =3D g_strdup_printf("canbus%d", i); =20 object_property_set_link(OBJECT(&s->soc), prop_name, OBJECT(s->canbus[i]), &error_abort); @@ -272,11 +282,11 @@ static void versal_virt_init(MachineState *machine) =20 /* Attach efuse backend, if given */ efuse_attach_drive(s); =20 /* Plug SD cards */ - for (i =3D 0; i < versal_get_num_sdhci(VERSAL_VER_VERSAL); i++) { + for (i =3D 0; i < versal_get_num_sdhci(vvc->version); i++) { sd_plug_card(s, i, drive_get(IF_SD, 0, i)); } =20 s->binfo.ram_size =3D machine->ram_size; s->binfo.loader_start =3D 0x0; @@ -316,14 +326,15 @@ static void versal_virt_init(MachineState *machine) } } =20 static void versal_virt_machine_instance_init(Object *obj) { - VersalVirt *s =3D XLNX_VERSAL_VIRT_MACHINE(obj); + VersalVirt *s =3D XLNX_VERSAL_VIRT_BASE_MACHINE(obj); + VersalVirtClass *vvc =3D XLNX_VERSAL_VIRT_BASE_MACHINE_GET_CLASS(s); size_t i, num_can; =20 - num_can =3D versal_get_num_can(VERSAL_VER_VERSAL); + num_can =3D versal_get_num_can(vvc->version); s->canbus =3D g_new0(CanBusState *, num_can); =20 /* * User can set canbusx properties to can-bus object and optionally co= nnect * to socketcan interface via command line. @@ -337,47 +348,66 @@ static void versal_virt_machine_instance_init(Object = *obj) } } =20 static void versal_virt_machine_finalize(Object *obj) { - VersalVirt *s =3D XLNX_VERSAL_VIRT_MACHINE(obj); + VersalVirt *s =3D XLNX_VERSAL_VIRT_BASE_MACHINE(obj); =20 g_free(s->cfg.ospi_model); g_free(s->canbus); } =20 -static void versal_virt_machine_class_init(ObjectClass *oc, const void *da= ta) +static void versal_virt_machine_class_init_common(ObjectClass *oc) { MachineClass *mc =3D MACHINE_CLASS(oc); - int num_cpu =3D versal_get_num_cpu(VERSAL_VER_VERSAL); + VersalVirtClass *vvc =3D XLNX_VERSAL_VIRT_BASE_MACHINE_CLASS(mc); + int num_cpu =3D versal_get_num_cpu(vvc->version); =20 - mc->desc =3D "AMD Versal Virtual development board"; - mc->alias =3D "xlnx-versal-virt"; - mc->init =3D versal_virt_init; - mc->min_cpus =3D num_cpu; - mc->max_cpus =3D num_cpu; - mc->default_cpus =3D num_cpu; mc->no_cdrom =3D true; mc->auto_create_sdcard =3D true; mc->default_ram_id =3D "ddr"; + mc->min_cpus =3D num_cpu; + mc->max_cpus =3D num_cpu; + mc->default_cpus =3D num_cpu; + mc->init =3D versal_virt_init; + object_class_property_add_str(oc, "ospi-flash", versal_get_ospi_model, versal_set_ospi_model); object_class_property_set_description(oc, "ospi-flash", "Change the OSPI Flash model"); } =20 -static const TypeInfo versal_virt_machine_init_typeinfo =3D { - .name =3D TYPE_XLNX_VERSAL_VIRT_MACHINE, +static void versal_virt_machine_class_init(ObjectClass *oc, const void *da= ta) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + VersalVirtClass *vvc =3D XLNX_VERSAL_VIRT_BASE_MACHINE_CLASS(oc); + + mc->desc =3D "AMD Versal Virtual development board"; + mc->alias =3D "xlnx-versal-virt"; + vvc->version =3D VERSAL_VER_VERSAL; + + versal_virt_machine_class_init_common(oc); +} + +static const TypeInfo versal_virt_base_machine_init_typeinfo =3D { + .name =3D TYPE_XLNX_VERSAL_VIRT_BASE_MACHINE, .parent =3D TYPE_MACHINE, - .class_init =3D versal_virt_machine_class_init, + .class_size =3D sizeof(VersalVirtClass), .instance_init =3D versal_virt_machine_instance_init, .instance_size =3D sizeof(VersalVirt), .instance_finalize =3D versal_virt_machine_finalize, + .abstract =3D true, +}; + +static const TypeInfo versal_virt_machine_init_typeinfo =3D { + .name =3D TYPE_XLNX_VERSAL_VIRT_MACHINE, + .parent =3D TYPE_XLNX_VERSAL_VIRT_BASE_MACHINE, + .class_init =3D versal_virt_machine_class_init, }; =20 static void versal_virt_machine_init_register_types(void) { + type_register_static(&versal_virt_base_machine_init_typeinfo); type_register_static(&versal_virt_machine_init_typeinfo); } =20 type_init(versal_virt_machine_init_register_types) - --=20 2.51.0