From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=47400 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PwPAQ-0007Tu-M0
	for qemu-devel@nongnu.org; Sun, 06 Mar 2011 20:23:27 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <aliguori@us.ibm.com>) id 1PwPAP-0000N4-N9
	for qemu-devel@nongnu.org; Sun, 06 Mar 2011 20:23:22 -0500
Received: from e8.ny.us.ibm.com ([32.97.182.138]:56409)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <aliguori@us.ibm.com>) id 1PwPAP-0000MO-Hw
	for qemu-devel@nongnu.org; Sun, 06 Mar 2011 20:23:21 -0500
Received: from d01dlp01.pok.ibm.com (d01dlp01.pok.ibm.com [9.56.224.56])
	by e8.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p26L4LaG007976
	for <qemu-devel@nongnu.org>; Sun, 6 Mar 2011 16:04:21 -0500
Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235])
	by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 59E7038C8039
	for <qemu-devel@nongnu.org>; Sun,  6 Mar 2011 20:23:14 -0500 (EST)
Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215])
	by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id
	p271NG5p324234
	for <qemu-devel@nongnu.org>; Sun, 6 Mar 2011 20:23:16 -0500
Received: from d01av01.pok.ibm.com (loopback [127.0.0.1])
	by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id
	p271NFpP020573
	for <qemu-devel@nongnu.org>; Sun, 6 Mar 2011 20:23:16 -0500
From: Anthony Liguori <aliguori@us.ibm.com>
Date: Sun,  6 Mar 2011 19:22:48 -0600
Message-Id: <1299460984-15849-7-git-send-email-aliguori@us.ibm.com>
In-Reply-To: <1299460984-15849-1-git-send-email-aliguori@us.ibm.com>
References: <1299460984-15849-1-git-send-email-aliguori@us.ibm.com>
Subject: [Qemu-devel] [PATCH 06/22] qapi: add JSON parsing error message
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Adam Litke <aglitke@linux.vnet.ibm.com>, Anthony Liguori <aliguori@us.ibm.com>, Markus Armbruster <armbru@redhat.com>, Luiz Capitulino <lcapitulino@redhat.com>

Using a string like this is a cop-out.  I plan on changing this before 0.15.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/qerror.c b/qerror.c
index 5a1e637..c12dd3d 100644
--- a/qerror.c
+++ b/qerror.c
@@ -145,6 +145,10 @@ static const QErrorStringTable qerror_table[] = {
         .desc      = "Invalid JSON syntax",
     },
     {
+        .error_fmt = QERR_JSON_PARSE_ERROR,
+        .desc      = "Error parsing JSON: %(message)",
+    },
+    {
         .error_fmt = QERR_KVM_MISSING_CAP,
         .desc      = "Using KVM without %(capability), %(feature) unavailable",
     },
diff --git a/qerror.h b/qerror.h
index 35e7253..a0fb98d 100644
--- a/qerror.h
+++ b/qerror.h
@@ -125,6 +125,9 @@ void qerror_set_desc(QError *qerr, const char *fmt);
 #define QERR_JSON_PARSING \
     "{ 'class': 'JSONParsing', 'data': {} }"
 
+#define QERR_JSON_PARSE_ERROR \
+    "{ 'class': 'JSONParseError', 'data': { 'message': %s } }"
+
 #define QERR_KVM_MISSING_CAP \
     "{ 'class': 'KVMMissingCap', 'data': { 'capability': %s, 'feature': %s } }"
 
-- 
1.7.0.4