commit f7abe0ecd4973dfe36944b916c5b9cf8ec199b8a
author Marc-André Lureau <marcandre.lureau@redhat.com> Thu Aug 24 10:46:10 2017 +0200
committer Markus Armbruster <armbru@redhat.com> Mon Sep 04 13:09:13 2017 +0200
tree 99ca676afbfcf2da0182b3bf99811d000cb69c58
parent 788b305c91398f18e5952667b929d7f45e2c211c

qapi: Change data type of the FOO_lookup generated for enum FOO

Currently, a FOO_lookup is an array of strings terminated by a NULL
sentinel.

A future patch will generate enums with "holes".  NULL-termination
will cease to work then.

To prepare for that, store the length in the FOO_lookup by wrapping it
in a struct and adding a member for the length.

The sentinel will be dropped next.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170822132255.23945-13-marcandre.lureau@redhat.com>
[Basically redone]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1503564371-26090-16-git-send-email-armbru@redhat.com>
[Rebased]

qemu-img.c

diff --git a/qemu-img.c b/qemu-img.c
index a72a2e3..df984b1 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -3489,7 +3489,7 @@
             image_opts = true;
             break;
         case OPTION_PREALLOCATION:
-            prealloc = qapi_enum_parse(PreallocMode_lookup, optarg,
+            prealloc = qapi_enum_parse(&PreallocMode_lookup, optarg,
                                        PREALLOC_MODE__MAX, NULL);
             if (prealloc == PREALLOC_MODE__MAX) {
                 error_report("Invalid preallocation mode '%s'", optarg);