From mboxrd@z Thu Jan  1 00:00:00 1970
From: Richard Henderson <rth@redhat.com>
Subject: Re: [PATCH] qemu: jaso-parser: Output the content of invalid keyword
Date: Wed, 24 Mar 2010 10:25:30 -0700
Message-ID: <4BAA4B0A.5060205@redhat.com>
References: <1269433020-16055-1-git-send-email-akong@redhat.com> <4BAA03E3.8010505@twiddle.net> <20100324151205.GA13786@akong@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Cc: qemu-devel@nongnu.org, aurelien@aurel32.net, kvm@vger.kernel.org
To: Amos Kong <akong@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:1515 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754293Ab0CXRZl (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 24 Mar 2010 13:25:41 -0400
In-Reply-To: <20100324151205.GA13786@akong@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On 03/24/2010 08:12 AM, Amos Kong wrote:
> 
> When input some invialid word 'unknowcmd' through QMP port, qemu outputs this
> error message:
> "parse error: invalid keyword `%s'"
> This patch makes qemu output the content of invalid keyword, like:
> "parse error: invalid keyword `unknowcmd'"
> 
> Signed-off-by: Amos Kong <akong@redhat.com>

Acked-by: Richard Henderson <rth@redhat.com>

> ---
>  json-parser.c |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
> 
> diff --git a/json-parser.c b/json-parser.c
> index 579928f..b55d763 100644
> --- a/json-parser.c
> +++ b/json-parser.c
> @@ -12,6 +12,7 @@
>   */
>  
>  #include <stdbool.h>
> +#include <stdarg.h>
>  
>  #include "qemu-common.h"
>  #include "qstring.h"
> @@ -93,7 +94,12 @@ static int token_is_escape(QObject *obj, const char *value)
>   */
>  static void parse_error(JSONParserContext *ctxt, QObject *token, const char *msg, ...)
>  {
> -    fprintf(stderr, "parse error: %s\n", msg);
> +    va_list ap;
> +    va_start(ap, msg);
> +    fprintf(stderr, "parse error: ");
> +    vfprintf(stderr, msg, ap);
> +    fprintf(stderr, "\n");
> +    va_end(ap);
>  }
>  
>  /**