From patchwork Fri Mar 11 21:00:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 86459 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 774AAB6FA8 for ; Sat, 12 Mar 2011 08:20:45 +1100 (EST) Received: from localhost ([127.0.0.1]:34158 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Py9lK-0007v0-MW for incoming@patchwork.ozlabs.org; Fri, 11 Mar 2011 16:20:42 -0500 Received: from [140.186.70.92] (port=47142 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Py9Sm-00062g-It for qemu-devel@nongnu.org; Fri, 11 Mar 2011 16:01:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Py9Sk-0008Q6-Kg for qemu-devel@nongnu.org; Fri, 11 Mar 2011 16:01:32 -0500 Received: from [32.97.182.141] (port=55337 helo=e1.ny.us.ibm.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Py9Sk-0008LF-IE for qemu-devel@nongnu.org; Fri, 11 Mar 2011 16:01:30 -0500 Received: from d01dlp01.pok.ibm.com (d01dlp01.pok.ibm.com [9.56.224.56]) by e1.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p2BKpFvd007590 for ; Fri, 11 Mar 2011 15:51:15 -0500 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 3664538C8043 for ; Fri, 11 Mar 2011 16:01:06 -0500 (EST) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2BL18pp446846 for ; Fri, 11 Mar 2011 16:01:08 -0500 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2BL17P1008913 for ; Fri, 11 Mar 2011 14:01:08 -0700 Received: from localhost.localdomain (sig-9-65-217-31.mts.ibm.com [9.65.217.31]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p2BL0u8n008003; Fri, 11 Mar 2011 14:01:06 -0700 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Fri, 11 Mar 2011 15:00:44 -0600 Message-Id: <1299877249-13433-7-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1299877249-13433-1-git-send-email-aliguori@us.ibm.com> References: <1299877249-13433-1-git-send-email-aliguori@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.182.141 Cc: Paolo Bonzini , Anthony Liguori , Markus Armbruster , Michael D Roth , Luiz Capitulino Subject: [Qemu-devel] [PATCH 06/11] qerror: add JSON parsing error message X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Using a string like this is a cop-out. I plan on changing this before 0.15. Signed-off-by: Anthony Liguori 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 } }"