On 27 January 2016 at 02:54, xiaoqiang zhao <zxq_yx_...@163.com> wrote:
> * split lm32_timer_init into lm32_timer_info.instance_init and
> lm32_timer_realize
> * use DeviceClass::realize instead of SysBusDeviceClass::init
Long lines again.
> Signed-off-by: xiaoqiang zhao <zxq_yx_...@163.com>
> ---
> hw/timer/lm32_timer.c | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/hw/timer/lm32_timer.c b/hw/timer/lm32_timer.c
> index d2ab1e7..4ee080a 100644
> --- a/hw/timer/lm32_timer.c
> +++ b/hw/timer/lm32_timer.c
> @@ -175,21 +175,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,
> "timer", R_MAX * 4);
> sysbus_init_mmio(dev, &s->iomem);
> +}
You could avoid the OBJECT() cast here now.
Otherwise:
Reviewed-by: Peter Maydell <peter.mayd...@linaro.org>
thanks
-- PMM
