From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39343)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1VX6gr-0002V8-NK
	for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:49:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1VX6gl-0002qw-JU
	for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:49:53 -0400
Received: from mx1.redhat.com ([209.132.183.28]:51492)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1VX6gl-0002qo-An
	for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:49:47 -0400
Message-ID: <52610434.9060602@redhat.com>
Date: Fri, 18 Oct 2013 11:49:40 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1382058681-14957-1-git-send-email-xiawenc@linux.vnet.ibm.com>
	<1382058681-14957-12-git-send-email-xiawenc@linux.vnet.ibm.com>
In-Reply-To: <1382058681-14957-12-git-send-email-xiawenc@linux.vnet.ibm.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 11/13] qerror: folder qerror emit logic
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Cc: kwolf@redhat.com, stefanha@gmail.com, qemu-devel@nongnu.org, lcapitulino@redhat.com

Il 18/10/2013 03:11, Wenchao Xia ha scritto:
> 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 <xiawenc@linux.vnet.ibm.com>
> ---
>  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)
> 

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>