Re: [Qemu-devel] [PATCH] hw/sparc/sun4m: Fix problems with device introspection

2018-06-15 Thread Mark Cave-Ayland 

On 15/06/18 06:15, Thomas Huth wrote:


On 05.04.2018 12:43, Thomas Huth wrote:

Several devices of the sun4m machines are using _fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:

$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
  "package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)

$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
  "package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)

$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
  "package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)

Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).

Signed-off-by: Thomas Huth 
---
  hw/sparc/sun4m.c | 67 ++--
  1 file changed, 50 insertions(+), 17 deletions(-)

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 6471aca..8254ec3 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -572,23 +572,36 @@ typedef struct IDRegState {
  MemoryRegion mem;
  } IDRegState;
  
-static void idreg_init1(Object *obj)

+static void idreg_realize(DeviceState *ds, Error **errp)
  {
-IDRegState *s = MACIO_ID_REGISTER(obj);
-SysBusDevice *dev = SYS_BUS_DEVICE(obj);
+IDRegState *s = MACIO_ID_REGISTER(ds);
+SysBusDevice *dev = SYS_BUS_DEVICE(ds);
+Error *local_err = NULL;
+
+memory_region_init_ram_nomigrate(>mem, OBJECT(ds), "sun4m.idreg",
+ sizeof(idreg_data), _err);
+if (local_err) {
+error_propagate(errp, local_err);
+return;
+}
  
-memory_region_init_ram_nomigrate(>mem, obj,

-   "sun4m.idreg", sizeof(idreg_data), _fatal);
  vmstate_register_ram_global(>mem);
  memory_region_set_readonly(>mem, true);
  sysbus_init_mmio(dev, >mem);
  }
  
+static void idreg_class_init(ObjectClass *oc, void *data)

+{
+DeviceClass *dc = DEVICE_CLASS(oc);
+
+dc->realize = idreg_realize;
+}
+
  static const TypeInfo idreg_info = {
  .name  = TYPE_MACIO_ID_REGISTER,
  .parent= TYPE_SYS_BUS_DEVICE,
  .instance_size = sizeof(IDRegState),
-.instance_init = idreg_init1,
+.class_init= idreg_class_init,
  };
  
  #define TYPE_TCX_AFX "tcx_afx"

@@ -613,21 +626,35 @@ static void afx_init(hwaddr addr)
  sysbus_mmio_map(s, 0, addr);
  }
  
-static void afx_init1(Object *obj)

+static void afx_realize(DeviceState *ds, Error **errp)
  {
-AFXState *s = TCX_AFX(obj);
-SysBusDevice *dev = SYS_BUS_DEVICE(obj);
+AFXState *s = TCX_AFX(ds);
+SysBusDevice *dev = SYS_BUS_DEVICE(ds);
+Error *local_err = NULL;
+
+memory_region_init_ram_nomigrate(>mem, OBJECT(ds), "sun4m.afx", 4,
+ _err);
+if (local_err) {
+error_propagate(errp, local_err);
+return;
+}
  
-memory_region_init_ram_nomigrate(>mem, obj, "sun4m.afx", 4, _fatal);

  vmstate_register_ram_global(>mem);
  sysbus_init_mmio(dev, >mem);
  }
  
+static void afx_class_init(ObjectClass *oc, void *data)

+{
+DeviceClass *dc = DEVICE_CLASS(oc);
+
+dc->realize = afx_realize;
+}
+
  static const TypeInfo afx_info = {
  .name  = TYPE_TCX_AFX,
  .parent= TYPE_SYS_BUS_DEVICE,
  .instance_size = sizeof(AFXState),
-.instance_init = afx_init1,
+.class_init= afx_class_init,
  };
  
  #define TYPE_OPENPROM "openprom"

@@ -680,13 +707,19 @@ static void prom_init(hwaddr addr, const char *bios_name)
  }
  }
  
-static void prom_init1(Object *obj)

