[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 47/47] qapi: drop the sentinel in enum array
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 47/47] qapi: drop the sentinel in enum array |
Date: |
Fri, 1 Sep 2017 14:56:11 +0200 |
From: Marc-André Lureau <address@hidden>
Now that all usages have been converted to user lookup helpers.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
[Rebased, superfluous local variable dropped, missing
check-qom-proplist.c update added]
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
---
block/parallels.c | 1 -
scripts/qapi.py | 4 +---
tests/check-qom-proplist.c | 1 -
3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index cce7336cac..2b6c6e5709 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -72,7 +72,6 @@ static QEnumLookup prealloc_mode_lookup = {
.array = (const char *const[]) {
"falloc",
"truncate",
- NULL,
},
.size = PRL_PREALLOC_MODE__MAX
};
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 39a67270fc..62dc52ed6e 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -1860,14 +1860,12 @@ const QEnumLookup %(c_name)s_lookup = {
''',
index=index, value=value)
- max_index = c_enum_const(name, '_MAX', prefix)
ret += mcgen('''
- [%(max_index)s] = NULL,
},
.size = %(max_index)s
};
''',
- max_index=max_index)
+ max_index=c_enum_const(name, '_MAX', prefix))
return ret
diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c
index 07e351f950..92898e1520 100644
--- a/tests/check-qom-proplist.c
+++ b/tests/check-qom-proplist.c
@@ -51,7 +51,6 @@ const QEnumLookup dummy_animal_map = {
[DUMMY_FROG] = "frog",
[DUMMY_ALLIGATOR] = "alligator",
[DUMMY_PLATYPUS] = "platypus",
- [DUMMY_LAST] = NULL,
},
.size = DUMMY_LAST
};
--
2.13.5
- [Qemu-devel] [PULL 33/47] qapi: Drop superfluous qapi_enum_parse() parameter max, (continued)
- [Qemu-devel] [PULL 33/47] qapi: Drop superfluous qapi_enum_parse() parameter max, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 27/47] qapi-schema: Move block events from event.json to block.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 37/47] hmp: Use qapi_enum_parse() in hmp_migrate_set_parameter(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 12/47] qlit: Replace open-coded qnum_get_int() by call, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 28/47] qapi-schema: Fold event.json back into qapi-schema.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 09/47] qlit: make qlit_equal_qobject return a bool, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 20/47] qapi-schema: Collect run state stuff in qapi/run-state.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 25/47] qapi-schema: Collect transaction stuff in qapi/transaction.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 08/47] qlit: rename compare_litqobj_to_qobj() to qlit_equal_qobject(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 19/47] qapi-schema: Collect sockets stuff in qapi/sockets.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 47/47] qapi: drop the sentinel in enum array,
Markus Armbruster <=
- [Qemu-devel] [PULL 21/47] qapi-schema: Collect char device stuff in qapi/char.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 45/47] qapi: Convert indirect uses of FOO_lookup[...] to qapi_enum_lookup(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 30/47] qapi-schema: Move queries from common.json to qapi-schema.json, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 44/47] qapi: Mechanically convert FOO_lookup[...] to FOO_str(...), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 38/47] block: Use qemu_enum_parse() in blkdebug_debug_breakpoint(), Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 43/47] qapi: Generate FOO_str() macro for QAPI enum FOO, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 15/47] qlit: Tighten QLit list vs QList comparison, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 35/47] tpm: Clean up model registration & lookup, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 11/47] qlit: add QLIT_QNULL and QLIT_BOOL, Markus Armbruster, 2017/09/01
- [Qemu-devel] [PULL 34/47] tpm: Clean up driver registration & lookup, Markus Armbruster, 2017/09/01