diff --git a/qemu-error.c b/qemu-error.c index 2eadbfc436..5a35e7c1c2 100644 --- a/qemu-error.c +++ b/qemu-error.c @@ -207,21 +207,3 @@ void error_report(const char *fmt, ...) va_end(ap); error_printf("\n"); } - -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); - } -} diff --git a/qemu-error.h b/qemu-error.h index e63c6ab31d..a45609f8e7 100644 --- a/qemu-error.h +++ b/qemu-error.h @@ -37,11 +37,5 @@ void error_printf_unless_qmp(const char *fmt, ...) void error_print_loc(void); void error_set_progname(const char *argv0); void error_report(const char *fmt, ...) __attribute__ ((format(printf, 1, 2))); -void qerror_report_internal(const char *file, int linenr, const char *func, - const char *fmt, ...) - __attribute__ ((format(printf, 4, 5))); - -#define qerror_report(fmt, ...) \ - qerror_report_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__) #endif 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 */ diff --git a/qerror.h b/qerror.h index d96abe1d06..dd298d4777 100644 --- a/qerror.h +++ b/qerror.h @@ -37,6 +37,11 @@ QError *qerror_from_info(const char *file, int linenr, const char *func, const char *fmt, va_list *va); QString *qerror_human(const QError *qerror); void qerror_print(QError *qerror); +void qerror_report_internal(const char *file, int linenr, const char *func, + const char *fmt, ...) + __attribute__ ((format(printf, 4, 5))); +#define qerror_report(fmt, ...) \ + qerror_report_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__) QError *qobject_to_qerror(const QObject *obj); /*