From df1e608a01eb0d55d6639d97f575dba37a44ac4a Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Fri, 27 Jul 2012 17:51:03 -0300 Subject: 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 Reviewed-by: Markus Armbruster --- error.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'error.c') 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; -- cgit v1.2.3