+static void prom_realize(DeviceState *ds, Error **errp)
  {
-PROMState *s = OPENPROM(obj);
-SysBusDevice *dev = SYS_BUS_DEVICE(obj);
+PROMState *s = OPENPROM(ds);
+SysBusDevice *dev = SYS_BUS_DEVICE(ds);
+Error *local_err = NULL;
+
+memory_region_init_ram_nomigrate(>prom, OBJECT(ds), "sun4m.prom",
+ PROM_SIZE_MAX, _err);
+if (local_err) {
+error_propagate(errp, local_err);
+return;
+}
  
-

Re: [Qemu-devel] [PATCH] hw/sparc/sun4m: Fix problems with device introspection

2018-06-15 Thread Artyom Tarasenko 
On Fri, Jun 15, 2018 at 7:15 AM, Thomas Huth  wrote:
> On 05.04.2018 12:43, Thomas Huth wrote:
>> Several devices of the sun4m machines are using _fatal in
>> their instance_init function and thus can cause QEMU to abort
>> unexpectedly:
>>
>> $ echo "{'execute':'qmp_capabilities'}"\
>>"{'execute':'device-list-properties',"\
>>" 'arguments':{'typename':'openprom'}}" \
>>| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
>> {"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
>>  "package": "build-all"}, "capabilities": []}}
>> {"return": {}}
>> RAMBlock "sun4m.prom" already registered, abort!
>> Aborted (core dumped)
>>
>> $ echo "{'execute':'qmp_capabilities'}"\
>>"{'execute':'device-list-properties',"\
>>" 'arguments':{'typename':'macio_idreg'}}" \
>>| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
>> {"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
>>  "package": "build-all"}, "capabilities": []}}
>> {"return": {}}
>> RAMBlock "sun4m.idreg" already registered, abort!
>> Aborted (core dumped)
>>
>> $ echo "{'execute':'qmp_capabilities'}"\
>>"{'execute':'device-list-properties',"\
>>" 'arguments':{'typename':'tcx_afx'}}" \
>>| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
>> {"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
>>  "package": "build-all"}, "capabilities": []}}
>> {"return": {}}
>> RAMBlock "sun4m.afx" already registered, abort!
>> Aborted (core dumped)
>>
>> Fix the issues by converting the instance_init functions into realize()
>> functions instead, which are allowed to fail (and not called during
>> device introspection).
>>
>> Signed-off-by: Thomas Huth 
>> ---
>>  hw/sparc/sun4m.c | 67 
>> ++--
>>  1 file changed, 50 insertions(+), 17 deletions(-)
>>
>> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
>> index 6471aca..8254ec3 100644
>> --- a/hw/sparc/sun4m.c
>> +++ b/hw/sparc/sun4m.c
>> @@ -572,23 +572,36 @@ typedef struct IDRegState {
>>  MemoryRegion mem;
>>  } IDRegState;
>>
>> -static void idreg_init1(Object *obj)
>> +static void idreg_realize(DeviceState *ds, Error **errp)
>>  {
>> -IDRegState *s = MACIO_ID_REGISTER(obj);
>> -SysBusDevice *dev = SYS_BUS_DEVICE(obj);
>> +IDRegState *s = MACIO_ID_REGISTER(ds);
>> +SysBusDevice *dev = SYS_BUS_DEVICE(ds);
>> +Error *local_err = NULL;
>> +
>> +memory_region_init_ram_nomigrate(>mem, OBJECT(ds), "sun4m.idreg",
>> + sizeof(idreg_data), _err);
>> +if (local_err) {
>> +error_propagate(errp, local_err);
>> +return;
>> +}
>>
>> -memory_region_init_ram_nomigrate(>mem, obj,
>> -   "sun4m.idreg", sizeof(idreg_data), _fatal);
>>  vmstate_register_ram_global(>mem);
>>  memory_region_set_readonly(>mem, true);
>>  sysbus_init_mmio(dev, >mem);
>>  }
>>
>> +static void idreg_class_init(ObjectClass *oc, void *data)
>> +{
>> +DeviceClass *dc = DEVICE_CLASS(oc);
>> +
>> +dc->realize = idreg_realize;
>> +}
>> +
>>  static const TypeInfo idreg_info = {
>>  .name  = TYPE_MACIO_ID_REGISTER,
>>  .parent= TYPE_SYS_BUS_DEVICE,
>>  .instance_size = sizeof(IDRegState),
>> -.instance_init = idreg_init1,
>> +.class_init= idreg_class_init,
>>  };
>>
>>  #define TYPE_TCX_AFX "tcx_afx"
>> @@ -613,21 +626,35 @@ static void afx_init(hwaddr addr)
>>  sysbus_mmio_map(s, 0, addr);
>>  }
>>
>> -static void afx_init1(Object *obj)
>> +static void afx_realize(DeviceState *ds, Error **errp)
>>  {
>> -AFXState *s = TCX_AFX(obj);
>> -SysBusDevice *dev = SYS_BUS_DEVICE(obj);
>> +AFXState *s = TCX_AFX(ds);
>> +SysBusDevice *dev = SYS_BUS_DEVICE(ds);
>> +Error *local_err = NULL;
>> +
>> +memory_region_init_ram_nomigrate(>mem, OBJECT(ds), "sun4m.afx", 4,
>> + _err);
>> +if (local_err) {
>> +error_propagate(errp, local_err);
>> +return;
>> +}
>>
>> -memory_region_init_ram_nomigrate(>mem, obj, "sun4m.afx", 4, 
>> _fatal);
>>  vmstate_register_ram_global(>mem);
>>  sysbus_init_mmio(dev, >mem);
>>  }
>>
>> +static void afx_class_init(ObjectClass *oc, void *data)
>> +{
>> +DeviceClass *dc = DEVICE_CLASS(oc);
>> +
>> +dc->realize = afx_realize;
>> +}
>> +
>>  static const TypeInfo afx_info = {
>>  .name  = TYPE_TCX_AFX,
>>  .parent= TYPE_SYS_BUS_DEVICE,
>>  .instance_size = sizeof(AFXState),
>> -.instance_init = afx_init1,
>> +.class_init= afx_class_init,
>>  };
>>
>>  #define TYPE_OPENPROM "openprom"
>> @@ -680,13 +707,19 @@ static void prom_init(hwaddr addr, const char 
>> *bios_name)
>>  }
>>  }
>>
>> -static void prom_init1(Object *obj)
>> +static void prom_realize(DeviceState *ds, Error **errp)
>>  {
>> -PROMState *s = OPENPROM(obj);
>> -SysBusDevice *dev =

Re: [Qemu-devel] [PATCH] hw/sparc/sun4m: Fix problems with device introspection

2018-06-14 Thread Thomas Huth 
On 05.04.2018 12:43, Thomas Huth wrote:
> Several devices of the sun4m machines are using _fatal in
> their instance_init function and thus can cause QEMU to abort
> unexpectedly:
> 
> $ echo "{'execute':'qmp_capabilities'}"\
>"{'execute':'device-list-properties',"\
>" 'arguments':{'typename':'openprom'}}" \
>| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
> {"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
>  "package": "build-all"}, "capabilities": []}}
> {"return": {}}
> RAMBlock "sun4m.prom" already registered, abort!
> Aborted (core dumped)
> 
> $ echo "{'execute':'qmp_capabilities'}"\
>"{'execute':'device-list-properties',"\
>" 'arguments':{'typename':'macio_idreg'}}" \
>| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
> {"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
>  "package": "build-all"}, "capabilities": []}}
> {"return": {}}
> RAMBlock "sun4m.idreg" already registered, abort!
> Aborted (core dumped)
> 
> $ echo "{'execute':'qmp_capabilities'}"\
>"{'execute':'device-list-properties',"\
>" 'arguments':{'typename':'tcx_afx'}}" \
>| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
> {"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
>  "package": "build-all"}, "capabilities": []}}
> {"return": {}}
> RAMBlock "sun4m.afx" already registered, abort!
> Aborted (core dumped)
> 
> Fix the issues by converting the instance_init functions into realize()
> functions instead, which are allowed to fail (and not called during
> device introspection).
> 
> Signed-off-by: Thomas Huth 
> ---
>  hw/sparc/sun4m.c | 67 
> ++--
>  1 file changed, 50 insertions(+), 17 deletions(-)
> 
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 6471aca..8254ec3 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -572,23 +572,36 @@ typedef struct IDRegState {
>  MemoryRegion mem;
>  } IDRegState;
>  
> -static void idreg_init1(Object *obj)
> +static void idreg_realize(DeviceState *ds, Error **errp)
>  {
> -IDRegState *s = MACIO_ID_REGISTER(obj);
> -SysBusDevice *dev = SYS_BUS_DEVICE(obj);
> +IDRegState *s = MACIO_ID_REGISTER(ds);
> +SysBusDevice *dev = SYS_BUS_DEVICE(ds);
> +Error *local_err = NULL;
> +
> +memory_region_init_ram_nomigrate(>mem, OBJECT(ds), "sun4m.idreg",
> + sizeof(idreg_data), _err);
> +if (local_err) {
> +error_propagate(errp, local_err);
> +return;
> +}
>  
> -memory_region_init_ram_nomigrate(>mem, obj,
> -   "sun4m.idreg", sizeof(idreg_data), _fatal);
>  vmstate_register_ram_global(>mem);
>  memory_region_set_readonly(>mem, true);
>  sysbus_init_mmio(dev, >mem);
>  }
>  
> +static void idreg_class_init(ObjectClass *oc, void *data)
> +{
> +DeviceClass *dc = DEVICE_CLASS(oc);
> +
> +dc->realize = idreg_realize;
> +}
> +
>  static const TypeInfo idreg_info = {
>  .name  = TYPE_MACIO_ID_REGISTER,
>  .parent= TYPE_SYS_BUS_DEVICE,
>  .instance_size = sizeof(IDRegState),
> -.instance_init = idreg_init1,
> +.class_init= idreg_class_init,
>  };
>  
>  #define TYPE_TCX_AFX "tcx_afx"
> @@ -613,21 +626,35 @@ static void afx_init(hwaddr addr)
>  sysbus_mmio_map(s, 0, addr);
>  }
>  
> -static void afx_init1(Object *obj)
> +static void afx_realize(DeviceState *ds, Error **errp)
>  {
> -AFXState *s = TCX_AFX(obj);
> -SysBusDevice *dev = SYS_BUS_DEVICE(obj);
> +AFXState *s = TCX_AFX(ds);
> +SysBusDevice *dev = SYS_BUS_DEVICE(ds);
> +Error *local_err = NULL;
> +
> +memory_region_init_ram_nomigrate(>mem, OBJECT(ds), "sun4m.afx", 4,
> + _err);
> +if (local_err) {
> +error_propagate(errp, local_err);
> +return;
> +}
>  
> -memory_region_init_ram_nomigrate(>mem, obj, "sun4m.afx", 4, 
> _fatal);
>  vmstate_register_ram_global(>mem);
>  sysbus_init_mmio(dev, >mem);
>  }
>  
> +static void afx_class_init(ObjectClass *oc, void *data)
> +{
> +DeviceClass *dc = DEVICE_CLASS(oc);
> +
> +dc->realize = afx_realize;
> +}
> +
>  static const TypeInfo afx_info = {
>  .name  = TYPE_TCX_AFX,
>  .parent= TYPE_SYS_BUS_DEVICE,
>  .instance_size = sizeof(AFXState),
> -.instance_init = afx_init1,
> +.class_init= afx_class_init,
>  };
>  
>  #define TYPE_OPENPROM "openprom"
> @@ -680,13 +707,19 @@ static void prom_init(hwaddr addr, const char 
> *bios_name)
>  }
>  }
>  
> -static void prom_init1(Object *obj)
> +static void prom_realize(DeviceState *ds, Error **errp)
>  {
> -PROMState *s = OPENPROM(obj);
> -SysBusDevice *dev = SYS_BUS_DEVICE(obj);
> +PROMState *s = OPENPROM(ds);
> +SysBusDevice *dev = SYS_BUS_DEVICE(ds);
> +Error *local_err = NULL;
> +
> +

Re: [Qemu-devel] [PATCH] hw/sparc/sun4m: Fix problems with device introspection

2018-04-06 Thread Mark Cave-Ayland 

On 05/04/18 11:43, Thomas Huth wrote:

Several devices of the sun4m machines are using _fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:

$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'openprom'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
  "package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)

$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'macio_idreg'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
  "package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)

$ echo "{'execute':'qmp_capabilities'}"\
"{'execute':'device-list-properties',"\
" 'arguments':{'typename':'tcx_afx'}}" \
| sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
  "package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)

Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).

