From nobody Tue Feb 10 17:13:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486302020181743.0012575323753; Sun, 5 Feb 2017 05:40:20 -0800 (PST) Received: from localhost ([::1]:43286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN3C-0001KA-Dz for importer@patchew.org; Sun, 05 Feb 2017 08:40:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000Ao-2j for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caN17-0003HI-U7 for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003Eh-BF for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:09 -0500 Received: from localhost.localdomain (unknown [117.136.0.125]) by smtp10 (Coremail) with SMTP id DsCowAA3HrerKpdYVFO9Ig--.38574S2; Sun, 05 Feb 2017 21:37:48 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=9GQAfG7U5qp0pM5Re+ BUzm5NjFlGRrPt8iZZtc253TU=; b=JlUZexuh6yS/mVi02f1egWbbMTvmNa+mFD vRyatwZrUqZQLXzUu84ebWhBL6EjYei7jF8PXx33DKvbB1VpmRdttReTvUBz09VJ g+zS93jWgQU2eq8LjFgaaHTmrxdZemVhNnqZ4TSVV432bHstdK55BecJp7TX91lr tEPXpulyI= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:26 +0800 Message-Id: <20170205133727.23424-9-zxq_yx_007@163.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170205133727.23424-1-zxq_yx_007@163.com> References: <20170205133727.23424-1-zxq_yx_007@163.com> X-CM-TRANSID: DsCowAA3HrerKpdYVFO9Ig--.38574S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxWryxXr4ftr17WFWkCry5CFg_yoWrZry5pF 93ZFn5KFW5WFs7XrWxtr1kuFn8Jwn3Gw1fKr1xCrn29rn7Crn8AF4kA3ySvrWDGrWkuF1Y qrWDJryxua1UJ3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jkF4iUUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiOwx1xlXlXUbwaAAAs3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.14 Subject: [Qemu-devel] [RESEND PATCH 8/9] hw/sparc: QOM'ify sun4m.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drop the old SysBusDeviceClass::init and use instance_init or DeviceClass::realize instead Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc/sun4m.c | 54 +++++++++++++++++++---------------------------------= -- 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index f5b6efddf8..352ca0bb4c 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -584,30 +584,23 @@ typedef struct IDRegState { MemoryRegion mem; } IDRegState; =20 -static int idreg_init1(SysBusDevice *dev) +static void idreg_init1(Object *obj) { - IDRegState *s =3D MACIO_ID_REGISTER(dev); + IDRegState *s =3D MACIO_ID_REGISTER(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 - memory_region_init_ram(&s->mem, OBJECT(s), + memory_region_init_ram(&s->mem, obj, "sun4m.idreg", sizeof(idreg_data), &error_fatal= ); vmstate_register_ram_global(&s->mem); memory_region_set_readonly(&s->mem, true); sysbus_init_mmio(dev, &s->mem); - return 0; -} - -static void idreg_class_init(ObjectClass *klass, void *data) -{ - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); - - k->init =3D idreg_init1; } =20 static const TypeInfo idreg_info =3D { .name =3D TYPE_MACIO_ID_REGISTER, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(IDRegState), - .class_init =3D idreg_class_init, + .instance_init =3D idreg_init1, }; =20 #define TYPE_TCX_AFX "tcx_afx" @@ -632,28 +625,21 @@ static void afx_init(hwaddr addr) sysbus_mmio_map(s, 0, addr); } =20 -static int afx_init1(SysBusDevice *dev) +static void afx_init1(Object *obj) { - AFXState *s =3D TCX_AFX(dev); + AFXState *s =3D TCX_AFX(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 - memory_region_init_ram(&s->mem, OBJECT(s), "sun4m.afx", 4, &error_fata= l); + memory_region_init_ram(&s->mem, obj, "sun4m.afx", 4, &error_fatal); vmstate_register_ram_global(&s->mem); sysbus_init_mmio(dev, &s->mem); - return 0; -} - -static void afx_class_init(ObjectClass *klass, void *data) -{ - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); - - k->init =3D afx_init1; } =20 static const TypeInfo afx_info =3D { .name =3D TYPE_TCX_AFX, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(AFXState), - .class_init =3D afx_class_init, + .instance_init =3D afx_init1, }; =20 #define TYPE_OPENPROM "openprom" @@ -706,16 +692,16 @@ static void prom_init(hwaddr addr, const char *bios_n= ame) } } =20 -static int prom_init1(SysBusDevice *dev) +static void prom_init1(Object *obj) { - PROMState *s =3D OPENPROM(dev); + PROMState *s =3D OPENPROM(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 - memory_region_init_ram(&s->prom, OBJECT(s), "sun4m.prom", PROM_SIZE_MA= X, + memory_region_init_ram(&s->prom, obj, "sun4m.prom", PROM_SIZE_MAX, &error_fatal); vmstate_register_ram_global(&s->prom); memory_region_set_readonly(&s->prom, true); sysbus_init_mmio(dev, &s->prom); - return 0; } =20 static Property prom_properties[] =3D { @@ -725,9 +711,7 @@ static Property prom_properties[] =3D { static void prom_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D prom_init1; dc->props =3D prom_properties; } =20 @@ -736,6 +720,7 @@ static const TypeInfo prom_info =3D { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(PROMState), .class_init =3D prom_class_init, + .instance_init =3D prom_init1, }; =20 #define TYPE_SUN4M_MEMORY "memory" @@ -749,14 +734,14 @@ typedef struct RamDevice { } RamDevice; =20 /* System RAM */ -static int ram_init1(SysBusDevice *dev) +static void ram_realize(DeviceState *dev, Error **errp) { RamDevice *d =3D SUN4M_RAM(dev); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 memory_region_allocate_system_memory(&d->ram, OBJECT(d), "sun4m.ram", d->size); - sysbus_init_mmio(dev, &d->ram); - return 0; + sysbus_init_mmio(sbd, &d->ram); } =20 static void ram_init(hwaddr addr, ram_addr_t RAM_size, @@ -792,9 +777,8 @@ static Property ram_properties[] =3D { static void ram_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D ram_init1; + dc->realize =3D ram_realize; dc->props =3D ram_properties; } =20 --=20 2.11.0