[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 13/54] qapi: drop the sentinel in enum array
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 13/54] qapi: drop the sentinel in enum array |
Date: |
Tue, 22 Aug 2017 15:22:14 +0200 |
Now that all usages have been converted to user lookup helpers.
Signed-off-by: Marc-André Lureau <address@hidden>
---
scripts/qapi.py | 1 -
block/parallels.c | 1 -
ui/input-legacy.c | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 314d7e0365..73adb90379 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -1863,7 +1863,6 @@ static const char *const %(c_name)s_array[] = {
max_index = c_enum_const(name, '_MAX', prefix)
ret += mcgen('''
- [%(max_index)s] = NULL,
};
const QEnumLookup %(c_name)s_lookup = {
diff --git a/block/parallels.c b/block/parallels.c
index f870bbac3e..d5de692c9c 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -72,7 +72,6 @@ typedef enum ParallelsPreallocMode {
static const char *prealloc_mode_array[] = {
"falloc",
"truncate",
- NULL,
};
static QEnumLookup prealloc_mode_lookup = {
diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index c597bdc711..d50a18a505 100644
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -61,7 +61,7 @@ int index_from_key(const char *key, size_t key_length)
{
int i;
- for (i = 0; QKeyCode_lookup.array[i] != NULL; i++) {
+ for (i = 0; i < QKeyCode_lookup.size; i++) {
if (!strncmp(key, QKeyCode_lookup.array[i], key_length) &&
!QKeyCode_lookup.array[i][key_length]) {
break;
--
2.14.1.146.gd35faa819
[Qemu-devel] [PATCH v2 25/54] qapi-visit: add #if conditions to visitors, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 48/54] tests/qmp-test: add query-qmp-schema test, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 09/54] hmp: use qapi_enum_parse() in hmp_migrate_set_parameter, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 22/54] qapi-introspect: add preprocessor conditions to generated QLit, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 13/54] qapi: drop the sentinel in enum array,
Marc-André Lureau <=
[Qemu-devel] [PATCH v2 06/54] qapi: introduce qapi_enum_lookup(), Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 12/54] qapi: change enum lookup structure, Marc-André Lureau, 2017/08/22
[Qemu-devel] [PATCH v2 53/54] qapi: make query-cpu-model-expansion depend on s390 or x86, Marc-André Lureau, 2017/08/22