From nobody Tue Dec 24 13:37:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1734872557555117.73566002070788; Sun, 22 Dec 2024 05:02:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tPLaZ-0005oM-VN; Sun, 22 Dec 2024 08:01:44 -0500 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 1tPLZc-00054o-Kq for qemu-devel@nongnu.org; Sun, 22 Dec 2024 08:00:46 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tPLZb-0000dc-1D for qemu-devel@nongnu.org; Sun, 22 Dec 2024 08:00:44 -0500 Received: from [2a02:8012:2f01:0:33a9:475d:1cd9:884] (helo=localhost.localdomain) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1tPLYx-0002L7-8u; Sun, 22 Dec 2024 13:00:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=TBc++wYpm4YjZE7yp6N0zmWXTAemjkJV0HLiNd3ZbAc=; b=cv4OipEVpVkXfYTGUWuT9zZeLY Y1RsYAk8gi6+ezMEdW88EuPs2gTUOVx5VjXE1u4o1g45sAKjDhcf1KqS9MG14PLP5XD8SmGZnEZP3 j5uNteAVKSnfc2HoKeX3X/2awHg189Gy0qwXYSuM7fjpkrT3R7kXfp37R1pCfTSJKGWQX0nNddZBY Cp0sHJyRrLWRLk8ntWai7yjq9AZocxmWikdH7fBvZ/zOxvqxLi9ec0ZASK/4iiU1Uch4cW+GPpXVX y1/WLpGzSN3qMiieQM5SMmlgLNu3SZsfCUk8Z4CMkps+dXraKD+62wIUdQX5bdNpURh0g4oBoYY3b u0lbvBTaqG/3DcG5vT9mkHfkinPeS5pIMkuLjcOyAhlu6omYWSlNQSQz42P4g0cGQZz+AqMByTkfG tcCLKch84I0sWV+QqDI5vZgMIOws0eOg50j02NTtpAMuElba7ELK3zidYxBpLCN3pdaUQ65d1F03o ELtqIVWVA8BH8PLdKA5cJH2kxf7JFZWvsYTU0reZUXQ5sAhb0QoU7OacR4BjqswlDuQlI6R+vxVki mPKP/nyGqHCUCRfMORFnBjv1MqBW6VXU4da/SQmJJrZgMRZ1mHYJwkUcX9tE2pFy2Oqh1dnwqj3z7 pmmfBZCSc/UKsarefFCihgc29W2XotXGbhjCzhZMU=; From: Mark Cave-Ayland To: huth@tuxfamily.org, qemu-devel@nongnu.org Date: Sun, 22 Dec 2024 12:59:44 +0000 Message-Id: <20241222130012.1013374-6-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241222130012.1013374-1-mark.cave-ayland@ilande.co.uk> References: <20241222130012.1013374-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a02:8012:2f01:0:33a9:475d:1cd9:884 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 05/33] next-cube: introduce next_pc_init() object init function X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, SPF_HELO_NONE=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: fail (Header signature does not verify) X-ZM-MESSAGEID: 1734872558051116600 Content-Type: text/plain; charset="utf-8" Move initialisation of the memory regions and GPIOs from next_pc_realize() = to the new next_pc_init() function. Signed-off-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- hw/m68k/next-cube.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index e023ca757c..75fc9724cd 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -897,20 +897,24 @@ static void next_pc_reset(DeviceState *dev) =20 static void next_pc_realize(DeviceState *dev, Error **errp) { - NeXTPC *s =3D NEXT_PC(dev); - SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + /* SCSI */ + next_scsi_init(dev); +} + +static void next_pc_init(Object *obj) +{ + NeXTPC *s =3D NEXT_PC(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 - qdev_init_gpio_in(dev, next_irq, NEXT_NUM_IRQS); + qdev_init_gpio_in(DEVICE(obj), next_irq, NEXT_NUM_IRQS); =20 memory_region_init_io(&s->mmiomem, OBJECT(s), &next_mmio_ops, s, "next.mmio", 0x9000); memory_region_init_io(&s->scrmem, OBJECT(s), &next_scr_ops, s, "next.scr", 0x20000); + sysbus_init_mmio(sbd, &s->mmiomem); sysbus_init_mmio(sbd, &s->scrmem); - - /* SCSI */ - next_scsi_init(dev); } =20 /* @@ -971,6 +975,7 @@ static void next_pc_class_init(ObjectClass *klass, void= *data) static const TypeInfo next_pc_info =3D { .name =3D TYPE_NEXT_PC, .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_init =3D next_pc_init, .instance_size =3D sizeof(NeXTPC), .class_init =3D next_pc_class_init, }; --=20 2.39.5