aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-02-09 16:09:15 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-09 16:09:15 +0000
commit84c0781103dcbe9b5e5433ba16fbeb55d69d6cb7 (patch)
tree5d28ae42b2b242070fab82209e18b4543170850d /vl.c
parent2f71f79ccd37ffdb857f043025eccb1c9c23401c (diff)
parentd76a3bf5c46d9e981faf09e6194c795ee54e5ae4 (diff)
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 'vl.c')
-rw-r--r--vl.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/vl.c b/vl.c
index 00dc9979e1..175ebccb81 100644
--- a/vl.c
+++ b/vl.c
@@ -4557,12 +4557,7 @@ int main(int argc, char **argv, char **envp)
net_check_clients();
if (boot_once) {
- Error *local_err = NULL;
- qemu_boot_set(boot_once, &local_err);
- if (local_err) {
- error_report_err(local_err);
- exit(1);
- }
+ qemu_boot_set(boot_once, &error_fatal);
qemu_register_reset(restore_boot_order, g_strdup(boot_order));
}