[PATCH] qemu-kvm: jaso-parser: Output the content of invalid keyword

2010-03-24 Thread Amos Kong 
When input some invialid words in QMP port, qemu outputs this error message:
parse error: invalid keyword `%s'
This patch makes qemu output the content.

Signed-off-by: Amos Kong ak...@redhat.com
---
 json-parser.c |7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/json-parser.c b/json-parser.c
index 579928f..98a82af 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,11 @@ 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);
 }
 
 /**
-- 
1.6.3.3

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] qemu-kvm: jaso-parser: Output the content of invalid keyword

2010-03-24 Thread Aurelien Jarno 
Hi,

On Wed, Mar 24, 2010 at 06:00:53PM +0800, Amos Kong wrote:
 When input some invialid words in QMP port, qemu outputs this error message:
 parse error: invalid keyword `%s'
 This patch makes qemu output the content.

Is this patch for QEMU or KVM? If it is for QEMU, you should put the
QEMU mailing list in Cc:. If it is for KVM, I don't have commit access
there.

 Signed-off-by: Amos Kong ak...@redhat.com
 ---
  json-parser.c |7 ++-
  1 files changed, 6 insertions(+), 1 deletions(-)
 
 diff --git a/json-parser.c b/json-parser.c
 index 579928f..98a82af 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,11 @@ 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);
  }
  
  /**
 -- 
 1.6.3.3
 
 

-- 
Aurelien Jarno  GPG: 1024D/F1BCDB73
aurel...@aurel32.net http://www.aurel32.net
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] qemu-kvm: jaso-parser: Output the content of invalid keyword

2010-03-24 Thread Luiz Capitulino 
On Wed, 24 Mar 2010 11:29:40 +0100
Aurelien Jarno aurel...@aurel32.net wrote:

 Hi,
 
 On Wed, Mar 24, 2010 at 06:00:53PM +0800, Amos Kong wrote:
  When input some invialid words in QMP port, qemu outputs this error message:
  parse error: invalid keyword `%s'
  This patch makes qemu output the content.
 
 Is this patch for QEMU or KVM? If it is for QEMU, you should put the
 QEMU mailing list in Cc:. If it is for KVM, I don't have commit access
 there.

 It's for QEMU and looks good to me.

 Amos, can you resend there please? Just to take the right route..

 
  Signed-off-by: Amos Kong ak...@redhat.com
  ---
   json-parser.c |7 ++-
   1 files changed, 6 insertions(+), 1 deletions(-)
  
  diff --git a/json-parser.c b/json-parser.c
  index 579928f..98a82af 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,11 @@ 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);
   }
   
   /**
  -- 
  1.6.3.3
  
  
 

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html