[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/9] hw/arm: QOM'ify armv7m.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH 1/9] hw/arm: QOM'ify armv7m.c |
Date: |
Mon, 7 Mar 2016 15:05:42 +0800 |
Drop the use of old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/arm/armv7m.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index ed7d97f..139247e 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -129,14 +129,14 @@ typedef struct {
uint32_t base;
} BitBandState;
-static int bitband_init(SysBusDevice *dev)
+static void bitband_init(Object *obj)
{
- BitBandState *s = BITBAND(dev);
+ BitBandState *s = BITBAND(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
- memory_region_init_io(&s->iomem, OBJECT(s), &bitband_ops, &s->base,
+ memory_region_init_io(&s->iomem, obj, &bitband_ops, &s->base,
"bitband", 0x02000000);
sysbus_init_mmio(dev, &s->iomem);
- return 0;
}
static void armv7m_bitband_init(void)
@@ -241,9 +241,7 @@ static Property bitband_properties[] = {
static void bitband_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = bitband_init;
dc->props = bitband_properties;
}
@@ -251,6 +249,7 @@ static const TypeInfo bitband_info = {
.name = TYPE_BITBAND,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(BitBandState),
+ .instance_init = bitband_init,
.class_init = bitband_class_init,
};
--
2.1.4
- [Qemu-devel] [PATCH 0/9] some QOM'ify work under hw/arm, xiaoqiang zhao, 2016/03/07
- [Qemu-devel] [PATCH 9/9] hw/arm: QOM'ify versatilepb.c, xiaoqiang zhao, 2016/03/07
- [Qemu-devel] [PATCH 2/9] hw/arm: QOM'ify highbank.c, xiaoqiang zhao, 2016/03/07
- [Qemu-devel] [PATCH 3/9] hw/arm: QOM'ify integratorcp.c, xiaoqiang zhao, 2016/03/07
- [Qemu-devel] [PATCH 5/9] hw/arm: QOM'ify pxa2xx_pic.c, xiaoqiang zhao, 2016/03/07
- [Qemu-devel] [PATCH 1/9] hw/arm: QOM'ify armv7m.c,
xiaoqiang zhao <=
- [Qemu-devel] [PATCH 8/9] hw/arm: QOM'ify strongarm.c, xiaoqiang zhao, 2016/03/07
- [Qemu-devel] [PATCH 4/9] hw/arm: QOM'ify pxa2xx.c, xiaoqiang zhao, 2016/03/07
- [Qemu-devel] [PATCH 7/9] hw/arm: QOM'ify stellaris.c, xiaoqiang zhao, 2016/03/07
- Re: [Qemu-devel] [PATCH 0/9] some QOM'ify work under hw/arm, zxq_yx_007, 2016/03/15
- Re: [Qemu-devel] [PATCH 0/9] some QOM'ify work under hw/arm, Peter Maydell, 2016/03/16