target/arm: Add v8M stack checks for Thumb2 LDM/STM

[qemu.git] / util / error.c

diff --git a/util/error.c b/util/error.c
index cdb726ce813e4eca006067620326682028e7846b..3efdd69162b57f7e81f2df56f5f15d64a6fad595 100644 (file)
--- a/util/error.c
+++ b/util/error.c
@@ -2,16 +2,19 @@
  * QEMU Error Objects
  *
  * Copyright IBM, Corp. 2011
  * QEMU Error Objects
  *
  * Copyright IBM, Corp. 2011

+ * Copyright (C) 2011-2015 Red Hat, Inc.

  *
  * Authors:
  *  Anthony Liguori   <[email protected]>
  *
  * Authors:
  *  Anthony Liguori   <[email protected]>

+ *  Markus Armbruster <[email protected]>,

  *
  * This work is licensed under the terms of the GNU LGPL, version 2.  See
  * the COPYING.LIB file in the top-level directory.
  */
 
  *
  * This work is licensed under the terms of the GNU LGPL, version 2.  See
  * the COPYING.LIB file in the top-level directory.
  */
 

-#include "qemu-common.h"
+#include "qemu/osdep.h"

 #include "qapi/error.h"
 #include "qapi/error.h"

+#include "qemu-common.h"

 #include "qemu/error-report.h"
 
 struct Error
 #include "qemu/error-report.h"
 
 struct Error


@@ -20,21 +23,30 @@ struct Error
     ErrorClass err_class;
     const char *src, *func;
     int line;
     ErrorClass err_class;
     const char *src, *func;
     int line;

+    GString *hint;

 };
 
 Error *error_abort;
 };
 
 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,
                        const char *src, int line, const char *func,
 }
 
 static void error_setv(Error **errp,
                        const char *src, int line, const char *func,

-                       ErrorClass err_class, const char *fmt, va_list ap)
+                       ErrorClass err_class, const char *fmt, va_list ap,
+                       const char *suffix)

 {
     Error *err;
     int saved_errno = errno;
 {
     Error *err;
     int saved_errno = errno;


@@ -46,15 +58,17 @@ static void error_setv(Error **errp,
 
     err = g_malloc0(sizeof(*err));
     err->msg = g_strdup_vprintf(fmt, ap);
 
     err = g_malloc0(sizeof(*err));
     err->msg = g_strdup_vprintf(fmt, ap);

+    if (suffix) {
+        char *msg = err->msg;
+        err->msg = g_strdup_printf("%s: %s", msg, suffix);
+        g_free(msg);
+    }

     err->err_class = err_class;
     err->src = src;
     err->line = line;
     err->func = func;
 
     err->err_class = err_class;
     err->src = src;
     err->line = line;
     err->func = func;
 

-    if (errp == &error_abort) {
-        error_do_abort(err);
-    }
-
+    error_handle_fatal(errp, err);

     *errp = err;
 
     errno = saved_errno;
     *errp = err;
 
     errno = saved_errno;


@@ -67,7 +81,7 @@ void error_set_internal(Error **errp,
     va_list ap;
 
     va_start(ap, fmt);
     va_list ap;
 
     va_start(ap, fmt);

-    error_setv(errp, src, line, func, err_class, fmt, ap);
+    error_setv(errp, src, line, func, err_class, fmt, ap, NULL);

     va_end(ap);
 }
 
     va_end(ap);
 }
 


@@ -78,7 +92,7 @@ void error_setg_internal(Error **errp,
     va_list ap;
 
     va_start(ap, fmt);
     va_list ap;
 
     va_start(ap, fmt);

-    error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap);
+    error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap, NULL);

     va_end(ap);
 }
 
     va_end(ap);
 }
 


@@ -87,7 +101,6 @@ void error_setg_errno_internal(Error **errp,
                                int os_errno, const char *fmt, ...)
 {
     va_list ap;
                                int os_errno, const char *fmt, ...)
 {
     va_list ap;

-    char *msg;

     int saved_errno = errno;
 
     if (errp == NULL) {
     int saved_errno = errno;
 
     if (errp == NULL) {


@@ -95,15 +108,10 @@ void error_setg_errno_internal(Error **errp,
     }
 
     va_start(ap, fmt);
     }
 
     va_start(ap, fmt);

-    error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap);
+    error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap,
+               os_errno != 0 ? strerror(os_errno) : NULL);

     va_end(ap);
 
     va_end(ap);
 

-    if (os_errno != 0) {
-        msg = (*errp)->msg;
-        (*errp)->msg = g_strdup_printf("%s: %s", msg, strerror(os_errno));
-        g_free(msg);
-    }
-

     errno = saved_errno;
 }
 
     errno = saved_errno;
 }
 


@@ -115,6 +123,52 @@ void error_setg_file_open_internal(Error **errp,
                               "Could not open '%s'", filename);
 }
 
                               "Could not open '%s'", filename);
 }
 

