From nobody Fri Nov 14 23:28:50 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1759846480; cv=none; d=zohomail.com; s=zohoarc; b=fteOR2Uy8evQ8yArpLW/L3zGFnrUgqXh3xryGiL7Q1qgrHfyczZyU1XL7xEkv85apo3owTOwMakiTg+0Az84/ApEUi/WAj6XfEIH5JK8ZsVIxdx9ZAxnGigKflU8EXB9Og2yYDN+BbPuTUvwZja+bRpWJgKsVtVOwsaK4uCim/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759846480; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=b5F7YcfNU2NzxmB58yghVvVIVczR9V5gj3nGlRyNo4g=; b=kmjmfMlV1+cXRX9wzzTwaRpgd4YTXqJVcOx7tEMp0hJcoKDMbFA8mltqiMB6Q08VCcJfiPM28a9dwkJfXwgkA2tfueHBclEH8YxbUR3feTIVGDB92rPfcb8z8tdgnw3NY1goBwGleBJXQ1xArWIej4AhCEaMBZg9IiH67N6hFw8= 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 1759846480981825.4249266418509; Tue, 7 Oct 2025 07:14:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v68R9-00069o-Bo; Tue, 07 Oct 2025 10:13:07 -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 1v68Qh-0005ru-Ud for qemu-devel@nongnu.org; Tue, 07 Oct 2025 10:12:43 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v68QJ-0002Jl-37 for qemu-devel@nongnu.org; Tue, 07 Oct 2025 10:12:37 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-46e3af7889fso39184135e9.2 for ; Tue, 07 Oct 2025 07:12:13 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e78c5d290sm167037135e9.0.2025.10.07.07.12.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Oct 2025 07:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759846332; x=1760451132; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=b5F7YcfNU2NzxmB58yghVvVIVczR9V5gj3nGlRyNo4g=; b=DZAfSpLqR8nGL36TuAd+lJ1SQqOTTGbNNCV95t8tYj24cOVA7Cd3ogdqrcbRJpqLvF 2jR5cwxNmP04MrzHsEDNTUOFuY635cwrqNvvCl+IVLz01DptF13xeZv99Rh3IAkTCOPS fZxV4Lvq6GRx4T7t9hYUjsfVbc2SJtX7IoL3WH06GHFctf5XSwpeBYMy7JbifBf0iXH1 4sk3IzJkYXRLtDrOGXOvkV+TauB30a+Q5ekzAYsunptRqncHTJaVi9m/6W5/9mK1sOsx +S0itSyzW88oKPyeag3nJGYnjacEcSvQOP7XkonHlbGag0ME4myANYdVbcz6+Wb6JAzO D4zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759846332; x=1760451132; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b5F7YcfNU2NzxmB58yghVvVIVczR9V5gj3nGlRyNo4g=; b=qffEP7e7S9YjozeCfEQOzkTAtinNYTVyd5MoRuz7TX+PO8ZByztMzV1s9SO1RnvJG6 nij/Zv8ASq5WKW9LAPCRkEdIG/Lvk4M6iGzgzyABF6KzGVfQVLH+v0Ejg1G4n+ldcjwE 1Z7qn1LaPO2m2ZhRnBcUOhHgoQicJKiINREFN3PRwiJ7tceE8nEiJYPeOZ7qSJ0R2nYU tacPsnKiAcGdqkMzHw/WZs9jjnCIVKnbfQmXV2LM3AUlYSIvKK30B2xc439MQsZ6JJ05 CyjqPT8g40DxTJNyDO1LUMXopJeq8wAnOkugP5UeuYJwgjWjY2rMBF+K1SrzGpKTr4zd ky+g== X-Gm-Message-State: AOJu0Yz5rRP4Z6WGudrMKMHGQ7Y/wto60xV1Mjc8qOvKtOvc9QObjuhT PMawP5kaVHj1SW76QJipe8tkVyzw1HbL+ZkHNxjMM4jTkzctUI7bWKqKRn0Qf7pZzujog9sbQI2 2bqH0 X-Gm-Gg: ASbGncveuIQB6SdGIcbJ/uXOkNQ+HZ64kGXgaLgcg1+ZmoTE+AB9tX/e0jjw78s8/O4 h6ZTBn9QoXxioy6P58ikp8ljdU9BN0NhVr5e+fe+AYwqreIyJI2fw/nCV5LqiuEDhimtA2EDcEL +2JSN0sjQ/GNderj850LctrzRATMM+Hg08bKGlqxSLAQpt8NLTifVJtKfk7WnyH83MhsKeW+Sjs 8EBMsbH7GZS2PciP5YhiLDk5m0dNVW2UrzL/ZSC835G2CSxUs/h7aNMxA4yqVKkanop+O7jWMc0 5RN8ZtHCDOJFqsoHB8UC6eee3Gtjo5EvcyUW0VSNqy8XT/KhuOXnIxdE/VcXyBo6BpF+fygZvQP rgGfRRVFzqZnJUYaN2W0yirwtuulJnlXBnodB3C/n9esK7sH7a+9tumoKhqbCJNjzvQ8= X-Google-Smtp-Source: AGHT+IF1KKQR1eY8LQesZsQ7tb05/yxAx3Cf6J7b40JN4qlB9PlPZRCGKRjyTvvUuuECcUwtmJd5nw== X-Received: by 2002:a05:600c:3b1f:b0:46e:4c67:ff17 with SMTP id 5b1f17b1804b1-46e711254e4mr94386555e9.14.1759846331506; Tue, 07 Oct 2025 07:12:11 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 43/62] hw/arm/xlnx-versal-virt: split into base/concrete classes Date: Tue, 7 Oct 2025 15:11:03 +0100 Message-ID: <20251007141123.3239867-44-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251007141123.3239867-1-peter.maydell@linaro.org> References: <20251007141123.3239867-1-peter.maydell@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::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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, T_SPF_TEMPERROR=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: 1759846483648154100 From: Luc Michel 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 Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20250926070806.292065-43-luc.michel@amd.com Signed-off-by: Peter Maydell --- 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 @@ -26,8 +26,11 @@ #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 @@ -52,6 +55,12 @@ struct VersalVirt { } cfg; }; =20 +struct VersalVirtClass { + MachineClass parent_class; + + VersalVersion version; +}; + static void fdt_create(VersalVirt *s) { MachineClass *mc =3D MACHINE_GET_CLASS(s); @@ -193,14 +202,14 @@ static void sd_plug_card(VersalVirt *s, int idx, Driv= eInfo *di) =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); @@ -209,7 +218,8 @@ static void versal_set_ospi_model(Object *obj, const ch= ar *value, Error **errp) =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 @@ -241,11 +251,11 @@ static void versal_virt_init(MachineState *machine) } =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, @@ -274,7 +284,7 @@ static void versal_virt_init(MachineState *machine) 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 @@ -318,10 +328,11 @@ 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 /* @@ -339,45 +350,64 @@ 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.43.0