[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/14] hw/timmer: QOM'ify etraxfs_timer
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH 02/14] hw/timmer: QOM'ify etraxfs_timer |
Date: |
Tue, 26 Jan 2016 18:55:41 +0800 |
assign etraxfs_timer_init to etraxfs_timer_info.instance_init
and drop the SysBusDeviceClass::init
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/timer/etraxfs_timer.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c
index aee4990..a3a6798 100644
--- a/hw/timer/etraxfs_timer.c
+++ b/hw/timer/etraxfs_timer.c
@@ -314,9 +314,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);
@@ -332,20 +333,18 @@ static int etraxfs_timer_init(SysBusDevice *dev)
"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);
-
- sdc->init = etraxfs_timer_init;
+ /* do nothing */
}
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
- [Qemu-devel] [PATCH 00/14] QOM'ify hw/timmer/*, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 08/14] hw/timmer: QOM'ify m48txx_sysbus, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 10/14] hw/timmer: QOM'ify pl031, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 02/14] hw/timmer: QOM'ify etraxfs_timer,
xiaoqiang zhao <=
- [Qemu-devel] [PATCH 09/14] hw/timmer: QOM'ify milkymist_sysctl, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 04/14] hw/timmer: QOM'ify exynos4210_pwm, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 03/14] hw/timmer: QOM'ify exynos4210_mct, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 06/14] hw/timmer: QOM'ify grlib_gptimer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 01/14] hw/timmer: QOM'ify arm_timer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 05/14] hw/timmer: QOM'ify exynos4210_rtc, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 07/14] hw/timmer: QOM'ify lm32_timer, xiaoqiang zhao, 2016/01/26
- Re: [Qemu-devel] [PATCH 00/14] QOM'ify hw/timmer/*, Eric Blake, 2016/01/26