[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RESEND PATCH 08/12] hw/misc: QOM'ify arm_l2x0.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-arm] [RESEND PATCH 08/12] hw/misc: QOM'ify arm_l2x0.c |
Date: |
Mon, 13 Jun 2016 18:54:11 +0800 |
Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/misc/arm_l2x0.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/misc/arm_l2x0.c b/hw/misc/arm_l2x0.c
index 4442227..66a0787 100644
--- a/hw/misc/arm_l2x0.c
+++ b/hw/misc/arm_l2x0.c
@@ -159,14 +159,14 @@ static const MemoryRegionOps l2x0_mem_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static int l2x0_priv_init(SysBusDevice *dev)
+static void l2x0_priv_init(Object *obj)
{
- L2x0State *s = ARM_L2X0(dev);
+ L2x0State *s = ARM_L2X0(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
- memory_region_init_io(&s->iomem, OBJECT(dev), &l2x0_mem_ops, s,
+ memory_region_init_io(&s->iomem, obj, &l2x0_mem_ops, s,
"l2x0_cc", 0x1000);
sysbus_init_mmio(dev, &s->iomem);
- return 0;
}
static Property l2x0_properties[] = {
@@ -176,10 +176,8 @@ static Property l2x0_properties[] = {
static void l2x0_class_init(ObjectClass *klass, void *data)
{
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
DeviceClass *dc = DEVICE_CLASS(klass);
- k->init = l2x0_priv_init;
dc->vmsd = &vmstate_l2x0;
dc->props = l2x0_properties;
dc->reset = l2x0_priv_reset;
@@ -189,6 +187,7 @@ static const TypeInfo l2x0_info = {
.name = TYPE_ARM_L2X0,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(L2x0State),
+ .instance_init = l2x0_priv_init,
.class_init = l2x0_class_init,
};
--
2.1.4
- [Qemu-arm] [RESEND PATCH 00/12] some ARM platform QOM'ify work (resend), xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 02/12] hw/i2c: QOM'ify exynos4210_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 05/12] hw/gpio: QOM'ify omap_gpio.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 01/12] hw/i2c: QOM'ify bitbang_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 04/12] hw/i2c: QOM'ify versatile_i2c.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 08/12] hw/misc: QOM'ify arm_l2x0.c,
xiaoqiang zhao <=
- [Qemu-arm] [RESEND PATCH 06/12] hw/gpio: QOM'ify pl061.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 09/12] hw/misc: QOM'ify exynos4210_pmu.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 12/12] hw/sd: QOM'ify pl181.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 10/12] hw/misc: QOM'ify mst_fpga.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 11/12] hw/dma: QOM'ify pxa2xx_dma.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 07/12] hw/gpio: QOM'ify zaurus.c, xiaoqiang zhao, 2016/06/13
- [Qemu-arm] [RESEND PATCH 03/12] hw/i2c: QOM'ify omap_i2c.c, xiaoqiang zhao, 2016/06/13
- Re: [Qemu-arm] [RESEND PATCH 00/12] some ARM platform QOM'ify work (resend), Peter Maydell, 2016/06/14