| Message ID | 20200424192027.11404-11-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | More miscellaneous error handling fixes | expand |
On 4/24/20 9:20 PM, Markus Armbruster wrote: > Cc: Peter Maydell <peter.maydell@linaro.org> > Cc: Jean-Christophe Dubois <jcd@tribudubois.net> > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > hw/arm/sabrelite.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c > index e31694bb92..04f4b96591 100644 > --- a/hw/arm/sabrelite.c > +++ b/hw/arm/sabrelite.c > @@ -41,7 +41,6 @@ static void sabrelite_reset_secondary(ARMCPU *cpu, > static void sabrelite_init(MachineState *machine) > { > FslIMX6State *s; > - Error *err = NULL; > > /* Check the amount of memory is compatible with the SOC */ > if (machine->ram_size > FSL_IMX6_MMDC_SIZE) { > @@ -52,11 +51,7 @@ static void sabrelite_init(MachineState *machine) > > s = FSL_IMX6(object_new(TYPE_FSL_IMX6)); > object_property_add_child(OBJECT(machine), "soc", OBJECT(s), &error_fatal); > - object_property_set_bool(OBJECT(s), true, "realized", &err); > - if (err != NULL) { > - error_report("%s", error_get_pretty(err)); > - exit(1); > - } > + object_property_set_bool(OBJECT(s), true, "realized", &error_fatal); > > memory_region_add_subregion(get_system_memory(), FSL_IMX6_MMDC_ADDR, > machine->ram); > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index e31694bb92..04f4b96591 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -41,7 +41,6 @@ static void sabrelite_reset_secondary(ARMCPU *cpu, static void sabrelite_init(MachineState *machine) { FslIMX6State *s; - Error *err = NULL; /* Check the amount of memory is compatible with the SOC */ if (machine->ram_size > FSL_IMX6_MMDC_SIZE) { @@ -52,11 +51,7 @@ static void sabrelite_init(MachineState *machine) s = FSL_IMX6(object_new(TYPE_FSL_IMX6)); object_property_add_child(OBJECT(machine), "soc", OBJECT(s), &error_fatal); - object_property_set_bool(OBJECT(s), true, "realized", &err); - if (err != NULL) { - error_report("%s", error_get_pretty(err)); - exit(1); - } + object_property_set_bool(OBJECT(s), true, "realized", &error_fatal); memory_region_add_subregion(get_system_memory(), FSL_IMX6_MMDC_ADDR, machine->ram);
Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Jean-Christophe Dubois <jcd@tribudubois.net> Signed-off-by: Markus Armbruster <armbru@redhat.com> --- hw/arm/sabrelite.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)