From patchwork Fri Oct 18 01:11:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 284499 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6ECA92C00BC for ; Fri, 18 Oct 2013 20:45:00 +1100 (EST) Received: from localhost ([::1]:56483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VX68T-00045i-B4 for incoming@patchwork.ozlabs.org; Fri, 18 Oct 2013 05:14:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VX66B-0000gx-Fz for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:12:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VX660-0007FP-NW for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:11:59 -0400 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:37655) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VX660-0007F7-0g for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:11:48 -0400 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 18 Oct 2013 14:41:46 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp07.in.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 18 Oct 2013 14:41:43 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 2FD34394004E for ; Fri, 18 Oct 2013 14:41:23 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9I9Bdox13631590 for ; Fri, 18 Oct 2013 14:41:39 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9I9Bfvk010437 for ; Fri, 18 Oct 2013 14:41:42 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r9I9BOpL008595; Fri, 18 Oct 2013 14:41:40 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2013 09:11:19 +0800 Message-Id: <1382058681-14957-12-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1382058681-14957-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1382058681-14957-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13101809-8878-0000-0000-0000094B5ED1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.7 Cc: kwolf@redhat.com, stefanha@gmail.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH 11/13] qerror: folder qerror emit logic X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The code about how to print the message, is foldered into a function, so if we want to change the print behavior in the future, just modify that function only. Signed-off-by: Wenchao Xia Reviewed-by: Paolo Bonzini --- qobject/qerror.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/qobject/qerror.c b/qobject/qerror.c index 685167a..86d1b07 100644 --- a/qobject/qerror.c +++ b/qobject/qerror.c @@ -79,6 +79,16 @@ static void qerror_print(QError *qerror) loc_pop(&qerror->loc); } +static void monitor_print_qerror(QError *qerror) +{ + if (monitor_cur_is_qmp()) { + QINCREF(qerror); + monitor_set_error(cur_mon, qerror); + } else { + qerror_print(qerror); + } +} + void qerror_report(ErrorClass eclass, const char *fmt, ...) { va_list va; @@ -88,12 +98,9 @@ void qerror_report(ErrorClass eclass, const char *fmt, ...) qerror = qerror_from_info(eclass, fmt, &va); va_end(va); - if (monitor_cur_is_qmp()) { - monitor_set_error(cur_mon, qerror); - } else { - qerror_print(qerror); - QDECREF(qerror); - } + monitor_print_qerror(qerror); + + QDECREF(qerror); } void qerror_report_err(Error *err) @@ -105,12 +112,9 @@ void qerror_report_err(Error *err) qerr->err_msg = g_strdup(err->msg); qerr->err_class = err->err_class; - if (monitor_cur_is_qmp()) { - monitor_set_error(cur_mon, qerr); - } else { - qerror_print(qerr); - QDECREF(qerr); - } + monitor_print_qerror(qerr); + + QDECREF(qerr); } void assert_no_error(Error *err)