Signed-off-by: Thomas Huth 
---
  hw/sparc/sun4m.c | 67 ++--
  1 file changed, 50 insertions(+), 17 deletions(-)

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 6471aca..8254ec3 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -572,23 +572,36 @@ typedef struct IDRegState {
  MemoryRegion mem;
  } IDRegState;
  
-static void idreg_init1(Object *obj)

+static void idreg_realize(DeviceState *ds, Error **errp)
  {
-IDRegState *s = MACIO_ID_REGISTER(obj);
-SysBusDevice *dev = SYS_BUS_DEVICE(obj);
+IDRegState *s = MACIO_ID_REGISTER(ds);
+SysBusDevice *dev = SYS_BUS_DEVICE(ds);
+Error *local_err = NULL;
+
+memory_region_init_ram_nomigrate(>mem, OBJECT(ds), "sun4m.idreg",
+ sizeof(idreg_data), _err);
+if (local_err) {
+error_propagate(errp, local_err);
+return;
+}
  
-memory_region_init_ram_nomigrate(>mem, obj,

-   "sun4m.idreg", sizeof(idreg_data), _fatal);
  vmstate_register_ram_global(>mem);
  memory_region_set_readonly(>mem, true);
  sysbus_init_mmio(dev, >mem);
  }
  
+static void idreg_class_init(ObjectClass *oc, void *data)

