[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/6] hw/timer: QOM'ify lm32_timer
From: |
Michael Walle |
Subject: |
[Qemu-devel] [PULL 1/6] hw/timer: QOM'ify lm32_timer |
Date: |
Mon, 20 Jun 2016 18:39:04 +0200 |
From: xiaoqiang zhao <address@hidden>
* split the old SysBus init function into an instance_init
and a Device realize function
* use DeviceClass::realize instead of SysBusDeviceClass::init
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: xiaoqiang zhao <address@hidden>
Acked-by: Michael Walle <address@hidden>
Tested-by: Michael Walle <address@hidden>
Signed-off-by: Michael Walle <address@hidden>
---
hw/timer/lm32_timer.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c
index 3198355..e45a65b 100644
--- a/hw/timer/lm32_timer.c
+++ b/hw/timer/lm32_timer.c
@@ -176,21 +176,26 @@ static void timer_reset(DeviceState *d)
ptimer_stop(s->ptimer);
}
-static int lm32_timer_init(SysBusDevice *dev)
+static void lm32_timer_init(Object *obj)
{
- LM32TimerState *s = LM32_TIMER(dev);
+ LM32TimerState *s = LM32_TIMER(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
sysbus_init_irq(dev, &s->irq);
s->bh = qemu_bh_new(timer_hit, s);
s->ptimer = ptimer_init(s->bh);
- ptimer_set_freq(s->ptimer, s->freq_hz);
- memory_region_init_io(&s->iomem, OBJECT(s), &timer_ops, s,
+ memory_region_init_io(&s->iomem, obj, &timer_ops, s,
"timer", R_MAX * 4);
sysbus_init_mmio(dev, &s->iomem);
+}
- return 0;
+static void lm32_timer_realize(DeviceState *dev, Error **errp)
+{
+ LM32TimerState *s = LM32_TIMER(dev);
+
+ ptimer_set_freq(s->ptimer, s->freq_hz);
}
static const VMStateDescription vmstate_lm32_timer = {
@@ -213,9 +218,8 @@ static Property lm32_timer_properties[] = {
static void lm32_timer_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = lm32_timer_init;
+ dc->realize = lm32_timer_realize;
dc->reset = timer_reset;
dc->vmsd = &vmstate_lm32_timer;
dc->props = lm32_timer_properties;
@@ -225,6 +229,7 @@ static const TypeInfo lm32_timer_info = {
.name = TYPE_LM32_TIMER,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LM32TimerState),
+ .instance_init = lm32_timer_init,
.class_init = lm32_timer_class_init,
};
--
2.1.4
- [Qemu-devel] [PULL 0/6] lm32/milkymist: some qomifying and a small doc fix, Michael Walle, 2016/06/20
- [Qemu-devel] [PULL 1/6] hw/timer: QOM'ify lm32_timer,
Michael Walle <=
- [Qemu-devel] [PULL 2/6] hw/timer: QOM'ify milkymist_sysctl, Michael Walle, 2016/06/20
- [Qemu-devel] [PULL 4/6] hw/display: QOM'ify milkymist-vgafb.c, Michael Walle, 2016/06/20
- [Qemu-devel] [PULL 3/6] hw/display: QOM'ify milkymist-tmu2.c, Michael Walle, 2016/06/20
- [Qemu-devel] [PULL 5/6] hw/intc: QOM'ify lm32_pic.c, Michael Walle, 2016/06/20
- [Qemu-devel] [PULL 6/6] milkymist: update specification URLs, Michael Walle, 2016/06/20
- Re: [Qemu-devel] [PULL 0/6] lm32/milkymist: some qomifying and a small doc fix, Peter Maydell, 2016/06/20