From patchwork Wed Jul 25 16:54:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 173226 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 66D6E2C0091 for ; Thu, 26 Jul 2012 03:36:01 +1000 (EST) Received: from localhost ([::1]:54319 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su4r0-0003eY-Ll for incoming@patchwork.ozlabs.org; Wed, 25 Jul 2012 12:54:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su4qc-0002YU-7V for qemu-devel@nongnu.org; Wed, 25 Jul 2012 12:54:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Su4qX-0001Av-Vt for qemu-devel@nongnu.org; Wed, 25 Jul 2012 12:54:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su4qX-0001An-OT for qemu-devel@nongnu.org; Wed, 25 Jul 2012 12:54:01 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6PGrjCS031084 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 25 Jul 2012 12:53:45 -0400 Received: from localhost (ovpn-113-89.phx2.redhat.com [10.3.113.89]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6PGriHK006312; Wed, 25 Jul 2012 12:53:44 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 25 Jul 2012 13:54:08 -0300 Message-Id: <1343235256-26310-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1343235256-26310-1-git-send-email-lcapitulino@redhat.com> References: <1343235256-26310-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 03/11] qerror: rename QERR_QMP_EXTRA_MEMBER X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The error class name is QMPExtraInputObjectMember, not QMPExtraMember. Rename the QERR_QMP_EXTRA_MEMBER macro to QERR_QMP_EXTRA_INPUT_OBJECT_MEMBER to reflect that, so that future error macro generation generates the expected macro name. Signed-off-by: Luiz Capitulino --- monitor.c | 2 +- qapi/qmp-dispatch.c | 2 +- qapi/qmp-input-visitor.c | 2 +- qerror.c | 2 +- qerror.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 09aa3cd..ec4e467 100644 --- a/monitor.c +++ b/monitor.c @@ -4430,7 +4430,7 @@ static QDict *qmp_check_input_obj(QObject *input_obj) } else if (!strcmp(arg_name, "id")) { /* FIXME: check duplicated IDs for async commands */ } else { - qerror_report(QERR_QMP_EXTRA_MEMBER, arg_name); + qerror_report(QERR_QMP_EXTRA_INPUT_OBJECT_MEMBER, arg_name); return NULL; } } diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 122c1a2..29d6f30 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -47,7 +47,7 @@ static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp) } has_exec_key = true; } else if (strcmp(arg_name, "arguments")) { - error_set(errp, QERR_QMP_EXTRA_MEMBER, arg_name); + error_set(errp, QERR_QMP_EXTRA_INPUT_OBJECT_MEMBER, arg_name); return NULL; } } diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c index 107d8d3..a59d4f6 100644 --- a/qapi/qmp-input-visitor.c +++ b/qapi/qmp-input-visitor.c @@ -104,7 +104,7 @@ static void qmp_input_pop(QmpInputVisitor *qiv, Error **errp) if (g_hash_table_size(top_ht)) { const char *key; g_hash_table_find(top_ht, always_true, &key); - error_set(errp, QERR_QMP_EXTRA_MEMBER, key); + error_set(errp, QERR_QMP_EXTRA_INPUT_OBJECT_MEMBER, key); } g_hash_table_unref(top_ht); } diff --git a/qerror.c b/qerror.c index a9d771b..132ab2d 100644 --- a/qerror.c +++ b/qerror.c @@ -271,7 +271,7 @@ static const QErrorStringTable qerror_table[] = { .desc = "QMP input object member '%(member)' expects '%(expected)'", }, { - .error_fmt = QERR_QMP_EXTRA_MEMBER, + .error_fmt = QERR_QMP_EXTRA_INPUT_OBJECT_MEMBER, .desc = "QMP input object member '%(member)' is unexpected", }, { diff --git a/qerror.h b/qerror.h index 69d417d..27ce395 100644 --- a/qerror.h +++ b/qerror.h @@ -224,7 +224,7 @@ 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 \ +#define QERR_QMP_EXTRA_INPUT_OBJECT_MEMBER \ "{ 'class': 'QMPExtraInputObjectMember', 'data': { 'member': %s } }" #define QERR_RESET_REQUIRED \