aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2017-08-24 10:46:11 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-09-04 13:09:13 +0200
commitebf677c8497ee81537f7ce57b165c978511ccde5 (patch)
tree5ce274d0896ffdce4d5b401fde541c4a59949e54
parentf7abe0ecd4973dfe36944b916c5b9cf8ec199b8a (diff)
downloadqemu-ebf677c8497ee81537f7ce57b165c978511ccde5.zip
qemu-ebf677c8497ee81537f7ce57b165c978511ccde5.tar.gz
qemu-ebf677c8497ee81537f7ce57b165c978511ccde5.tar.bz2
qapi: drop the sentinel in enum array
Now that all usages have been converted to user lookup helpers. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20170822132255.23945-14-marcandre.lureau@redhat.com> [Rebased, superfluous local variable dropped, missing check-qom-proplist.c update added] Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1503564371-26090-17-git-send-email-armbru@redhat.com>
-rw-r--r--block/parallels.c1
-rw-r--r--scripts/qapi.py4
-rw-r--r--tests/check-qom-proplist.c1
3 files changed, 1 insertions, 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 39a6727..62dc52e 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
};