From patchwork Thu Jun 24 21:33:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 56862 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 4FABAB707F for ; Fri, 25 Jun 2010 08:05:42 +1000 (EST) Received: from localhost ([127.0.0.1]:57415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORuGq-00061V-SI for incoming@patchwork.ozlabs.org; Thu, 24 Jun 2010 17:47:40 -0400 Received: from [140.186.70.92] (port=51858 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORu3t-0000oF-Ql for qemu-devel@nongnu.org; Thu, 24 Jun 2010 17:34:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ORu3q-0001gw-MZ for qemu-devel@nongnu.org; Thu, 24 Jun 2010 17:34:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8701) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ORu3q-0001gn-D3 for qemu-devel@nongnu.org; Thu, 24 Jun 2010 17:34:14 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5OLYDnJ016704 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Jun 2010 17:34:13 -0400 Received: from localhost (vpn-9-104.rdu.redhat.com [10.11.9.104]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5OLYCxj032662; Thu, 24 Jun 2010 17:34:12 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 24 Jun 2010 18:33:37 -0300 Message-Id: <1277415220-17810-12-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1277415220-17810-1-git-send-email-lcapitulino@redhat.com> References: <1277415220-17810-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH 11/14] QError: Introduce QERR_QMP_EXTRA_MEMBER 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 Signed-off-by: Luiz Capitulino --- qerror.c | 4 ++++ qerror.h | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/qerror.c b/qerror.c index cce1e7b..2f6f590 100644 --- a/qerror.c +++ b/qerror.c @@ -177,6 +177,10 @@ static const QErrorStringTable qerror_table[] = { .desc = "QMP input object member '%(member)' expects '%(expected)'", }, { + .error_fmt = QERR_QMP_EXTRA_MEMBER, + .desc = "QMP input object member '%(member)' is unexpected", + }, + { .error_fmt = QERR_SET_PASSWD_FAILED, .desc = "Could not set password", }, diff --git a/qerror.h b/qerror.h index 77ae574..9ad00b4 100644 --- a/qerror.h +++ b/qerror.h @@ -148,6 +148,9 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_QMP_BAD_INPUT_OBJECT_MEMBER \ "{ 'class': 'QMPBadInputObjectMember', 'data': { 'member': %s, 'expected': %s } }" +#define QERR_QMP_EXTRA_MEMBER \ + "{ 'class': 'QMPExtraInputObjectMember', 'data': { 'member': %s } }" + #define QERR_SET_PASSWD_FAILED \ "{ 'class': 'SetPasswdFailed', 'data': {} }"