From nobody Tue Feb 10 20:30:45 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; dkim=fail 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 1495719764531319.8648198429232; Thu, 25 May 2017 06:42:44 -0700 (PDT) Received: from localhost ([::1]:60147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDt2H-00037w-Ir for importer@patchew.org; Thu, 25 May 2017 09:42:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsw1-0004hn-Dr for qemu-devel@nongnu.org; Thu, 25 May 2017 09:36:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDsvw-0005Xl-Cx for qemu-devel@nongnu.org; Thu, 25 May 2017 09:36:13 -0400 Received: from m12-15.163.com ([220.181.12.15]:38037) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDsvu-0005XM-Af for qemu-devel@nongnu.org; Thu, 25 May 2017 09:36:08 -0400 Received: from localhost.localdomain (unknown [1.203.183.150]) by smtp11 (Coremail) with SMTP id D8CowADnZC6B3SZZ9rivHA--.14274S9; Thu, 25 May 2017 21:35:00 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=L/7de zTZVAweEO26zSq70yJVClcmqwIfW9hqg1oYq8Y=; b=P2rHVsY7QdoOj3y++AmYT goL9oDv+RO29j4TLPtmOykfKSjEwgA1LpED6aw4pIZlHkM6qjiQGLXlfra4bu4Xt hngBXC62jJ9PwYTcaOPw4Op4zy8ciRV0sSXO3d3R16dIDH1fJogw0fht7bq/FI2m 1v2Pi7K/AlQud/7uJo9rSI= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 25 May 2017 21:34:50 +0800 Message-Id: <20170525133451.22459-8-zxq_yx_007@163.com> X-Mailer: git-send-email 2.13.0.rc2.115.g10c78a162 In-Reply-To: <20170525133451.22459-1-zxq_yx_007@163.com> References: <20170525133451.22459-1-zxq_yx_007@163.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: D8CowADnZC6B3SZZ9rivHA--.14274S9 X-Coremail-Antispam: 1Uf129KBjvJXoWxWryxXr4ftr13KFyDWF4xtFb_yoWrZw45pF 93ZFn5KFW5WFs7XrWxtr1kuFn8Jwn3Gw1fKr17Crna9rn7Crn8AF4kA3ySvFWDGrWkuF1Y qrWDJryxua1UJ3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j6KZXUUUUU= X-Originating-IP: [1.203.183.150] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiqATixlc69B6NfwAAs9 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.15 Subject: [Qemu-devel] [PATCH v3 7/8] 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: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, mark.cave-ayland@ilande.co.uk, f4bug@amsat.org, pbonzini@redhat.com, atar4qemu@gmail.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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 5f022cc08d..0faff4619f 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -585,30 +585,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" @@ -633,28 +626,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" @@ -707,16 +693,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 { @@ -726,9 +712,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 @@ -737,6 +721,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" @@ -750,14 +735,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, @@ -793,9 +778,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.13.0.rc2.115.g10c78a162