On 23/11/18 16:30, Mao Zhongyi wrote:
> Use DeviceClass rather than SysBusDeviceClass in
> milkymist_pfpu_class_init().
>
> Cc: mich...@walle.cc
>
> Signed-off-by: Mao Zhongyi <maozhon...@cmss.chinamobile.com>
> Signed-off-by: Zhang Shengju <zhangshen...@cmss.chinamobile.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> hw/misc/milkymist-pfpu.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/hw/misc/milkymist-pfpu.c b/hw/misc/milkymist-pfpu.c
> index 86f5e383b0..4a03c7ee63 100644
> --- a/hw/misc/milkymist-pfpu.c
> +++ b/hw/misc/milkymist-pfpu.c
> @@ -497,17 +497,16 @@ static void milkymist_pfpu_reset(DeviceState *d)
> }
> }
>
> -static int milkymist_pfpu_init(SysBusDevice *dev)
> +static void milkymist_pfpu_realize(DeviceState *dev, Error **errp)
> {
> MilkymistPFPUState *s = MILKYMIST_PFPU(dev);
> + SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
>
> - sysbus_init_irq(dev, &s->irq);
> + sysbus_init_irq(sbd, &s->irq);
>
> memory_region_init_io(&s->regs_region, OBJECT(dev), &pfpu_mmio_ops, s,
> "milkymist-pfpu", MICROCODE_END * 4);
> - sysbus_init_mmio(dev, &s->regs_region);
> -
> - return 0;
> + sysbus_init_mmio(sbd, &s->regs_region);
> }
>
> static const VMStateDescription vmstate_milkymist_pfpu = {
> @@ -527,9 +526,8 @@ static const VMStateDescription vmstate_milkymist_pfpu = {
> static void milkymist_pfpu_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
>
> - k->init = milkymist_pfpu_init;
> + dc->realize = milkymist_pfpu_realize;
> dc->reset = milkymist_pfpu_reset;
> dc->vmsd = &vmstate_milkymist_pfpu;
> }
>
