summaryrefslogtreecommitdiffstats
path: root/softmmu
diff options
context:
space:
mode:
authorMarkus Armbruster2021-07-20 14:53:53 +0200
committerMarkus Armbruster2021-08-26 17:15:28 +0200
commitf9734d5d4078f17daf328b9e113aaffe3d00ecaf (patch)
treef0c0f46f58e1576c34b86ed2ee9db13edd57645f /softmmu
parentMerge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-08-26' into ... (diff)
downloadqemu-f9734d5d4078f17daf328b9e113aaffe3d00ecaf.tar.gz
qemu-f9734d5d4078f17daf328b9e113aaffe3d00ecaf.tar.xz
qemu-f9734d5d4078f17daf328b9e113aaffe3d00ecaf.zip
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 'softmmu')
-rw-r--r--softmmu/vl.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 5ca11e7469..6227f8f10e 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -2694,12 +2694,7 @@ void qmp_x_exit_preconfig(Error **errp)
qemu_machine_creation_done();
if (loadvm) {
- Error *local_err = NULL;
- if (!load_snapshot(loadvm, NULL, false, NULL, &local_err)) {
- error_report_err(local_err);
- autostart = 0;
- exit(1);
- }
+ load_snapshot(loadvm, NULL, false, NULL, &error_fatal);
}
if (replay_mode != REPLAY_MODE_NONE) {
replay_vmstate_init();