From patchwork Wed Jan 18 17:41:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 136679 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 167FCB6EE7 for ; Thu, 19 Jan 2012 05:45:16 +1100 (EST) Received: from localhost ([::1]:36343 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnaVW-0007sl-QQ for incoming@patchwork.ozlabs.org; Wed, 18 Jan 2012 13:45:14 -0500 Received: from eggs.gnu.org ([140.186.70.92]:36145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnZWw-0000L4-RQ for qemu-devel@nongnu.org; Wed, 18 Jan 2012 12:42:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RnZWp-0000TO-J0 for qemu-devel@nongnu.org; Wed, 18 Jan 2012 12:42:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12254) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RnZWp-0000T5-2I for qemu-devel@nongnu.org; Wed, 18 Jan 2012 12:42:31 -0500 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 q0IHgS3b021366 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 18 Jan 2012 12:42:29 -0500 Received: from localhost (ovpn-116-46.ams2.redhat.com [10.36.116.46]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q0IHgRnx022027; Wed, 18 Jan 2012 12:42:28 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 18 Jan 2012 15:41:22 -0200 Message-Id: <1326908484-13389-13-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1326908484-13389-1-git-send-email-lcapitulino@redhat.com> References: <1326908484-13389-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: aliguori@us.ibm.com, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 12/14] qerror: add check-qerror.sh to verify alphabetical order 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 From: Stefan Hajnoczi We're supposed to keep qerror definitions and table entries in alphabetical order. In practice this is not checked. I haven't found a nice way to integrate this into the makefile yet but we can at least have this script which verifies that qerrors are in alphabetical order. Signed-off-by: Stefan Hajnoczi Signed-off-by: Luiz Capitulino --- qerror.c | 3 +-- qerror.h | 2 +- scripts/check-qerror.sh | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100755 scripts/check-qerror.sh diff --git a/qerror.c b/qerror.c index 9a75d06..62c0c70 100644 --- a/qerror.c +++ b/qerror.c @@ -40,8 +40,7 @@ static const QType qerror_type = { * "running out of foo: %(foo)%%" * * Please keep the entries in alphabetical order. - * Use "sed -n '/^static.*qerror_table\[\]/,/^};/s/QERR_/&/gp' qerror.c | sort -c" - * to check. + * Use scripts/check-qerror.sh to check. */ static const QErrorStringTable qerror_table[] = { { diff --git a/qerror.h b/qerror.h index 27800fe..40e52e8 100644 --- a/qerror.h +++ b/qerror.h @@ -49,7 +49,7 @@ QError *qobject_to_qerror(const QObject *obj); /* * QError class list * Please keep the definitions in alphabetical order. - * Use "grep '^#define QERR_' qerror.h | sort -c" to check. + * Use scripts/check-qerror.sh to check. */ #define QERR_BAD_BUS_FOR_DEVICE \ "{ 'class': 'BadBusForDevice', 'data': { 'device': %s, 'bad_bus_type': %s } }" diff --git a/scripts/check-qerror.sh b/scripts/check-qerror.sh new file mode 100755 index 0000000..af7fbd5 --- /dev/null +++ b/scripts/check-qerror.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# This script verifies that qerror definitions and table entries are +# alphabetically ordered. + +check_order() { + errmsg=$1 + shift + + # sort -C verifies order but does not print a message. sort -c does print a + # message. These options are both in POSIX. + if ! "$@" | sort -C; then + echo "$errmsg" + "$@" | sort -c + exit 1 + fi + return 0 +} + +check_order 'Definitions in qerror.h must be in alphabetical order:' \ + grep '^#define QERR_' qerror.h +check_order 'Entries in qerror.c:qerror_table must be in alphabetical order:' \ + sed -n '/^static.*qerror_table\[\]/,/^};/s/QERR_/&/gp' qerror.c