From 0167f772d1505b79f2db2f1d3ccad54f2cbe5de1 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 22 Mar 2010 10:29:05 +0100 Subject: error: Move qerror_report() from qemu-error.[ch] to qerror.[ch] Signed-off-by: Markus Armbruster Signed-off-by: Aurelien Jarno --- qerror.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'qerror.c') diff --git a/qerror.c b/qerror.c index ff2fbd58e4..eaa1deb286 100644 --- a/qerror.c +++ b/qerror.c @@ -9,6 +9,8 @@ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING.LIB file in the top-level directory. */ + +#include "monitor.h" #include "qjson.h" #include "qerror.h" #include "qemu-common.h" @@ -377,6 +379,24 @@ void qerror_print(QError *qerror) QDECREF(qstring); } +void qerror_report_internal(const char *file, int linenr, const char *func, + const char *fmt, ...) +{ + va_list va; + QError *qerror; + + va_start(va, fmt); + qerror = qerror_from_info(file, linenr, func, fmt, &va); + va_end(va); + + if (monitor_cur_is_qmp()) { + monitor_set_error(cur_mon, qerror); + } else { + qerror_print(qerror); + QDECREF(qerror); + } +} + /** * qobject_to_qerror(): Convert a QObject into a QError */ -- cgit 1.4.1