openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qapi: Do not define enumeration value explicitly 

The generated C enumeration types explicitly set the enumeration
constants to 0, 1, 2, ...  That's exactly what you get when you don't
supply values.

Drop the explicit values.  No change now, but it will avoid gaps in
the values when we later add support for 'if' conditions.  Avoiding
such gaps will save us the trouble of changing the ENUM_lookup[]
tables to work without a sentinel.

We'll have to take care to ensure the headers required by the 'if'
conditions get always included before the generated QAPI code.
Fortunately, our convention to include "qemu/osdep.h" first in any .c
ensures that's the case for our CONFIG_FOO macros.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20181213123724.4866-2-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-12-13 16:37:03 +04:00 committed by Markus Armbruster
parent b0ddeba22a
commit 9c2f56e9f9
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/qapi/common.py
View File

@ -2045,14 +2045,11 @@ def gen_enum(name, values, prefix=None):
''', ''',
c_name=c_name(name)) c_name=c_name(name))
i = 0
for value in enum_values: for value in enum_values:
ret += mcgen(''' ret += mcgen('''
%(c_enum)s = %(i)d, %(c_enum)s,
''', ''',
c_enum=c_enum_const(name, value, prefix), c_enum=c_enum_const(name, value, prefix))
i=i)
i += 1
ret += mcgen(''' ret += mcgen('''
} %(c_name)s; } %(c_name)s;