+{
+DeviceClass *dc = DEVICE_CLASS(oc);
+
+dc->realize = idreg_realize;
+}
+
  static const TypeInfo idreg_info = {
  .name  = TYPE_MACIO_ID_REGISTER,
  .parent= TYPE_SYS_BUS_DEVICE,
  .instance_size = sizeof(IDRegState),
-.instance_init = idreg_init1,
+.class_init= idreg_class_init,
  };
  
  #define TYPE_TCX_AFX "tcx_afx"

@@ -613,21 +626,35 @@ static void afx_init(hwaddr addr)
  sysbus_mmio_map(s, 0, addr);
  }
  
-static void afx_init1(Object *obj)

+static void afx_realize(DeviceState *ds, Error **errp)
  {
-AFXState *s = TCX_AFX(obj);
-SysBusDevice *dev = SYS_BUS_DEVICE(obj);
+AFXState *s = TCX_AFX(ds);
+SysBusDevice *dev = SYS_BUS_DEVICE(ds);
+Error *local_err = NULL;
+
+memory_region_init_ram_nomigrate(>mem, OBJECT(ds), "sun4m.afx", 4,
+ _err);
+if (local_err) {
+error_propagate(errp, local_err);
+return;
+}
  
-memory_region_init_ram_nomigrate(>mem, obj, "sun4m.afx", 4, _fatal);

  vmstate_register_ram_global(>mem);
  sysbus_init_mmio(dev, >mem);
  }
  
