From nobody Sun Mar 22 15:34:37 2026 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773947700; cv=none; d=zohomail.com; s=zohoarc; b=LY1QHYb4NNMo5FUH3X6p4r9z612RERbhzq3Ov7ZFALclfqEBnEs4bgmQQLiAwTirvGWXiXq65mKTVMOoj1Qpev7wZe8UK3/vwBOGFufouwlJabLOwx+KRSFsbZTjkenPO88SPdGvubGQq+VYYoZ5rmKmN6sR5Ysbve0EY2yTjP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773947700; 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=jZQIAqd1C3za4aw1XWQN0FNbaHnNMI3gmGgywrKY80E=; b=dKiik8uU1VlzRzHDA3+OE51nxxPM4d4+H/2dKikOg1d0EEYTJSsqTBAv788KW/F2n1lHOf3qNLAWwkhoDw2RXXKF3tqfXqG7AtcWFc4Dyc52RssWl06SkGEbEnEkyJbPt3vIqWyZBsqJDa9Flk87X6npj9Kp6JqoZ9yK9qrd3tE= 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 1773947700587653.6661152804332; Thu, 19 Mar 2026 12:15:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3IpD-0004rf-Ct; Thu, 19 Mar 2026 15:14:31 -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 1w3Ioo-0004Wm-Gu for qemu-devel@nongnu.org; Thu, 19 Mar 2026 15:14:10 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3Ioi-0000mD-2h for qemu-devel@nongnu.org; Thu, 19 Mar 2026 15:14:03 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-43a03cb1df9so1272393f8f.1 for ; Thu, 19 Mar 2026 12:13:59 -0700 (PDT) Received: from acidburn.pod.cvut.cz (acidburn.pod.cvut.cz. [147.32.90.2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b64714e2esm635921f8f.32.2026.03.19.12.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 12:13:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773947638; x=1774552438; 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=jZQIAqd1C3za4aw1XWQN0FNbaHnNMI3gmGgywrKY80E=; b=gYOQNZZnup090ELmGiuVYn5GDnOmqyvPuZNSgu1zT8QF9PjCrvoygpr/HW9ARezDDR t4MYaBqPS0uHMJqqHiJftDiWTFvzohgrTD7po37oQcrCu5F+H1y2qmSz9c/ud3vFvjxy Q7lcLx2DMVSplOcdOMbxxkQvTLaNpyhxzVqRiNTgOeNt/OnxJtxrkP9e6Qb1nwgZ3B3l CERXIJK7hk4qfvqErriIsz5CtQmbJU30uhbRneRCbqIY6seZA97S02sgmNcm0v2cXE0r xCkGyNSC2Uo0ZAIQQ1I5vH4XQOEYiSqVWfFiHs0av9wd/8u80cjauF7dm3HgygW+csmV iW9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773947638; x=1774552438; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=jZQIAqd1C3za4aw1XWQN0FNbaHnNMI3gmGgywrKY80E=; b=sJLkxIWeNqgS5fJrXkBcOI6TBTgZGHCOdAkOV/1j5u30yPGeOwnBH+0BxeI1G4Shzo VaNPJc9Wdh9kG1N9JWA8f1FGdJfOUaytA8gh+8tL1UwPxC8d5lUVADJdPfH0vvc80Kgw 52JI/09at27fnfy2FGqOdZOFrqJ5/LiuGm6B7tj72wISRrPyttrkU+FfIhcTAl+PAqYB hreXWIej6T761i1B6dQ+/g7WLIRBfCZPPy/umXWZuSqSMMzotnrbM3iyMzKWkfhCzi5N OI4rlZ80IuWCNzM1B5GtN+HRugtTBrl4mSQVAQ8090sbgOChzecS6iVRraZ9toeF8vVM jzLg== X-Gm-Message-State: AOJu0YxKbY6z7TltNQhYICQL0aYiBs6nB4VXygVY7JW7s7yM4PQIynbk KsRXyMFIBYNepyI5YFPHTLJ8P5GmmiKoTvPyFqZMmsbER2aQhds+LhdakiFTMlEO X-Gm-Gg: ATEYQzy9ijCXTo3CGLHrEV74SAd0vRMajhg4GcZVBPT5BCR7eoRbiuCqPE8jzNOfMJV HNXiGMNRII3FBG8qsXyIxVO7R7CtP5BfPZ2057OQtKI/2vhRyTmXD/laQ8qky6/H5xKZdR/rYpd 3HqCUXWc0MGehhMVh90f0voWfONtt5MCJral9l+GDtRcN/hCrxx7tkt5Gpszco9yrHTys1A1EAJ m+rmq0DwgIXXUUQQw4KL4BaOkUfVJopnpIBa4FQg4hCUFABjcgpiSGGqy9OetKp4WEUQVUTFP8u 9FH69z5uUTnsiXXPc74xgHHGT7zgkPKoIwQ2cMR49xu3bMrPgGdSXeHRLUFDLLCM6dKLJVS3UnK N2URNrRoirtsEewY67Oz8VY/4VkNIBbbNnhcnysC8E3Oslvj3d1/cL6Q0tA+Yif6hpquK9E1ZGl kLQmEVaqQk69YNGrf09p8DIobcfxCyNk1nlCXMpN6OMs4UH6VR4/GwuA== X-Received: by 2002:a05:6000:2407:b0:439:b3d2:3766 with SMTP id ffacd0b85a97d-43b6423fc13mr980808f8f.19.1773947638294; Thu, 19 Mar 2026 12:13:58 -0700 (PDT) From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Bobek?= To: qemu-devel@nongnu.org, Matyas Bobek , Pavel Pisa , Bernhard Beschow Cc: qemu-arm@nongnu.org, Marc Kleine-Budde , Oliver Hartkopp , Nikita Ostrenkov , Peter Maydell , =?UTF-8?q?Maty=C3=A1=C5=A1=20Bobek?= Subject: [PATCH v2 2/7] hw/arm/sabrelite: Introduce class SabreliteMachineState Date: Thu, 19 Mar 2026 20:13:09 +0100 Message-ID: <6b21c46dde0f562eba1a5e2dfd9dc8635daaedf1.1773866323.git.matyas.bobek@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: 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::42c; envelope-from=matyas.bobek@gmail.com; helo=mail-wr1-x42c.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: qemu development 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 @gmail.com) X-ZM-MESSAGEID: 1773947700844158500 Create full class SabreliteMachineState extending MachineState. Previously, Sabrelite board MachineState was declared indirectly by the DEFINE_MACHINE_ARM macro. FslIMX6State was only instantiated in the sabrelite_init function. For FlexCAN device, machine properties will be used to select QEMU CAN buses. A custom class is therefore required, so the CanBusState "connections" can then be added as fields. Signed-off-by: Maty=C3=A1=C5=A1 Bobek --- hw/arm/sabrelite.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index 40ee8196ac..7e036e6388 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -20,6 +20,15 @@ #include "qemu/error-report.h" #include "system/qtest.h" =20 +struct SabreliteMachineState { + MachineState parent_obj; + + FslIMX6State soc; +}; + +#define TYPE_SABRELITE_MACHINE MACHINE_TYPE_NAME("sabrelite") +OBJECT_DECLARE_SIMPLE_TYPE(SabreliteMachineState, SABRELITE_MACHINE) + static struct arm_boot_info sabrelite_binfo =3D { /* DDR memory start */ .loader_start =3D FSL_IMX6_MMDC_ADDR, @@ -41,7 +50,7 @@ static void sabrelite_reset_secondary(ARMCPU *cpu, =20 static void sabrelite_init(MachineState *machine) { - FslIMX6State *s; + SabreliteMachineState *s =3D SABRELITE_MACHINE(machine); =20 /* Check the amount of memory is compatible with the SOC */ if (machine->ram_size > FSL_IMX6_MMDC_SIZE) { @@ -50,13 +59,12 @@ static void sabrelite_init(MachineState *machine) exit(1); } =20 - s =3D FSL_IMX6(object_new(TYPE_FSL_IMX6)); - object_property_add_child(OBJECT(machine), "soc", OBJECT(s)); + object_initialize_child(OBJECT(machine), "soc", &s->soc, TYPE_FSL_IMX6= ); =20 /* Ethernet PHY address is 6 */ - object_property_set_int(OBJECT(s), "fec-phy-num", 6, &error_fatal); + object_property_set_int(OBJECT(&s->soc), "fec-phy-num", 6, &error_fata= l); =20 - qdev_realize(DEVICE(s), NULL, &error_fatal); + qdev_realize(DEVICE(&s->soc), NULL, &error_fatal); =20 memory_region_add_subregion(get_system_memory(), FSL_IMX6_MMDC_ADDR, machine->ram); @@ -70,7 +78,7 @@ static void sabrelite_init(MachineState *machine) /* Add the sst25vf016b NOR FLASH memory to first SPI */ Object *spi_dev; =20 - spi_dev =3D object_resolve_path_component(OBJECT(s), "spi1"); + spi_dev =3D object_resolve_path_component(OBJECT(&s->soc), "spi1"); if (spi_dev) { SSIBus *spi_bus; =20 @@ -89,7 +97,7 @@ static void sabrelite_init(MachineState *machine) qdev_realize_and_unref(flash_dev, BUS(spi_bus), &error_fat= al); =20 cs_line =3D qdev_get_gpio_in_named(flash_dev, SSI_GPIO_CS,= 0); - qdev_connect_gpio_out(DEVICE(&s->gpio[2]), 19, cs_line); + qdev_connect_gpio_out(DEVICE(&s->soc.gpio[2]), 19, cs_line= ); } } } @@ -100,12 +108,14 @@ static void sabrelite_init(MachineState *machine) sabrelite_binfo.secondary_cpu_reset_hook =3D sabrelite_reset_secondary; =20 if (!qtest_enabled()) { - arm_load_kernel(&s->cpu[0], machine, &sabrelite_binfo); + arm_load_kernel(&s->soc.cpu[0], machine, &sabrelite_binfo); } } =20 -static void sabrelite_machine_init(MachineClass *mc) +static void sabrelite_machine_class_init(ObjectClass *oc, const void *data) { + MachineClass *mc =3D MACHINE_CLASS(oc); + mc->desc =3D "Freescale i.MX6 Quad SABRE Lite Board (Cortex-A9)"; mc->init =3D sabrelite_init; mc->max_cpus =3D FSL_IMX6_NUM_CPUS; @@ -114,18 +124,11 @@ static void sabrelite_machine_init(MachineClass *mc) mc->auto_create_sdcard =3D true; } =20 -static void sabrelite_machine_class_init(ObjectClass *oc, const void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - - sabrelite_machine_init(mc); -} - static const TypeInfo sabrelite_machine_init_typeinfo =3D { - .name =3D MACHINE_TYPE_NAME("sabrelite"), + .name =3D TYPE_SABRELITE_MACHINE, .parent =3D TYPE_MACHINE, .class_init =3D sabrelite_machine_class_init, - .instance_size =3D sizeof(MachineState), + .instance_size =3D sizeof(SabreliteMachineState), .abstract =3D false, .interfaces =3D arm_machine_interfaces, }; --=20 2.53.0