ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/dma: QOM'ify sun4m_iommu.c 

Drop the old SysBus init function and use instance_init

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
xiaoqiang zhao 2017-05-25 21:34:46 +08:00 committed by Mark Cave-Ayland
parent 8c612079e0
commit 1c958ad300
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/dma/sun4m_iommu.c
View File

@ -349,17 +349,16 @@ static void iommu_reset(DeviceState *d)
s->regs[IOMMU_MASK_ID] = IOMMU_TS_MASK; 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); 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)); IOMMU_NREGS * sizeof(uint32_t));
sysbus_init_mmio(dev, &s->iomem); sysbus_init_mmio(dev, &s->iomem);
return 0;
} }
static Property iommu_properties[] = { static Property iommu_properties[] = {
@ -370,9 +369,7 @@ static Property iommu_properties[] = {
static void iommu_class_init(ObjectClass *klass, void *data) static void iommu_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = iommu_init1;
dc->reset = iommu_reset; dc->reset = iommu_reset;
dc->vmsd = &vmstate_iommu; dc->vmsd = &vmstate_iommu;
dc->props = iommu_properties; dc->props = iommu_properties;
@ -382,6 +379,7 @@ static const TypeInfo iommu_info = {
.name = TYPE_SUN4M_IOMMU, .name = TYPE_SUN4M_IOMMU,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(IOMMUState), .instance_size = sizeof(IOMMUState),
.instance_init = iommu_init,
.class_init = iommu_class_init, .class_init = iommu_class_init,
}; };