Commit 3b914406 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

arm/sabrelite: Consistently use &error_fatal in sabrelite_init() 



Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Jean-Christophe Dubois <jcd@tribudubois.net>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200505101908.6207-10-armbru@redhat.com>
[Straightforward conflict with resolved d2623129 "qom: Drop
parameter @errp of object_property_add() & friends"]
parent 3e1df4cc

hw/arm/sabrelite.c

+1 −6
Original line number Diff line number Diff line
@@ -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));

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