summaryrefslogtreecommitdiff
path: root/error.c
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2012-07-27 17:51:03 -0300
committerLuiz Capitulino <lcapitulino@redhat.com>2012-08-13 14:17:53 -0300
commitdf1e608a01eb0d55d6639d97f575dba37a44ac4a (patch)
treeba00f049fb700fd96202ef952fe600e7a05b3093 /error.c
parent7795b166d9d1e2b33d428f5acab6d0d5e617ee91 (diff)
downloadqemu-df1e608a01eb0d55d6639d97f575dba37a44ac4a.tar.gz
qemu-df1e608a01eb0d55d6639d97f575dba37a44ac4a.tar.bz2
qemu-df1e608a01eb0d55d6639d97f575dba37a44ac4a.zip
error, qerror: pass desc string to error calls
This commit changes all QERR_ macros to contain a human message (ie. the desc string found in qerr_table[]) instead of a json dictionary in string format. Before this commit, error_set() and qerror_report() would receive a json dictionary in string format and build a qobject from it. Now, both function receive a human message instead and the qobject is not built anymore. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'error.c')
-rw-r--r--error.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/error.c b/error.c
index 9d7b35f479..0e1037333c 100644
--- a/error.c
+++ b/error.c
@@ -37,9 +37,8 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
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->msg = qerror_format(fmt, err->obj);
err->err_class = err_class;
*errp = err;