From nobody Wed Feb 11 04:02:30 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 1486302471852849.8856698710678; Sun, 5 Feb 2017 05:47:51 -0800 (PST) Received: from localhost ([::1]:43324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caNAT-0007UF-Jy for importer@patchew.org; Sun, 05 Feb 2017 08:47:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN1B-0000Au-4d 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-0003H7-Uv for qemu-devel@nongnu.org; Sun, 05 Feb 2017 08:38:13 -0500 Received: from m12-14.163.com ([220.181.12.14]:60840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caN17-0003El-AZ 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 DsCowACnVrepKpdYyVK9Ig--.30409S2; Sun, 05 Feb 2017 21:37:46 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=uww9uc97T0kjarffIx kxp+dr6+/iR86SoiKvnlb6ke8=; b=DERItpP979u7LXEXdP5bpwKMNg0LAg9Dmh EGMrqcntRvBFh5mblWdpaQpcqCXykYR5MHjnno0S/7+wiu5CTkMsfKc/EMMmk4nr WbIOViP4q/Uktjji8AH3ADVwus3nRWTfWrYH9xshX/GAsrut/0W6WJnZMPWZBefy L7J0lyZG0= From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 5 Feb 2017 21:37:22 +0800 Message-Id: <20170205133727.23424-5-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: DsCowACnVrepKpdYyVK9Ig--.30409S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxZw4UGF48tFW8Gw4xtr47Arb_yoWrCF1rpF yxGFn7WrZ3tFsFqr4xta1DCF1rAwn2kw4xZrsrArsakwn2kr98Ar1kKa4SyFW0qrW09F1f Xay8GFyxWw4DJwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jk2-5UUUUU= X-Originating-IP: [117.136.0.125] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiOwp1xlXlXUbwXQAAsE 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 4/9] hw/misc: QOM'ify slavio_misc.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 SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/misc/slavio_misc.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/hw/misc/slavio_misc.c b/hw/misc/slavio_misc.c index edd5de0702..e1a706e828 100644 --- a/hw/misc/slavio_misc.c +++ b/hw/misc/slavio_misc.c @@ -414,76 +414,73 @@ static const VMStateDescription vmstate_misc =3D { } }; =20 -static int apc_init1(SysBusDevice *dev) +static void apc_init(Object *obj) { - APCState *s =3D APC(dev); + APCState *s =3D APC(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); =20 sysbus_init_irq(dev, &s->cpu_halt); =20 /* Power management (APC) XXX: not a Slavio device */ - memory_region_init_io(&s->iomem, OBJECT(s), &apc_mem_ops, s, + memory_region_init_io(&s->iomem, obj, &apc_mem_ops, s, "apc", MISC_SIZE); sysbus_init_mmio(dev, &s->iomem); - return 0; } =20 -static int slavio_misc_init1(SysBusDevice *sbd) +static void slavio_misc_init(Object *obj) { - DeviceState *dev =3D DEVICE(sbd); - MiscState *s =3D SLAVIO_MISC(dev); + DeviceState *dev =3D DEVICE(obj); + MiscState *s =3D SLAVIO_MISC(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); =20 sysbus_init_irq(sbd, &s->irq); sysbus_init_irq(sbd, &s->fdc_tc); =20 /* 8 bit registers */ /* Slavio control */ - memory_region_init_io(&s->cfg_iomem, OBJECT(s), &slavio_cfg_mem_ops, s, + memory_region_init_io(&s->cfg_iomem, obj, &slavio_cfg_mem_ops, s, "configuration", MISC_SIZE); sysbus_init_mmio(sbd, &s->cfg_iomem); =20 /* Diagnostics */ - memory_region_init_io(&s->diag_iomem, OBJECT(s), &slavio_diag_mem_ops,= s, + memory_region_init_io(&s->diag_iomem, obj, &slavio_diag_mem_ops, s, "diagnostic", MISC_SIZE); sysbus_init_mmio(sbd, &s->diag_iomem); =20 /* Modem control */ - memory_region_init_io(&s->mdm_iomem, OBJECT(s), &slavio_mdm_mem_ops, s, + memory_region_init_io(&s->mdm_iomem, obj, &slavio_mdm_mem_ops, s, "modem", MISC_SIZE); sysbus_init_mmio(sbd, &s->mdm_iomem); =20 /* 16 bit registers */ /* ss600mp diag LEDs */ - memory_region_init_io(&s->led_iomem, OBJECT(s), &slavio_led_mem_ops, s, + memory_region_init_io(&s->led_iomem, obj, &slavio_led_mem_ops, s, "leds", LED_SIZE); sysbus_init_mmio(sbd, &s->led_iomem); =20 /* 32 bit registers */ /* System control */ - memory_region_init_io(&s->sysctrl_iomem, OBJECT(s), &slavio_sysctrl_me= m_ops, s, + memory_region_init_io(&s->sysctrl_iomem, obj, &slavio_sysctrl_mem_ops,= s, "system-control", SYSCTRL_SIZE); sysbus_init_mmio(sbd, &s->sysctrl_iomem); =20 /* AUX 1 (Misc System Functions) */ - memory_region_init_io(&s->aux1_iomem, OBJECT(s), &slavio_aux1_mem_ops,= s, + memory_region_init_io(&s->aux1_iomem, obj, &slavio_aux1_mem_ops, s, "misc-system-functions", MISC_SIZE); sysbus_init_mmio(sbd, &s->aux1_iomem); =20 /* AUX 2 (Software Powerdown Control) */ - memory_region_init_io(&s->aux2_iomem, OBJECT(s), &slavio_aux2_mem_ops,= s, + memory_region_init_io(&s->aux2_iomem, obj, &slavio_aux2_mem_ops, s, "software-powerdown-control", MISC_SIZE); sysbus_init_mmio(sbd, &s->aux2_iomem); =20 qdev_init_gpio_in(dev, slavio_set_power_fail, 1); - - return 0; } =20 static void slavio_misc_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D slavio_misc_init1; dc->reset =3D slavio_misc_reset; dc->vmsd =3D &vmstate_misc; } @@ -492,21 +489,15 @@ static const TypeInfo slavio_misc_info =3D { .name =3D TYPE_SLAVIO_MISC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MiscState), + .instance_init =3D slavio_misc_init, .class_init =3D slavio_misc_class_init, }; =20 -static void apc_class_init(ObjectClass *klass, void *data) -{ - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); - - k->init =3D apc_init1; -} - static const TypeInfo apc_info =3D { .name =3D TYPE_APC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MiscState), - .class_init =3D apc_class_init, + .instance_init =3D apc_init, }; =20 static void slavio_misc_register_types(void) --=20 2.11.0