From nobody Sat Nov 15 04:16:34 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=1755782219; cv=pass; d=zohomail.com; s=zohoarc; b=JuBRiZkMZ1m/ZG64aMhU2KM/TEQPEOH1MofD9MAQzA3bkZNSMq/zD1zTMzLadj1jM81BfkT/I9COUau+BDoVhZqQvoOpBPtAx2MqQzekuRUorBBc7A2A/e4LIM4KqeEDvJQA8jPYkENe9JipMyONdtQsdlc4DfDutenCNe+vWFY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755782219; 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=BJDKCJKOfFmoaSyF9n5K4QWhlTiOwVYZGvkbfy9QhHA=; b=XF1W7muB1k0jfv54xxF1w1H7dZxDZqtkMkqEitTZmcAKdxbJBCI0agLpewn6TG8oVB/ViPrsxGavsybs9heKdAHfa8ViaMkbbu/QW4rq+pa4dcCrV+Y5uZpbRInCF7lgc65MXp58tw5629Sp23wvJWav0FkzosYm1NSkmm0Hub8= 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 1755782219736770.5540613828547; Thu, 21 Aug 2025 06:16:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1up50d-0005AZ-Pg; Thu, 21 Aug 2025 09:07:16 -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 1up4zB-0002Sl-31; Thu, 21 Aug 2025 09:05:45 -0400 Received: from mail-bn8nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2418::601] helo=NAM12-BN8-obe.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 1up4z2-0003Ff-NR; Thu, 21 Aug 2025 09:05:44 -0400 Received: from DM6PR07CA0086.namprd07.prod.outlook.com (2603:10b6:5:337::19) by CY3PR12MB9555.namprd12.prod.outlook.com (2603:10b6:930:10a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9052.14; Thu, 21 Aug 2025 13:05:29 +0000 Received: from DS1PEPF00017094.namprd03.prod.outlook.com (2603:10b6:5:337:cafe::98) by DM6PR07CA0086.outlook.office365.com (2603:10b6:5:337::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.15 via Frontend Transport; Thu, 21 Aug 2025 13:05:29 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF00017094.mail.protection.outlook.com (10.167.17.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Thu, 21 Aug 2025 13:05:29 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 21 Aug 2025 08:05:22 -0500 Received: from XFR-LUMICHEL-L2.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.39 via Frontend Transport; Thu, 21 Aug 2025 08:05:21 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=L6qqjs6CgcGase1fqUrkWrXdunjwE7KnkadSX19L3BUKg389Z7ybjQL+tCUJDW01rS96QHluTIZL6+zi+gt9BLJsMAohV5MLmIQXq2N0kVOBjTnhM4uoNfDN7pdrZcCqAxP4CX6bs1rEUqnP97FEpN5AmUiYE1ML+QGV2xqktz/vTEdNJXDCepDxbOBHZoEosxpbqWxWKzU9OOIc/V9hd7C17VcgtyBIYmvgvGX12awIq/4UWDIGXj/GNwRtPp+kGmSpEckU/5BZNZZn2xJa0l57XU7ALFsfxKG31K6IipDJ6lxOVCwx/iKWV78UxhnTp/+mnAAeRTxfQ8XhqQEJtg== 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=BJDKCJKOfFmoaSyF9n5K4QWhlTiOwVYZGvkbfy9QhHA=; b=kLDhoWJonr5ljTp0+xpbnaoj+QbcnxZ8xFeQRafzkWfd/y3xdvaC9TytdUzmAQEewD0/DRIkzg3LlQAU3TIKihY1E97owdbfiO9nlj3FOSmEPayY+UQL2W+Uoz5BkjtXjkSdQhpMQkplUjRyxHwBLeemG1WWUz5nakNJgNagoUGFy1tTkWRWJxuG83SednIfGKOWYamDXW9EN50mN4Zueq0yxc6plgVdnNfoAki5qBhZW4G9KX8+uPoiwscVB0KlDbeWpMOc0wivo5gPhzjljCs4RQ9rVfykdTy/niIz+fjbwHuXdsvRo5Zf1vViPu94NkPL6AoLiMtsPTpxZrVIOg== 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=BJDKCJKOfFmoaSyF9n5K4QWhlTiOwVYZGvkbfy9QhHA=; b=etv7MSjQ1OcNCXBaOc+pqovHwvcp+sxKCIHeAf9qdPUG6BcCXOupqIOd9q/aKkLpTbPVYD46p2BFMViQkYddiljRa1nsNA02MZjuUetoKZC6WgkpG2UaztYreEeQVnqLmDIha5VXHZ2KjN4ooDNHyCZQygEPEuT0ie7/XJJpJxs= 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=SATLEXMB04.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 v3 42/47] hw/arm/xlnx-versal-virt: split into base/concrete classes Date: Thu, 21 Aug 2025 15:03:41 +0200 Message-ID: <20250821130354.125971-43-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250821130354.125971-1-luc.michel@amd.com> References: <20250821130354.125971-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB04.amd.com: luc.michel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017094:EE_|CY3PR12MB9555:EE_ X-MS-Office365-Filtering-Correlation-Id: 128991bf-1705-4d31-b6ca-08dde0b36773 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?s1W5djbpWgsyZx9RDDDODQoTr6ZPJS6L9ts2hHtzp4y/BY7dF7P4RsoX4RZp?= =?us-ascii?Q?ttLTxJfrRJXOOODPPabvMUEBZti8mVgX5tvb+c9Apm5Ydyv/+pM+eMdqz5Co?= =?us-ascii?Q?N7wXkF03L5hgIKXhbdMiXmY3JorsDHZ7sXXdMVi8FQQioWF5AmDqMHNGkDj/?= =?us-ascii?Q?lbA4j1mAagMmQWQGGQfzb9iZWYA8Nlg0fE9hA9BowhLeUc9Xl7ASp8PH71lP?= =?us-ascii?Q?uWpHZkQq0OR0aWJg6/2LwqBsijTalAvszRUlH/ISoTRdoH7Co74x0RhA0dss?= =?us-ascii?Q?mI6B44WnXKEMh4ljynm+bpSg0QJ+B44P69Tj7qWYRJEV+szp95r1dQNYBhBX?= =?us-ascii?Q?3rVcyyKr6TkzCCP+YGfF1NCtYpGSEnf39GtV9r5U15SbfQKe9oMo10aYHTla?= =?us-ascii?Q?DWHL2pUGdDWIpeMOY6n8efnA0042S0B+p2u4/XSTu6Y1LUOkXGRCNJxEiNl5?= =?us-ascii?Q?ZMnBKtP5mj9rEw/o7cKqKf/GmgoNoyl6XMjqIljDRUToo0T8QGCIsjUCn61B?= =?us-ascii?Q?Mdc0QMCX6S7+RpXp0yFb+yiBAuSp98M36WVs8AUmN7QEQVDahAyfzGutXNY5?= =?us-ascii?Q?M2weD1X2czgcwJ3muGD+u5PScGH2OodpmE+icSmtG+UovKXd74nwl87jpL62?= =?us-ascii?Q?GljHxA+l0EXARFDzRxuf0MkCZoBtlq8X4IdsdZdJ2ScvJMYJSDQ9fnBwEmD9?= =?us-ascii?Q?y9M5y5dCcL+OCaUZSX1F6S8rZ7fkFGB2NSZ8yp3lfntHsrQipsyTjkJ0o7nE?= =?us-ascii?Q?qqOzk5NYRDUmv267YhnmuPUF9WbYLiU2pQxjRxjZXyHB6r9Xw1uEg5/AhG4M?= =?us-ascii?Q?zLEwA0ijjGMB2lycFpUKTIHOcrYf9y4v0PcyfZLreCFdF/6fb3mtKi8mE/OH?= =?us-ascii?Q?vWbGNLAa5o6hafVvtmDttC4mL6mR53B+htiGtj2bM0mM5kCKWUjb6csR6hJ0?= =?us-ascii?Q?97Np++Vo1HMYOqMuadZrQx9RSX2FZHqVbZ+m9SvQC3tS1xt62DKDWLGP25Si?= =?us-ascii?Q?d5JJ9HbDKqNhssC9HhbQYd+aPHiE4+zkhiVtGiACY3jzHlKZ/LWyvMBeCgN/?= =?us-ascii?Q?Aoi1doBeLhotCjtsBGJdO81k83OG5ABfp6R25VVv7C2YlkiX5Ez4w9KfPONU?= =?us-ascii?Q?CoQmNczYKGo5J6HHwA6OsFouij8O8S11QBdjqLK+vV5u8pvF/YlJq0kpRHXH?= =?us-ascii?Q?eLgELQ166d+3B4cZfbh+si6ycx0vCvMMnHkyOOZIIbU6vxJTz6GZ3ghiz7AQ?= =?us-ascii?Q?Hu8c5Ud47XaoEiTLojrvprN3rgnpqOwvPnUkhq7n7g5zKGVbtbWnpHWkwgXX?= =?us-ascii?Q?RXTfyko1mJG+GRFlqtPFU1Mx0n3sywJSbnwxjizLn010cJAwt+uNC9Te5/Ln?= =?us-ascii?Q?vFZ0Ymwc4d+8/MG2AQwY0953gToe5/OsIC9FXVOgKovsn+3E57Td4DhKFmyS?= =?us-ascii?Q?1Es/9sSYc8tXhmWRshFuUagbiz+p/2KKkiXtwAV5sTE+fKbuvIjq3d5ejq+I?= =?us-ascii?Q?E+BFE5lKGlHHU/VtnQqTXH6izkmPTipGle+M?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2025 13:05:29.5071 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 128991bf-1705-4d31-b6ca-08dde0b36773 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF00017094.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY3PR12MB9555 Received-SPF: permerror client-ip=2a01:111:f403:2418::601; envelope-from=Luc.Michel@amd.com; helo=NAM12-BN8-obe.outbound.protection.outlook.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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 @amd.com) X-ZM-MESSAGEID: 1755782221547124100 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 --- 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 53987db4cd1..40ba053bd08 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.50.1