diff mbox

[1/4] error: New error_fatal

Message ID 1441983105-26376-2-git-send-email-armbru@redhat.com
State New
Headers show

Commit Message

Markus Armbruster Sept. 11, 2015, 2:51 p.m. UTC 
Similar to error_abort, but doesn't report where the error was
created, and terminates the process with exit(1) rather than abort().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 include/qapi/error.h | 11 +++++++++++
 util/error.c         | 34 +++++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 13 deletions(-)

Comments

Eric Blake Sept. 11, 2015, 3:13 p.m. UTC | #1 
On 09/11/2015 08:51 AM, Markus Armbruster wrote:
> Similar to error_abort, but doesn't report where the error was
> created, and terminates the process with exit(1) rather than abort().
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  include/qapi/error.h | 11 +++++++++++
>  util/error.c         | 34 +++++++++++++++++++++-------------
>  2 files changed, 32 insertions(+), 13 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/include/qapi/error.h b/include/qapi/error.h
> index d7878c3..c69dddb 100644
> --- a/include/qapi/error.h
> +++ b/include/qapi/error.h
> @@ -50,6 +50,9 @@
>   * Call a function aborting on errors:
>   *     foo(arg, &error_abort);
>   *
> + * Call a function treating errors as fatal:
> + *     foo(arg, &error_fatal);
> + *

Might be worth a bit more explanatory text: error_abort is for
diagnosing programmer errors (the situation cannot occur unless someone
introduced a bug), while error_fatal is for gracefully diagnosing user
errors at startup (the VM can't be booted because the user asked for the
impossible).
diff mbox

Patch

diff --git a/include/qapi/error.h b/include/qapi/error.h
index d7878c3..c69dddb 100644
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -50,6 +50,9 @@ 
  * Call a function aborting on errors:
  *     foo(arg, &error_abort);
  *
+ * Call a function treating errors as fatal:
+ *     foo(arg, &error_fatal);
+ *
  * Receive an error and pass it on to the caller:
  *     Error *err = NULL;
  *     foo(arg, &err);
@@ -100,6 +103,7 @@  ErrorClass error_get_class(const Error *err);
  * If @errp is NULL, the error is ignored.  Don't bother creating one
  * then.
  * If @errp is &error_abort, print a suitable message and abort().
+ * If @errp is &error_fatal, print a suitable message and exit(1).
  * If @errp is anything else, *@errp must be NULL.
  * The new error's class is ERROR_CLASS_GENERIC_ERROR, and its
  * human-readable error message is made from printf-style @fmt, ...
@@ -148,6 +152,8 @@  void error_setg_win32_internal(Error **errp,
  * error object.
  * Else, if @dst_errp is &error_abort, print a suitable message and
  * abort().
+ * Else, if @dst_errp is &error_fatal, print a suitable message and
+ * exit(1).
  * Else, if @dst_errp already contains an error, ignore this one: free
  * the error object.
  * Else, move the error object from @local_err to *@dst_errp.
@@ -206,4 +212,9 @@  void error_set_internal(Error **errp,
  */
 extern Error *error_abort;
 
+/*
+ * Pass to error_setg() & friends to exit(1) on error.
+ */
+extern Error *error_fatal;
+
 #endif
diff --git a/util/error.c b/util/error.c
index b1eb8a2..8b86490 100644
--- a/util/error.c
+++ b/util/error.c
@@ -2,9 +2,11 @@ 
  * QEMU Error Objects
  *
  * Copyright IBM, Corp. 2011
+ * Copyright (C) 2011-2015 Red Hat, Inc.
  *
  * Authors:
  *  Anthony Liguori   <aliguori@us.ibm.com>
+ *  Markus Armbruster <armbru@redhat.com>,
  *
  * This work is licensed under the terms of the GNU LGPL, version 2.  See
  * the COPYING.LIB file in the top-level directory.
@@ -24,13 +26,20 @@  struct Error
 };
 
 Error *error_abort;
+Error *error_fatal;
 
-static void error_do_abort(Error *err)
+static void error_handle_fatal(Error **errp, Error *err)
 {
-    fprintf(stderr, "Unexpected error in %s() at %s:%d:\n",
-            err->func, err->src, err->line);
-    error_report_err(err);
-    abort();
+    if (errp == &error_abort) {
+        fprintf(stderr, "Unexpected error in %s() at %s:%d:\n",
+                err->func, err->src, err->line);
+        error_report_err(err);
+        abort();
+    }
+    if (errp == &error_fatal) {
+        error_report_err(err);
+        exit(1);
+    }
 }
 
 static void error_setv(Error **errp,
@@ -52,10 +61,7 @@  static void error_setv(Error **errp,
     err->line = line;
     err->func = func;
 
-    if (errp == &error_abort) {
-        error_do_abort(err);
-    }
-
+    error_handle_fatal(errp, err);
     *errp = err;
 
     errno = saved_errno;
@@ -216,11 +222,13 @@  void error_free(Error *err)
 
 void error_propagate(Error **dst_errp, Error *local_err)
 {
-    if (local_err && dst_errp == &error_abort) {
-        error_do_abort(local_err);
-    } else if (dst_errp && !*dst_errp) {
+    if (!local_err) {
+        return;
+    }
+    error_handle_fatal(dst_errp, local_err);
+    if (dst_errp && !*dst_errp) {
         *dst_errp = local_err;
-    } else if (local_err) {
+    } else {
         error_free(local_err);
     }
 }