diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-09 16:09:15 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-09 16:09:15 +0000 |
| commit | 84c0781103dcbe9b5e5433ba16fbeb55d69d6cb7 (patch) | |
| tree | 5d28ae42b2b242070fab82209e18b4543170850d /hw/arm/imx25_pdk.c | |
| parent | 2f71f79ccd37ffdb857f043025eccb1c9c23401c (diff) | |
| parent | d76a3bf5c46d9e981faf09e6194c795ee54e5ae4 (diff) | |
| download | focaccia-qemu-84c0781103dcbe9b5e5433ba16fbeb55d69d6cb7.tar.gz focaccia-qemu-84c0781103dcbe9b5e5433ba16fbeb55d69d6cb7.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-02-09' into staging
Error reporting patches for 2016-02-09 # gpg: Signature made Tue 09 Feb 2016 12:38:33 GMT using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" * remotes/armbru/tags/pull-error-2016-02-09: HACKING: Add a section on error handling and reporting error: Improve documentation some more Use error_fatal to simplify obvious fatal errors (again) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/imx25_pdk.c')
| -rw-r--r-- | hw/arm/imx25_pdk.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index b167e19f5a..e3cffd190c 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -65,7 +65,6 @@ static struct arm_boot_info imx25_pdk_binfo; static void imx25_pdk_init(MachineState *machine) { IMX25PDK *s = g_new0(IMX25PDK, 1); - Error *err = NULL; unsigned int ram_size; unsigned int alias_offset; int i; @@ -74,11 +73,7 @@ static void imx25_pdk_init(MachineState *machine) object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc), &error_abort); - object_property_set_bool(OBJECT(&s->soc), true, "realized", &err); - if (err != NULL) { - error_report_err(err); - exit(1); - } + object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_fatal); /* We need to initialize our memory */ if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE)) { |