Re: [Qemu-devel] [RESEND PATCH 3/9] hw/dma: QOM'ify sun4m_iommu.c

[Philippe Mathieu-Daudé]

On 02/05/2017 10:37 AM, xiaoqiang zhao wrote:

Drop the old SysBus init function and use instance_init

Signed-off-by: xiaoqiang zhao 


Reviewed-by: Philippe Mathieu-Daudé 


---
 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, >irq);

-memory_region_init_io(>iomem, OBJECT(s), _mem_ops, s, "iommu",
+memory_region_init_io(>iomem, obj, _mem_ops, s, "iommu",
   IOMMU_NREGS * sizeof(uint32_t));
 sysbus_init_mmio(dev, >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 = _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,
 };

[Qemu-devel] [RESEND PATCH 3/9] hw/dma: QOM'ify sun4m_iommu.c

[xiaoqiang zhao]

Drop the old SysBus init function and use instance_init

Signed-off-by: xiaoqiang zhao 
---
 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, >irq);
 
-memory_region_init_io(>iomem, OBJECT(s), _mem_ops, s, "iommu",
+memory_region_init_io(>iomem, obj, _mem_ops, s, "iommu",
   IOMMU_NREGS * sizeof(uint32_t));
 sysbus_init_mmio(dev, >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 = _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.11.0