[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 3/8] hw/dma: QOM'ify sun4m_iommu.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH v3 3/8] hw/dma: QOM'ify sun4m_iommu.c |
Date: |
Thu, 25 May 2017 21:34:46 +0800 |
Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/dma/sun4m_iommu.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/dma/sun4m_iommu.c b/hw/dma/sun4m_iommu.c
index b3cbc54c23..335ef63cbc 100644
--- a/hw/dma/sun4m_iommu.c
+++ b/hw/dma/sun4m_iommu.c
@@ -349,17 +349,16 @@ static void iommu_reset(DeviceState *d)
s->regs[IOMMU_MASK_ID] = IOMMU_TS_MASK;
}
-static int iommu_init1(SysBusDevice *dev)
+static void iommu_init(Object *obj)
{
- IOMMUState *s = SUN4M_IOMMU(dev);
+ IOMMUState *s = SUN4M_IOMMU(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
sysbus_init_irq(dev, &s->irq);
- memory_region_init_io(&s->iomem, OBJECT(s), &iommu_mem_ops, s, "iommu",
+ memory_region_init_io(&s->iomem, obj, &iommu_mem_ops, s, "iommu",
IOMMU_NREGS * sizeof(uint32_t));
sysbus_init_mmio(dev, &s->iomem);
-
- return 0;
}
static Property iommu_properties[] = {
@@ -370,9 +369,7 @@ static Property iommu_properties[] = {
static void iommu_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = iommu_init1;
dc->reset = iommu_reset;
dc->vmsd = &vmstate_iommu;
dc->props = iommu_properties;
@@ -382,6 +379,7 @@ static const TypeInfo iommu_info = {
.name = TYPE_SUN4M_IOMMU,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(IOMMUState),
+ .instance_init = iommu_init,
.class_init = iommu_class_init,
};
--
2.13.0.rc2.115.g10c78a162
- [Qemu-devel] [PATCH v3 0/8] QOM'ify work for sparc, xiaoqiang zhao, 2017/05/25
- [Qemu-devel] [PATCH v3 3/8] hw/dma: QOM'ify sun4m_iommu.c,
xiaoqiang zhao <=
- [Qemu-devel] [PATCH v3 4/8] hw/misc: QOM'ify slavio_misc.c, xiaoqiang zhao, 2017/05/25
- [Qemu-devel] [PATCH v3 5/8] hw/timer: QOM'ify m48txx_sysbus, xiaoqiang zhao, 2017/05/25
- [Qemu-devel] [PATCH v3 6/8] hw/timer: QOM'ify slavio_timer, xiaoqiang zhao, 2017/05/25
- [Qemu-devel] [PATCH v3 1/8] hw/misc: QOM'ify eccmemctl.c, xiaoqiang zhao, 2017/05/25
- [Qemu-devel] [PATCH v3 8/8] hw/sparc64: QOM'ify sun4u.c, xiaoqiang zhao, 2017/05/25
- [Qemu-devel] [PATCH v3 2/8] hw/dma: QOM'ify sparc32_dma.c, xiaoqiang zhao, 2017/05/25
- [Qemu-devel] [PATCH v3 7/8] hw/sparc: QOM'ify sun4m.c, xiaoqiang zhao, 2017/05/25