+static void afx_class_init(ObjectClass *oc, void *data)

+{
+DeviceClass *dc = DEVICE_CLASS(oc);
+
+dc->realize = afx_realize;
+}
+
  static const TypeInfo afx_info = {
  .name  = TYPE_TCX_AFX,
  .parent= TYPE_SYS_BUS_DEVICE,
  .instance_size = sizeof(AFXState),
-.instance_init = afx_init1,
+.class_init= afx_class_init,
  };
  
  #define TYPE_OPENPROM "openprom"

@@ -680,13 +707,19 @@ static void prom_init(hwaddr addr, const char *bios_name)
  }
  }
  
-static void prom_init1(Object *obj)

+static void prom_realize(DeviceState *ds, Error **errp)
  {
-PROMState *s = OPENPROM(obj);
-SysBusDevice *dev = SYS_BUS_DEVICE(obj);
+PROMState *s = OPENPROM(ds);
+SysBusDevice *dev = SYS_BUS_DEVICE(ds);
+Error *local_err = NULL;
+
+memory_region_init_ram_nomigrate(>prom, OBJECT(ds), "sun4m.prom",
+ PROM_SIZE_MAX, _err);
+if (local_err) {
+error_propagate(errp, local_err);
+return;
+}
  
-

[Qemu-devel] [PATCH] hw/sparc/sun4m: Fix problems with device introspection

2018-04-05 Thread Thomas Huth 
Several devices of the sun4m machines are using _fatal in
their instance_init function and thus can cause QEMU to abort
unexpectedly:

$ echo "{'execute':'qmp_capabilities'}"\
   "{'execute':'device-list-properties',"\
   " 'arguments':{'typename':'openprom'}}" \
   | sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
 "package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.prom" already registered, abort!
Aborted (core dumped)

$ echo "{'execute':'qmp_capabilities'}"\
   "{'execute':'device-list-properties',"\
   " 'arguments':{'typename':'macio_idreg'}}" \
   | sparc-softmmu/qemu-system-sparc -M SS-10 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
 "package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.idreg" already registered, abort!
Aborted (core dumped)

$ echo "{'execute':'qmp_capabilities'}"\
   "{'execute':'device-list-properties',"\
   " 'arguments':{'typename':'tcx_afx'}}" \
   | sparc-softmmu/qemu-system-sparc -M SS-5 -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 91, "minor": 11, "major": 2},
 "package": "build-all"}, "capabilities": []}}
{"return": {}}
RAMBlock "sun4m.afx" already registered, abort!
Aborted (core dumped)

