[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/22] timer/puv3_ost: Convert sysbus init function
From: |
Mao Zhongyi |
Subject: |
[Qemu-devel] [PATCH 18/22] timer/puv3_ost: Convert sysbus init function to realize function |
Date: |
Mon, 19 Nov 2018 20:08:16 +0800 |
Use DeviceClass rather than SysBusDeviceClass in
puv3_ost_class_init().
Cc: address@hidden
Signed-off-by: Mao Zhongyi <address@hidden>
Signed-off-by: Zhang Shengju <address@hidden>
---
hw/timer/puv3_ost.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/timer/puv3_ost.c b/hw/timer/puv3_ost.c
index 0b3d717e60..853b96dbde 100644
--- a/hw/timer/puv3_ost.c
+++ b/hw/timer/puv3_ost.c
@@ -113,7 +113,7 @@ static void puv3_ost_tick(void *opaque)
}
}
-static int puv3_ost_init(SysBusDevice *dev)
+static void puv3_ost_realize(DeviceState *dev, Error **errp)
{
PUV3OSTState *s = PUV3_OST(dev);
@@ -122,7 +122,7 @@ static int puv3_ost_init(SysBusDevice *dev)
s->reg_OSMR0 = 0;
s->reg_OSCR = 0;
- sysbus_init_irq(dev, &s->irq);
+ sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq);
s->bh = qemu_bh_new(puv3_ost_tick, s);
s->ptimer = ptimer_init(s->bh, PTIMER_POLICY_DEFAULT);
@@ -130,16 +130,14 @@ static int puv3_ost_init(SysBusDevice *dev)
memory_region_init_io(&s->iomem, OBJECT(s), &puv3_ost_ops, s, "puv3_ost",
PUV3_REGS_OFFSET);
- sysbus_init_mmio(dev, &s->iomem);
-
- return 0;
+ sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem);
}
static void puv3_ost_class_init(ObjectClass *klass, void *data)
{
- SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
+ DeviceClass *dc = DEVICE_CLASS(klass);
- sdc->init = puv3_ost_init;
+ dc->realize = puv3_ost_realize;
}
static const TypeInfo puv3_ost_info = {
--
2.17.1
- [Qemu-devel] [PATCH 16/22] timer/etraxfs_timer: Convert sysbus init function to realize function, (continued)
- [Qemu-devel] [PATCH 16/22] timer/etraxfs_timer: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 02/22] block/noenand: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 07/22] gpio/puv3_gpio: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 13/22] puv3_pm.c: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 05/22] display/g364fb: Convert sysbus init function to realize function, Mao Zhongyi, 2018/11/19
- [Qemu-devel] [PATCH 18/22] timer/puv3_ost: Convert sysbus init function to realize function,
Mao Zhongyi <=
- Re: [Qemu-devel] [PATCH 00/22] QOM'ify SysBusDeviceClass->init, Cornelia Huck, 2018/11/19