diff options
| author | Markus Armbruster <armbru@redhat.com> | 2021-07-20 14:53:53 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2021-08-26 17:15:28 +0200 |
| commit | f9734d5d4078f17daf328b9e113aaffe3d00ecaf (patch) | |
| tree | f0c0f46f58e1576c34b86ed2ee9db13edd57645f /hw/s390x | |
| parent | c83fcfaf8a54d0d034bd0edf7bbb3b0d16669be9 (diff) | |
| download | qemu-f9734d5d4078f17daf328b9e113aaffe3d00ecaf.zip qemu-f9734d5d4078f17daf328b9e113aaffe3d00ecaf.tar.gz qemu-f9734d5d4078f17daf328b9e113aaffe3d00ecaf.tar.bz2 | |
error: Use error_fatal to simplify obvious fatal errors (again)
We did this with scripts/coccinelle/use-error_fatal.cocci before, in
commit 50beeb68094 and 007b06578ab. This commit cleans up rarer
variations that don't seem worth matching with Coccinelle.
Cc: Thomas Huth <thuth@redhat.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Juan Quintela <quintela@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210720125408.387910-2-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/ipl.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 8c863cf..1821c6f 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -711,7 +711,6 @@ int s390_ipl_pv_unpack(void) void s390_ipl_prepare_cpu(S390CPU *cpu) { S390IPLState *ipl = get_ipl_device(); - Error *err = NULL; cpu->env.psw.addr = ipl->start_addr; cpu->env.psw.mask = IPL_PSW_MASK; @@ -723,10 +722,7 @@ void s390_ipl_prepare_cpu(S390CPU *cpu) } } if (ipl->netboot) { - if (load_netboot_image(&err) < 0) { - error_report_err(err); - exit(1); - } + load_netboot_image(&error_fatal); ipl->qipl.netboot_start_addr = cpu_to_be64(ipl->start_addr); } s390_ipl_set_boot_menu(ipl); |