From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alD6P-0006Yc-3s for qemu-devel@nongnu.org; Wed, 30 Mar 2016 06:11:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alD6L-0005oc-UB for qemu-devel@nongnu.org; Wed, 30 Mar 2016 06:11:53 -0400 Received: from m12-18.163.com ([220.181.12.18]:44865) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alD6K-0005nX-Ed for qemu-devel@nongnu.org; Wed, 30 Mar 2016 06:11:49 -0400 From: xiaoqiang zhao Date: Wed, 30 Mar 2016 18:09:23 +0800 Message-Id: <1459332567-13629-2-git-send-email-zxq_yx_007@163.com> In-Reply-To: <1459332567-13629-1-git-send-email-zxq_yx_007@163.com> References: <1459332567-13629-1-git-send-email-zxq_yx_007@163.com> Subject: [Qemu-devel] [PATCH 1/9] hw/intc: QOM'ify etraxfs_pic.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, i.mitsyanko@gmail.com, chouteau@adacore.com, michael@walle.cc, peter.chubb@nicta.com.au, edgar.iglesias@gmail.com Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao --- hw/intc/etraxfs_pic.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/intc/etraxfs_pic.c b/hw/intc/etraxfs_pic.c index 48f9477..64a6f4b 100644 --- a/hw/intc/etraxfs_pic.c +++ b/hw/intc/etraxfs_pic.c @@ -146,19 +146,19 @@ static void irq_handler(void *opaque, int irq, int level) pic_update(fs); } -static int etraxfs_pic_init(SysBusDevice *sbd) +static void etraxfs_pic_init(Object *obj) { - DeviceState *dev = DEVICE(sbd); - struct etrax_pic *s = ETRAX_FS_PIC(dev); + DeviceState *dev = DEVICE(obj); + struct etrax_pic *s = ETRAX_FS_PIC(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); qdev_init_gpio_in(dev, irq_handler, 32); sysbus_init_irq(sbd, &s->parent_irq); sysbus_init_irq(sbd, &s->parent_nmi); - memory_region_init_io(&s->mmio, OBJECT(s), &pic_ops, s, + memory_region_init_io(&s->mmio, obj, &pic_ops, s, "etraxfs-pic", R_MAX * 4); sysbus_init_mmio(sbd, &s->mmio); - return 0; } static Property etraxfs_pic_properties[] = { @@ -169,9 +169,7 @@ static Property etraxfs_pic_properties[] = { static void etraxfs_pic_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = etraxfs_pic_init; dc->props = etraxfs_pic_properties; /* * Note: pointer property "interrupt_vector" may remain null, thus @@ -183,6 +181,7 @@ static const TypeInfo etraxfs_pic_info = { .name = TYPE_ETRAX_FS_PIC, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct etrax_pic), + .instance_init = etraxfs_pic_init, .class_init = etraxfs_pic_class_init, }; -- 2.1.4