[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/14] hw/timmer: QOM'ify pl031
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH 10/14] hw/timmer: QOM'ify pl031 |
Date: |
Tue, 26 Jan 2016 18:55:49 +0800 |
assign pl031_init to pl031_info.instance_init and drop the
SysBusDeviceClass::init
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/timer/pl031.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c
index 34d9b44..b3a2152 100644
--- a/hw/timer/pl031.c
+++ b/hw/timer/pl031.c
@@ -191,9 +191,10 @@ static const MemoryRegionOps pl031_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static int pl031_init(SysBusDevice *dev)
+static void pl031_init(Object *obj)
{
- PL031State *s = PL031(dev);
+ PL031State *s = PL031(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
struct tm tm;
memory_region_init_io(&s->iomem, OBJECT(s), &pl031_ops, s, "pl031",
0x1000);
@@ -205,7 +206,6 @@ static int pl031_init(SysBusDevice *dev)
qemu_clock_get_ns(rtc_clock) / get_ticks_per_sec();
s->timer = timer_new_ns(rtc_clock, pl031_interrupt, s);
- return 0;
}
static void pl031_pre_save(void *opaque)
@@ -248,9 +248,7 @@ static const VMStateDescription vmstate_pl031 = {
static void pl031_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = pl031_init;
dc->vmsd = &vmstate_pl031;
}
@@ -258,6 +256,7 @@ static const TypeInfo pl031_info = {
.name = TYPE_PL031,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PL031State),
+ .instance_init = pl031_init,
.class_init = pl031_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 <=
- [Qemu-devel] [PATCH 02/14] hw/timmer: QOM'ify etraxfs_timer, xiaoqiang zhao, 2016/01/26
- [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