+void error_vprepend(Error **errp, const char *fmt, va_list ap)
+{
+    GString *newmsg;
+
+    if (!errp) {
+        return;
+    }
+
+    newmsg = g_string_new(NULL);
+    g_string_vprintf(newmsg, fmt, ap);
+    g_string_append(newmsg, (*errp)->msg);
+    g_free((*errp)->msg);
+    (*errp)->msg = g_string_free(newmsg, 0);
+}
+
+void error_prepend(Error **errp, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    error_vprepend(errp, fmt, ap);
+    va_end(ap);
+}
+
+void error_append_hint(Error **errp, const char *fmt, ...)
+{
+    va_list ap;
+    int saved_errno = errno;
+    Error *err;
+
+    if (!errp) {
+        return;
+    }
+    err = *errp;
+    assert(err && errp != &error_abort && errp != &error_fatal);
+
+    if (!err->hint) {
+        err->hint = g_string_new(NULL);
+    }
+    va_start(ap, fmt);
+    g_string_append_vprintf(err->hint, fmt, ap);
+    va_end(ap);
+
+    errno = saved_errno;
+}
+

 #ifdef _WIN32
 
 void error_setg_win32_internal(Error **errp,
 #ifdef _WIN32
 
 void error_setg_win32_internal(Error **errp,


@@ -122,24 +176,22 @@ void error_setg_win32_internal(Error **errp,
                                int win32_err, const char *fmt, ...)
 {
     va_list ap;
                                int win32_err, const char *fmt, ...)
 {
     va_list ap;

-    char *msg1, *msg2;
+    char *suffix = NULL;

 
     if (errp == NULL) {
         return;
     }
 
 
     if (errp == NULL) {
         return;
     }
 

+    if (win32_err != 0) {
+        suffix = g_win32_error_message(win32_err);
+    }
+

     va_start(ap, fmt);
     va_start(ap, fmt);

-    error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap);
+    error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR,
+               fmt, ap, suffix);

     va_end(ap);
 
     va_end(ap);
 

-    if (win32_err != 0) {
-        msg1 = (*errp)->msg;
-        msg2 = g_win32_error_message(win32_err);
-        (*errp)->msg = g_strdup_printf("%s: %s (error: %x)", msg1, msg2,
-                                       (unsigned)win32_err);
-        g_free(msg2);
-        g_free(msg1);
-    }
+    g_free(suffix);

 }
 
 #endif
 }
 
 #endif


@@ -151,6 +203,12 @@ Error *error_copy(const Error *err)
     err_new = g_malloc0(sizeof(*err));
     err_new->msg = g_strdup(err->msg);
     err_new->err_class = err->err_class;
     err_new = g_malloc0(sizeof(*err));
     err_new->msg = g_strdup(err->msg);
     err_new->err_class = err->err_class;

+    err_new->src = err->src;
+    err_new->line = err->line;
+    err_new->func = err->func;
+    if (err->hint) {
+        err_new->hint = g_string_new(err->hint->str);
+    }

 
     return err_new;
 }
 
     return err_new;
 }


@@ -160,7 +218,7 @@ ErrorClass error_get_class(const Error *err)
     return err->err_class;
 }
 
     return err->err_class;
 }
 

-const char *error_get_pretty(Error *err)
+const char *error_get_pretty(const Error *err)

 {
     return err->msg;
 }
 {
     return err->msg;
 }


@@ -168,24 +226,69 @@ const char *error_get_pretty(Error *err)
 void error_report_err(Error *err)
 {
     error_report("%s", error_get_pretty(err));
 void error_report_err(Error *err)
 {
     error_report("%s", error_get_pretty(err));

+    if (err->hint) {
+        error_printf_unless_qmp("%s", err->hint->str);
+    }

     error_free(err);
 }
 
     error_free(err);
 }
 

+void warn_report_err(Error *err)
+{
+    warn_report("%s", error_get_pretty(err));
+    if (err->hint) {
+        error_printf_unless_qmp("%s", err->hint->str);
+    }
+    error_free(err);
+}
+
+void error_reportf_err(Error *err, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    error_vprepend(&err, fmt, ap);
+    va_end(ap);
+    error_report_err(err);
+}
+
+
+void warn_reportf_err(Error *err, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    error_vprepend(&err, fmt, ap);
+    va_end(ap);
+    warn_report_err(err);
+}
+

 void error_free(Error *err)
 {
     if (err) {
         g_free(err->msg);
 void error_free(Error *err)
 {
     if (err) {
         g_free(err->msg);

+        if (err->hint) {
+            g_string_free(err->hint, true);
+        }

         g_free(err);
     }
 }
 
         g_free(err);
     }
 }
 

+void error_free_or_abort(Error **errp)
+{
+    assert(errp && *errp);
+    error_free(*errp);
+    *errp = NULL;
+}
+

 void error_propagate(Error **dst_errp, Error *local_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;
         *dst_errp = local_err;

-    } else if (local_err) {
+    } else {

         error_free(local_err);
     }
 }
         error_free(local_err);
     }
 }