From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVdk0-0007lr-Oe for qemu-devel@nongnu.org; Tue, 16 Feb 2016 06:24:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVdjx-0001kw-IN for qemu-devel@nongnu.org; Tue, 16 Feb 2016 06:24:24 -0500 Date: Tue, 16 Feb 2016 12:24:17 +0100 From: "Edgar E. Iglesias" Message-ID: <20160216112417.GY31433@toto> References: <1455620981-13868-1-git-send-email-zxq_yx_007@163.com> <1455620981-13868-4-git-send-email-zxq_yx_007@163.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1455620981-13868-4-git-send-email-zxq_yx_007@163.com> Subject: Re: [Qemu-devel] [PATCH v3 03/16] hw/timer: QOM'ify etraxfs_timer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: xiaoqiang zhao Cc: peter.maydell@linaro.org, e.voevodin@samsung.com, mark.cave-ayland@ilande.co.uk, qemu-devel@nongnu.org, michael@walle.cc, qemu-arm@nongnu.org, gxt@mprc.pku.edu.cn, afaerber@suse.de On Tue, Feb 16, 2016 at 07:09:35PM +0800, xiaoqiang zhao wrote: > assign etraxfs_timer_init to etraxfs_timer_info.instance_init > and drop the SysBusDeviceClass::init > > Reviewed-by: Peter Maydell Reviewed-by: Edgar E. Iglesias > Signed-off-by: xiaoqiang zhao > --- > hw/timer/etraxfs_timer.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c > index 36d8f46..4f115c7 100644 > --- a/hw/timer/etraxfs_timer.c > +++ b/hw/timer/etraxfs_timer.c > @@ -315,9 +315,10 @@ static void etraxfs_timer_reset(void *opaque) > qemu_irq_lower(t->irq); > } > > -static int etraxfs_timer_init(SysBusDevice *dev) > +static void etraxfs_timer_init(Object *obj) > { > - ETRAXTimerState *t = ETRAX_TIMER(dev); > + ETRAXTimerState *t = ETRAX_TIMER(obj); > + SysBusDevice *dev = SYS_BUS_DEVICE(obj); > > t->bh_t0 = qemu_bh_new(timer0_hit, t); > t->bh_t1 = qemu_bh_new(timer1_hit, t); > @@ -329,24 +330,23 @@ static int etraxfs_timer_init(SysBusDevice *dev) > sysbus_init_irq(dev, &t->irq); > sysbus_init_irq(dev, &t->nmi); > > - memory_region_init_io(&t->mmio, OBJECT(t), &timer_ops, t, > + memory_region_init_io(&t->mmio, obj, &timer_ops, t, > "etraxfs-timer", 0x5c); > sysbus_init_mmio(dev, &t->mmio); > - qemu_register_reset(etraxfs_timer_reset, t); > - return 0; > } > > static void etraxfs_timer_class_init(ObjectClass *klass, void *data) > { > - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); > + DeviceClass *dc = DEVICE_CLASS(klass); > > - sdc->init = etraxfs_timer_init; > + dc->reset = etraxfs_timer_reset; > } > > static const TypeInfo etraxfs_timer_info = { > .name = TYPE_ETRAX_FS_TIMER, > .parent = TYPE_SYS_BUS_DEVICE, > .instance_size = sizeof(ETRAXTimerState), > + .instance_init = etraxfs_timer_init, > .class_init = etraxfs_timer_class_init, > }; > > -- > 2.1.4 > >