From patchwork Wed Feb 24 17:55:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 46151 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E1571B7CE2 for ; Thu, 25 Feb 2010 05:05:14 +1100 (EST) Received: from localhost ([127.0.0.1]:46094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkLbj-0001fP-Rl for incoming@patchwork.ozlabs.org; Wed, 24 Feb 2010 13:05:11 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkLTB-0007xc-Gk for qemu-devel@nongnu.org; Wed, 24 Feb 2010 12:56:21 -0500 Received: from [199.232.76.173] (port=59146 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkLTA-0007x5-Lq for qemu-devel@nongnu.org; Wed, 24 Feb 2010 12:56:20 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkLSw-0006Po-4p for qemu-devel@nongnu.org; Wed, 24 Feb 2010 12:56:19 -0500 Received: from mx20.gnu.org ([199.232.41.8]:5178) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NkLSv-0006PS-FC for qemu-devel@nongnu.org; Wed, 24 Feb 2010 12:56:05 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NkLSu-0000vP-Is for qemu-devel@nongnu.org; Wed, 24 Feb 2010 12:56:04 -0500 Received: from blackfin.pond.sub.org (pD9E38C12.dip.t-dialin.net [217.227.140.18]) by oxygen.pond.sub.org (Postfix) with ESMTPA id D9475276DA1 for ; Wed, 24 Feb 2010 18:56:01 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id BEEA9D0; Wed, 24 Feb 2010 18:56:00 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 24 Feb 2010 18:55:13 +0100 Message-Id: <1267034160-3517-2-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1267034160-3517-1-git-send-email-armbru@redhat.com> References: <1267034160-3517-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Subject: [Qemu-devel] [PATCH RFC 01/48] monitor: Factor monitor_set_error() out of qemu_error_internal() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This separates the monitor part from the QError part. Signed-off-by: Markus Armbruster --- monitor.c | 21 +++++++++++++-------- monitor.h | 3 +++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/monitor.c b/monitor.c index b1a6edc..fcd8718 100644 --- a/monitor.c +++ b/monitor.c @@ -3856,6 +3856,18 @@ fail: return NULL; } +void monitor_set_error(Monitor *mon, QError *qerror) +{ + /* report only the first error */ + if (!mon->error) { + mon->error = qerror; + } else { + MON_DEBUG("Additional error report at %s:%d\n", + qerror->file, qerror->linenr); + QDECREF(qerror); + } +} + static void monitor_print_error(Monitor *mon) { qerror_print(mon->error); @@ -4757,14 +4769,7 @@ void qemu_error_internal(const char *file, int linenr, const char *func, QDECREF(qerror); break; case ERR_SINK_MONITOR: - /* report only the first error */ - if (!qemu_error_sink->mon->error) { - qemu_error_sink->mon->error = qerror; - } else { - MON_DEBUG("Additional error report at %s:%d\n", qerror->file, - qerror->linenr); - QDECREF(qerror); - } + monitor_set_error(qemu_error_sink->mon, qerror); break; } } diff --git a/monitor.h b/monitor.h index fc09505..1c72615 100644 --- a/monitor.h +++ b/monitor.h @@ -3,6 +3,7 @@ #include "qemu-common.h" #include "qemu-char.h" +#include "qerror.h" #include "qdict.h" #include "block.h" @@ -47,4 +48,6 @@ void monitor_flush(Monitor *mon); typedef void (MonitorCompletion)(void *opaque, QObject *ret_data); +void monitor_set_error(Monitor *mon, QError *qerror); + #endif /* !MONITOR_H */