Re: [Qemu-devel] [PATCH 13/22] puv3_pm.c: Convert sysbus init function to realize function

2018-11-20 Thread Philippe Mathieu-Daudé

On 19/11/18 13:08, Mao Zhongyi wrote:

Use DeviceClass rather than SysBusDeviceClass in
puv3_pm_class_init().

Cc: g...@mprc.pku.edu.cn

Signed-off-by: Mao Zhongyi 
Signed-off-by: Zhang Shengju 


Reviewed-by: Philippe Mathieu-Daudé 


---
  hw/misc/puv3_pm.c | 10 --
  1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c
index 577cebaac7..afe191fbe1 100644
--- a/hw/misc/puv3_pm.c
+++ b/hw/misc/puv3_pm.c
@@ -119,7 +119,7 @@ static const MemoryRegionOps puv3_pm_ops = {
  .endianness = DEVICE_NATIVE_ENDIAN,
  };
  
-static int puv3_pm_init(SysBusDevice *dev)

+static void puv3_pm_realize(DeviceState *dev, Error **errp)
  {
  PUV3PMState *s = PUV3_PM(dev);
  
@@ -127,16 +127,14 @@ static int puv3_pm_init(SysBusDevice *dev)
  
  memory_region_init_io(>iomem, OBJECT(s), _pm_ops, s, "puv3_pm",

  PUV3_REGS_OFFSET);
-sysbus_init_mmio(dev, >iomem);
-
-return 0;
+sysbus_init_mmio(SYS_BUS_DEVICE(dev), >iomem);
  }
  
  static void puv3_pm_class_init(ObjectClass *klass, void *data)

  {
-SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
+DeviceClass *dc = DEVICE_CLASS(klass);
  
-sdc->init = puv3_pm_init;

+dc->realize = puv3_pm_realize;
  }
  
  static const TypeInfo puv3_pm_info = {






Re: [Qemu-devel] [PATCH 13/22] puv3_pm.c: Convert sysbus init function to realize function

2018-11-20 Thread Peter Maydell
On 19 November 2018 at 12:08, Mao Zhongyi
 wrote:
> Use DeviceClass rather than SysBusDeviceClass in
> puv3_pm_class_init().
>
> Cc: g...@mprc.pku.edu.cn
>
> Signed-off-by: Mao Zhongyi 
> Signed-off-by: Zhang Shengju 
> ---
>  hw/misc/puv3_pm.c | 10 --
>  1 file changed, 4 insertions(+), 6 deletions(-)
>

Reviewed-by: Peter Maydell 

thanks
-- PMM



[Qemu-devel] [PATCH 13/22] puv3_pm.c: Convert sysbus init function to realize function

2018-11-19 Thread Mao Zhongyi
Use DeviceClass rather than SysBusDeviceClass in
puv3_pm_class_init().

Cc: g...@mprc.pku.edu.cn

Signed-off-by: Mao Zhongyi 
Signed-off-by: Zhang Shengju 
---
 hw/misc/puv3_pm.c | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/hw/misc/puv3_pm.c b/hw/misc/puv3_pm.c
index 577cebaac7..afe191fbe1 100644
--- a/hw/misc/puv3_pm.c
+++ b/hw/misc/puv3_pm.c
@@ -119,7 +119,7 @@ static const MemoryRegionOps puv3_pm_ops = {
 .endianness = DEVICE_NATIVE_ENDIAN,
 };
 
-static int puv3_pm_init(SysBusDevice *dev)
+static void puv3_pm_realize(DeviceState *dev, Error **errp)
 {
 PUV3PMState *s = PUV3_PM(dev);
 
@@ -127,16 +127,14 @@ static int puv3_pm_init(SysBusDevice *dev)
 
 memory_region_init_io(>iomem, OBJECT(s), _pm_ops, s, "puv3_pm",
 PUV3_REGS_OFFSET);
-sysbus_init_mmio(dev, >iomem);
-
-return 0;
+sysbus_init_mmio(SYS_BUS_DEVICE(dev), >iomem);
 }
 
 static void puv3_pm_class_init(ObjectClass *klass, void *data)
 {
-SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
+DeviceClass *dc = DEVICE_CLASS(klass);
 
-sdc->init = puv3_pm_init;
+dc->realize = puv3_pm_realize;
 }
 
 static const TypeInfo puv3_pm_info = {
-- 
2.17.1