From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YPwIH-0004oN-P6 for qemu-devel@nongnu.org; Mon, 23 Feb 2015 11:55:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YPwIB-0000sf-6W for qemu-devel@nongnu.org; Mon, 23 Feb 2015 11:55:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YPwIA-0000sY-Pq for qemu-devel@nongnu.org; Mon, 23 Feb 2015 11:55:35 -0500 From: Luiz Capitulino Date: Mon, 23 Feb 2015 11:55:26 -0500 Message-Id: <1424710526-21474-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1424710526-21474-1-git-send-email-lcapitulino@redhat.com> References: <1424710526-21474-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PULL 4/4] qapi-types: add C99 index names to arrays List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: qemu-devel@nongnu.org From: "Michael S. Tsirkin" It's not easy to figure out how monitor translates strings: most QEMU code deals with translated indexes, these are translated using _lookup arrays, so you need to find the array name, and find the appropriate offset. This patch adds C99 indexes to lookup arrays, which makes it possible to find the correct key using simple grep, and see that the matching is correct at a glance. Example: Before: const char *MigrationCapability_lookup[] = { "xbzrle", "rdma-pin-all", "auto-converge", "zero-blocks", NULL, }; After: const char *MigrationCapability_lookup[] = { [MIGRATION_CAPABILITY_XBZRLE] = "xbzrle", [MIGRATION_CAPABILITY_RDMA_PIN_ALL] = "rdma-pin-all", [MIGRATION_CAPABILITY_AUTO_CONVERGE] = "auto-converge", [MIGRATION_CAPABILITY_ZERO_BLOCKS] = "zero-blocks", [MIGRATION_CAPABILITY_MAX] = NULL, }; Signed-off-by: Michael S. Tsirkin Reviewed-by: Eric Blake Signed-off-by: Luiz Capitulino --- scripts/qapi-types.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 1eb272d..db87218 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -123,16 +123,19 @@ const char *%(name)s_lookup[] = { name=name) i = 0 for value in values: + index = generate_enum_full_value(name, value) ret += mcgen(''' - "%(value)s", + [%(index)s] = "%(value)s", ''', - value=value) + index = index, value = value) + max_index = generate_enum_full_value(name, 'MAX') ret += mcgen(''' - NULL, + [%(max_index)s] = NULL, }; -''') +''', + max_index=max_index) return ret def generate_enum(name, values): -- 1.9.3