[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/16] qapi: drop the sentinel in enum array
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 16/16] qapi: drop the sentinel in enum array |
Date: |
Thu, 24 Aug 2017 10:46: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>
---
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 cce7336..2b6c6e5 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 61be538..a0993ee 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 07e351f..92898e1 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.7.5
- [Qemu-devel] [PATCH 00/16] qapi: Rework mapping of enum value to string, Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 10/16] qapi: Use qapi_enum_parse() in input_type_enum(), Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 14/16] qapi: Convert indirect uses of FOO_lookup[...] to qapi_enum_lookup(), Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 12/16] qapi: Generate FOO_str() macro for QAPI enum FOO, Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 08/16] quorum: Use qapi_enum_parse() in quorum_open(), Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 16/16] qapi: drop the sentinel in enum array,
Markus Armbruster <=
- [Qemu-devel] [PATCH 11/16] qapi: Avoid unnecessary use of enum lookup table's sentinel, Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 04/16] tpm: Clean up model registration & lookup, Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 01/16] qapi: Update qapi-code-gen.txt examples to match current code, Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 05/16] hmp: Use qapi_enum_parse() in hmp_migrate_set_capability(), Markus Armbruster, 2017/08/24