diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-01-14 16:02:12 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-02-08 17:22:00 +0100 |
| commit | 07d04a0219b9f385de5884717e3e7fb0c6623979 (patch) | |
| tree | 4ad22edc3ff0c6552954cdd064dfbef50eee2215 /hw/arm/kzm.c | |
| parent | e4a096b1cd4350eeca5dcdc391ab333d2083d7fd (diff) | |
Use error_fatal to simplify obvious fatal errors (again)
Done with the Coccinelle semantic patch from commit 007b065, plus
manual clean up of dead variables.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1452783732-6581-1-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'hw/arm/kzm.c')
| -rw-r--r-- | hw/arm/kzm.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index 55fb36021c..2eeb9d8973 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -64,7 +64,6 @@ static struct arm_boot_info kzm_binfo = { static void kzm_init(MachineState *machine) { IMX31KZM *s = g_new0(IMX31KZM, 1); - Error *err = NULL; unsigned int ram_size; unsigned int alias_offset; unsigned int i; @@ -73,11 +72,7 @@ static void kzm_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); /* Check the amount of memory is compatible with the SOC */ if (machine->ram_size > (FSL_IMX31_SDRAM0_SIZE + FSL_IMX31_SDRAM1_SIZE)) { |