From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NrxUR-0000VJ-IO for qemu-devel@nongnu.org; Wed, 17 Mar 2010 13:57:07 -0400 Received: from [199.232.76.173] (port=55479 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NrxUP-0000TI-FD for qemu-devel@nongnu.org; Wed, 17 Mar 2010 13:57:05 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NrxUN-0007mJ-Dk for qemu-devel@nongnu.org; Wed, 17 Mar 2010 13:57:05 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:44967) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NrxUM-0007m5-Al for qemu-devel@nongnu.org; Wed, 17 Mar 2010 13:57:03 -0400 Received: from blackfin.pond.sub.org (pD9E398E1.dip.t-dialin.net [217.227.152.225]) by oxygen.pond.sub.org (Postfix) with ESMTPA id E1FE2276DB6 for ; Wed, 17 Mar 2010 18:56:55 +0100 (CET) From: Markus Armbruster Date: Wed, 17 Mar 2010 18:56:54 +0100 Message-Id: <1268848614-6844-7-git-send-email-armbru@redhat.com> In-Reply-To: <1268848614-6844-1-git-send-email-armbru@redhat.com> References: <1268848614-6844-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 6/6] error: Move qerror_report() from qemu-error.[ch] to qerror.[ch] List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Signed-off-by: Markus Armbruster --- qemu-error.c | 18 ------------------ qemu-error.h | 6 ------ qerror.c | 20 ++++++++++++++++++++ qerror.h | 5 +++++ 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/qemu-error.c b/qemu-error.c index 9b9c0a1..57d7555 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 e63c6ab..a45609f 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 ff2fbd5..eaa1deb 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 d96abe1..dd298d4 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); /* -- 1.6.6.1