From nobody Sat Nov 15 05:15:31 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=1755678947; cv=pass; d=zohomail.com; s=zohoarc; b=QF2sKN8l+ff0Q8x1vCucLblzyyP82bz36db6F2uiiz3TfYxB2iEyU56Z0/jk4St5ynBNswFeVHs2iJVIXzPStksLCBNjAwV29Z32XwlfGqs3wN7IuCuXa9RlI4VZaeLszEtY/cNE3vuhgeAF+aH4K2Hvf4uHkGgZK0mgii+eaSM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755678947; 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=7nD1Jl0ofxorXRNx0g1NzjYKB74OPmJVOrgM5GZ1DAs=; b=CDvFdEIJ9FTylwOtIBIpT8q1tCIIX132CScWLUOBz9dAq654T3okjDAyPWDjNyEbZFVzKNgwnE0LZqe3AaI7TktRonveGaYqmfujuyUXKHzx/kXeF3QwyGhFpTkuTHZLNt85fELovFGkOkOHq/cv+y+ofXzpMCxPNK5MaNBdA94= 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 1755678947316924.1239699006326; Wed, 20 Aug 2025 01:35:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uoeC9-0001jr-2G; Wed, 20 Aug 2025 04:29:21 -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 1uoeAX-000778-0J; Wed, 20 Aug 2025 04:27:41 -0400 Received: from mail-mw2nam10on20610.outbound.protection.outlook.com ([2a01:111:f403:2412::610] helo=NAM10-MW2-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 1uoeAU-00018e-Nt; Wed, 20 Aug 2025 04:27:40 -0400 Received: from MW4PR03CA0348.namprd03.prod.outlook.com (2603:10b6:303:dc::23) by SA1PR12MB9247.namprd12.prod.outlook.com (2603:10b6:806:3af::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9031.24; Wed, 20 Aug 2025 08:27:32 +0000 Received: from MWH0EPF000989E9.namprd02.prod.outlook.com (2603:10b6:303:dc:cafe::84) by MW4PR03CA0348.outlook.office365.com (2603:10b6:303:dc::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9052.13 via Frontend Transport; Wed, 20 Aug 2025 08:27:32 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by MWH0EPF000989E9.mail.protection.outlook.com (10.167.241.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.9052.8 via Frontend Transport; Wed, 20 Aug 2025 08:27:31 +0000 Received: from Satlexmb09.amd.com (10.181.42.218) 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; Wed, 20 Aug 2025 03:27:31 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by satlexmb09.amd.com (10.181.42.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1748.10; Wed, 20 Aug 2025 01:27:30 -0700 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; Wed, 20 Aug 2025 03:27:29 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pqJEReYvInJXKfjnQ/nQ8n3Ik3Ai/dwkD/r4xTjgNQrDlyo2vcq50a/WxTW5pgFJvw62DqpKz+j2vl8Alq6fEi1BB5IHb5hLtpFqlVkJfZB5o+jpp6Q9yNwnNVOYpyQ3yersTSfq/llYZT0OosgnsFcb9gYfJNjs94G/6Wzk+jSh8sRWUu5rTZjsEQb/He4WiukTRZ57o2dcirwPVQkWCFiztFpv3qWGRRmA4e8dr0gzvT6St3X/BBxbbFdrZrtoBRAxJUZnKDZ1h7c4dnm+wcAhcI6hrI6m5U9Qetcvegy3l8LLyd22L5RozOQQvqA/kPNoQgIERk/DpPU7n8zzEQ== 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=7nD1Jl0ofxorXRNx0g1NzjYKB74OPmJVOrgM5GZ1DAs=; b=ksxD8gHK6eMfb3SQkwlXm2XglDsnCzVRfpAauoaGVXW5kxz+MPJDPXwfYhM3F62ZG12vD1u4uYJgl8H2iqpIeUrUUYmFuVUuJhCX/LK4OTzkfvR4y+Bk4Z7ARrVxewlIF3vIdH24TPvhTkBNW24KroDLrjjyLT18Qkn0jVE4fWnESy+3VbN1EM+tt5uFmQGbFRPpR5W7x7Vw96SWbOumWuQnMARy6vZm7BMYlsllrz5qrvpDevyOhQARlsykNhtTy8/7JcXsXau9HSepyutLTuU6sifmon9Vu7bGIyjGV21qJsWXJmaBbhR77jlI+eOB26S82x7bUtaBxRkZJSVo4g== 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=7nD1Jl0ofxorXRNx0g1NzjYKB74OPmJVOrgM5GZ1DAs=; b=M1PkidUvdH8mMF2mrc4MAk8ruUC5zUMDK969oxhr42O8DodkFU/Rf86V9SCOpMeecykTF484lgRnwKZdfgKRLaDo1FzjrbZxycBoa1+uPgdarKl1wtlAeD+S+19EH4aCu1Iemf8DeRxHqwZy26YHNboMKVGhsmz7b20ITYEGo38= 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 v2 42/47] hw/arm/xlnx-versal-virt: split into base/concrete classes Date: Wed, 20 Aug 2025 10:25:41 +0200 Message-ID: <20250820082549.69724-43-luc.michel@amd.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250820082549.69724-1-luc.michel@amd.com> References: <20250820082549.69724-1-luc.michel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989E9:EE_|SA1PR12MB9247:EE_ X-MS-Office365-Filtering-Correlation-Id: 191effb1-7d53-444b-0890-08dddfc36878 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JzUypfBk6sOPsBnmajxbCjnkNKyEIahO4+C9AvkdTBblf7qzpw/QxUmq4K4D?= =?us-ascii?Q?JHNg2W4ZBqZ4dKN2rUEEyUAynV7g3qFbASIyfuueFjE9X8nrONwyVNfFMNDg?= =?us-ascii?Q?J+LG/Y6afwKwhDO0hNDX3XoGAInYwBBLL96RUl2KxSlgR2J4QyTYGu3h2q0t?= =?us-ascii?Q?OUPB2TVdQW6cj5hU2HXw9vXqoRtTxO9+FH+e5NuXjv2DVkdBB1zfOL3kPhNa?= =?us-ascii?Q?aUqvPMrIuSQntaxe2HdiUEo8Hq5LDOD8jNoL3/gWcrVej5b9u59SgMtdOuhJ?= =?us-ascii?Q?c50N54kKQW3+clbUzMK6uwAYWl0ffYb9EZAEM10/KdDTLM/v7Ibxerp09noe?= =?us-ascii?Q?ZxyyLKHhYpchSpaIp8sIKxO6H7lvtLoWwLW/vCg8ULe7gC9BGVHdPyv5c+1G?= =?us-ascii?Q?auVw/hMEB1nJqKEi5MpCvkKnaBgjrRDz7RUJ1DInKAVx8oemaAftyaFdEreu?= =?us-ascii?Q?qn/hvCHj7sOQ3QuBSUclHhh+NkbVPjwCTxycMTj9zAewl6fhw5VI/vevClSI?= =?us-ascii?Q?0CvH7Xh47cn+BW+AYZj8xdYAwsAjHNZ5ciDurOp4dbIFrBcnIrwqAFy+cjRw?= =?us-ascii?Q?5rLD9Ji5PEglGHCyPSELBMHDhnHP+jrYos5k+x89AsEnW1yv2PswL6obgz0a?= =?us-ascii?Q?g83YVyBJhb9LOChct2ZZl8q2JXOhZxVDapa9pSj1WLWPAQV8MOUfzcSW370g?= =?us-ascii?Q?jytLXbqnLD9NEN0e1K53NZif4mpl8/4acRd/REcvrasrt0LsBbk411GJrPeZ?= =?us-ascii?Q?8CgUOIC+lIt3xrogVASuUGyxDyypZtldAKoXYkjjDXepJEc0G7cHmGeRYNYC?= =?us-ascii?Q?C6P+DiSFWzl7XJ1T3hYsj+3766sPGW+a/xZHk39JFhOYJIlvEVERyTY+6fLa?= =?us-ascii?Q?MP3MKmzt1/fCwkI9Ol5Iw7dV3gxExoz1bLuo5Im+y7ARm5agEvUdUo2OnA69?= =?us-ascii?Q?8Jws2ouWSDJr79dqz1KtLk/71z+ohMJC288nsujc5JxOF9byY2hF6Vm0wEqf?= =?us-ascii?Q?ByJgBH/xtnQQhgLfWM0VvqZODF6N5kBsKHmvt744HI+2cpit0W99j7EGc34D?= =?us-ascii?Q?MgEHkS4GZ3fS3fLaGmyILCgCj3/SpbFSR9F4a0sIjV07Oyk9gUp/gSyqlXGj?= =?us-ascii?Q?86BI165yulbrOfBie2uAhRhOYYpj01aXs8dJ+UlUi78c/3MY7Z2zsREepOh9?= =?us-ascii?Q?B+IbNTsvFGzrQY6vfNA5vuo8l+nh9ugoiXYyXu5aX2WzXO5i4sizP0oYXsuM?= =?us-ascii?Q?n0eUtK92r1bpp4V7pkGlExFGKUIMYM/+5IY3i/CvxDZSlAYiizrp60NYf6y8?= =?us-ascii?Q?DrGHaVnlSUhIOrAo9spa6Rt/aKfy2lcRSFjynJKKblLIfs/UPk8u0LHgvFtd?= =?us-ascii?Q?Z2OsCbKOkAhrYr8MsZM6dTEQvRIDBU2Wlg3ctr92wnF36aFgpALxaxjxeSVV?= =?us-ascii?Q?elsH6b4uIEG7dMbwnX3GNMKCOdcE5RsrDqdTcA3s8G8WNP6c8R08Acy8xnO1?= =?us-ascii?Q?1b8/p8T/yP0/bbbNUiEDxl2N6aL3+LMdCkPI?= 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)(82310400026)(36860700013)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Aug 2025 08:27:31.9449 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 191effb1-7d53-444b-0890-08dddfc36878 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: MWH0EPF000989E9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB9247 Received-SPF: permerror client-ip=2a01:111:f403:2412::610; envelope-from=Luc.Michel@amd.com; helo=NAM10-MW2-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: 1755678948988116600 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 4495b20ee1c..9eaa08300ae 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