Skip to content

Commit

Permalink
arm/sabrelite: Consistently use &error_fatal in sabrelite_init()
Browse files Browse the repository at this point in the history
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Jean-Christophe Dubois <jcd@tribudubois.net>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200505101908.6207-10-armbru@redhat.com>
[Straightforward conflict with resolved d262312 "qom: Drop
parameter @errp of object_property_add() & friends"]
  • Loading branch information
Markus Armbruster committed May 27, 2020
1 parent 3e1df4c commit 3b91440
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions hw/arm/sabrelite.c
Expand Up @@ -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) {
Expand All @@ -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));
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);
Expand Down

0 comments on commit 3b91440

Please sign in to comment.