aboutsummaryrefslogtreecommitdiff
path: root/hw/arm/sabrelite.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-05-05 12:19:07 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-05-27 07:45:45 +0200
commit3b914406cf3cfb4ac48388c1ea15036b333b7a79 (patch)
tree22f4071b9b0d1911f6427614a42ab731e9cfb220 /hw/arm/sabrelite.c
parent3e1df4cc46678b155c9d721c73ab6e310d7dd546 (diff)
downloadqemu-3b914406cf3cfb4ac48388c1ea15036b333b7a79.zip
qemu-3b914406cf3cfb4ac48388c1ea15036b333b7a79.tar.gz
qemu-3b914406cf3cfb4ac48388c1ea15036b333b7a79.tar.bz2
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: 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 d2623129a7 "qom: Drop parameter @errp of object_property_add() & friends"]
Diffstat (limited to 'hw/arm/sabrelite.c')
-rw-r--r--hw/arm/sabrelite.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c
index 6f0e233..96cb30a 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));
- 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);