aboutsummaryrefslogtreecommitdiff
path: root/hw/arm
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-08-16 14:58:40 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-08-26 17:02:01 +0100
commit33c20e3caf82096e7fd50eed0d47778109f62081 (patch)
tree1cc11bc3bf395b1a2cffefaefdd6e00e90df94c6 /hw/arm
parentbaa873f7508df9f622c9d1ed43d3a03c9cce785c (diff)
downloadqemu-33c20e3caf82096e7fd50eed0d47778109f62081.zip
qemu-33c20e3caf82096e7fd50eed0d47778109f62081.tar.gz
qemu-33c20e3caf82096e7fd50eed0d47778109f62081.tar.bz2
raspi: Use error_fatal for SoC realize errors, not error_abort
The SoC realize can fail for legitimate reasons, because it propagates errors up from CPU realize, which in turn can be provoked by user error in setting commandline options. Use error_fatal so we report the error message to the user and exit, rather than asserting via error_abort. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20210816135842.25302-2-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm')
-rw-r--r--hw/arm/raspi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index b30a178..0ada91c 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -281,7 +281,7 @@ static void raspi_machine_init(MachineState *machine)
object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(machine->ram));
object_property_set_int(OBJECT(&s->soc), "board-rev", board_rev,
&error_abort);
- qdev_realize(DEVICE(&s->soc), NULL, &error_abort);
+ qdev_realize(DEVICE(&s->soc), NULL, &error_fatal);
/* Create and plug in the SD cards */
di = drive_get_next(IF_SD);