Fix the issues by converting the instance_init functions into realize()
functions instead, which are allowed to fail (and not called during
device introspection).

Signed-off-by: Thomas Huth 
---
 hw/sparc/sun4m.c | 67 ++--
 1 file changed, 50 insertions(+), 17 deletions(-)

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 6471aca..8254ec3 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -572,23 +572,36 @@ typedef struct IDRegState {
 MemoryRegion mem;
 } IDRegState;
 
-static void idreg_init1(Object *obj)
+static void idreg_realize(DeviceState *ds, Error **errp)
 {
-IDRegState *s = MACIO_ID_REGISTER(obj);
-SysBusDevice *dev = SYS_BUS_DEVICE(obj);
+IDRegState *s = MACIO_ID_REGISTER(ds);
+SysBusDevice *dev = SYS_BUS_DEVICE(ds);
+Error *local_err = NULL;
+
+memory_region_init_ram_nomigrate(>mem, OBJECT(ds), "sun4m.idreg",
+ sizeof(idreg_data), _err);
+if (local_err) {
+error_propagate(errp, local_err);
+return;
+}
 
-memory_region_init_ram_nomigrate(>mem, obj,
-   "sun4m.idreg", sizeof(idreg_data), _fatal);
 vmstate_register_ram_global(>mem);
 memory_region_set_readonly(>mem, true);
 sysbus_init_mmio(dev, >mem);
 }
 
+static void idreg_class_init(ObjectClass *oc, void *data)
+{
+DeviceClass *dc = DEVICE_CLASS(oc);
+
+dc->realize = idreg_realize;
+}
+
 static const TypeInfo idreg_info = {
 .name  = TYPE_MACIO_ID_REGISTER,
 .parent= TYPE_SYS_BUS_DEVICE,
 .instance_size = sizeof(IDRegState),
-.instance_init = idreg_init1,
+.class_init= idreg_class_init,
 };
 
 #define TYPE_TCX_AFX "tcx_afx"
@@ -613,21 +626,35 @@ static void afx_init(hwaddr addr)
 sysbus_mmio_map(s, 0, addr);
 }
 
-static void afx_init1(Object *obj)
+static void afx_realize(DeviceState *ds, Error **errp)
 {
-AFXState *s = TCX_AFX(obj);
-SysBusDevice *dev = SYS_BUS_DEVICE(obj);
+AFXState *s = TCX_AFX(ds);
+SysBusDevice *dev = SYS_BUS_DEVICE(ds);
+Error *local_err = NULL;
+
+memory_region_init_ram_nomigrate(>mem, OBJECT(ds), "sun4m.afx", 4,
+ _err);
+if (local_err) {
+error_propagate(errp, local_err);
+return;
+}
 
-memory_region_init_ram_nomigrate(>mem, obj, "sun4m.afx", 4, 
_fatal);
 vmstate_register_ram_global(>mem);
 sysbus_init_mmio(dev, >mem);
 }
 
+static void afx_class_init(ObjectClass *oc, void *data)
+{
+DeviceClass *dc = DEVICE_CLASS(oc);
+
+dc->realize = afx_realize;
+}
+
 static const TypeInfo afx_info = {
 .name  = TYPE_TCX_AFX,
 .parent= TYPE_SYS_BUS_DEVICE,
 .instance_size = sizeof(AFXState),
-.instance_init = afx_init1,
+.class_init= afx_class_init,
 };
 
 #define TYPE_OPENPROM "openprom"
@@ -680,13 +707,19 @@ static void prom_init(hwaddr addr, const char *bios_name)
 }
 }
 
-static void prom_init1(Object *obj)
+static void prom_realize(DeviceState *ds, Error **errp)
 {
-PROMState *s = OPENPROM(obj);
-SysBusDevice *dev = SYS_BUS_DEVICE(obj);
+PROMState *s = OPENPROM(ds);
+SysBusDevice *dev = SYS_BUS_DEVICE(ds);
+Error *local_err = NULL;
+
+memory_region_init_ram_nomigrate(>prom, OBJECT(ds), "sun4m.prom",
+ PROM_SIZE_MAX, _err);
+if (local_err) {
+error_propagate(errp, local_err);
+return;
+}
 
-memory_region_init_ram_nomigrate(>prom, obj, "sun4m.prom", 
PROM_SIZE_MAX,
-   _fatal);