X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=error.c;h=519f6b6ce00d777c261d761228e9874c8f3ac088;hb=de0161c0d553f2aaf6118ca87f978a5e6b4a9732;hp=867eec2c1af8e5cf555d5068086729e66d1484b2;hpb=448293961f889d635295ad5b1ecc57ce267801ba;p=qemu.git

diff --git a/error.c b/error.c
index 867eec2c1..519f6b6ce 100644
--- a/error.c
+++ b/error.c
@@ -9,20 +9,21 @@
  * This work is licensed under the terms of the GNU LGPL, version 2.  See
  * the COPYING.LIB file in the top-level directory.
  */
-#include "error.h"
-#include "error_int.h"
-#include "qemu-objects.h"
-#include "qerror.h"
-#include <assert.h>
+
+#include "qemu-common.h"
+#include "qapi/error.h"
+#include "qapi/qmp/qjson.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi-types.h"
+#include "qapi/qmp/qerror.h"
 
 struct Error
 {
-    QDict *obj;
-    const char *fmt;
     char *msg;
+    ErrorClass err_class;
 };
 
-void error_set(Error **errp, const char *fmt, ...)
+void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
 {
     Error *err;
     va_list ap;
@@ -30,111 +31,85 @@ void error_set(Error **errp, const char *fmt, ...)
     if (errp == NULL) {
         return;
     }
+    assert(*errp == NULL);
 
-    err = qemu_mallocz(sizeof(*err));
+    err = g_malloc0(sizeof(*err));
 
     va_start(ap, fmt);
-    err->obj = qobject_to_qdict(qobject_from_jsonv(fmt, &ap));
+    err->msg = g_strdup_vprintf(fmt, ap);
     va_end(ap);
-    err->fmt = fmt;
+    err->err_class = err_class;
 
     *errp = err;
 }
 
-bool error_is_set(Error **errp)
+void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
+                     const char *fmt, ...)
 {
-    return (errp && *errp);
-}
+    Error *err;
+    char *msg1;
+    va_list ap;
 
-const char *error_get_pretty(Error *err)
-{
-    if (err->msg == NULL) {
-        QString *str;
-        str = qerror_format(err->fmt, err->obj);
-        err->msg = qemu_strdup(qstring_get_str(str));
-        QDECREF(str);
+    if (errp == NULL) {
+        return;
     }
+    assert(*errp == NULL);
 
-    return err->msg;
-}
+    err = g_malloc0(sizeof(*err));
 
-const char *error_get_field(Error *err, const char *field)
-{
-    if (strcmp(field, "class") == 0) {
-        return qdict_get_str(err->obj, field);
+    va_start(ap, fmt);
+    msg1 = g_strdup_vprintf(fmt, ap);
+    if (os_errno != 0) {
+        err->msg = g_strdup_printf("%s: %s", msg1, strerror(os_errno));
+        g_free(msg1);
     } else {
-        QDict *dict = qdict_get_qdict(err->obj, "data");
-        return qdict_get_str(dict, field);
+        err->msg = msg1;
     }
+    va_end(ap);
+    err->err_class = err_class;
+
+    *errp = err;
 }
 
-QDict *error_get_data(Error *err)
+Error *error_copy(const Error *err)
 {
-    QDict *data = qdict_get_qdict(err->obj, "data");
-    QINCREF(data);
-    return data;
+    Error *err_new;
+
+    err_new = g_malloc0(sizeof(*err));
+    err_new->msg = g_strdup(err->msg);
+    err_new->err_class = err->err_class;
+
+    return err_new;
 }
 
-void error_set_field(Error *err, const char *field, const char *value)
+bool error_is_set(Error **errp)
 {
-    QDict *dict = qdict_get_qdict(err->obj, "data");
-    return qdict_put(dict, field, qstring_from_str(value));
+    return (errp && *errp);
 }
 
-void error_free(Error *err)
+ErrorClass error_get_class(const Error *err)
 {
-    if (err) {
-        QDECREF(err->obj);
-        qemu_free(err->msg);
-        qemu_free(err);
-    }
+    return err->err_class;
 }
 
-bool error_is_type(Error *err, const char *fmt)
+const char *error_get_pretty(Error *err)
 {
-    const char *error_class;
-    char *ptr;
-    char *end;
-
-    ptr = strstr(fmt, "'class': '");
-    assert(ptr != NULL);
-    ptr += strlen("'class': '");
-
-    end = strchr(ptr, '\'');
-    assert(end != NULL);
+    return err->msg;
+}
 
-    error_class = error_get_field(err, "class");
-    if (strlen(error_class) != end - ptr) {
-        return false;
+void error_free(Error *err)
+{
+    if (err) {
+        g_free(err->msg);
+        g_free(err);
     }
-
-    return strncmp(ptr, error_class, end - ptr) == 0;
 }
 
 void error_propagate(Error **dst_err, Error *local_err)
 {
-    if (dst_err) {
+    if (dst_err && !*dst_err) {
         *dst_err = local_err;
     } else if (local_err) {
         error_free(local_err);
     }
 }
-
-QObject *error_get_qobject(Error *err)
-{
-    QINCREF(err->obj);
-    return QOBJECT(err->obj);
-}
-
-void error_set_qobject(Error **errp, QObject *obj)
-{
-    Error *err;
-    if (errp == NULL) {
-        return;
-    }
-    err = qemu_mallocz(sizeof(*err));
-    err->obj = qobject_to_qdict(obj);
-    qobject_incref(obj);
-
-    *errp = err;
-}