Commit 9c2f56e9 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20181213123724.4866-2-marcandre.lureau@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent b0ddeba2

scripts/qapi/common.py

+2 −5
Original line number Diff line number Diff line
@@ -2045,14 +2045,11 @@ typedef enum %(c_name)s { 
''',

                c_name=c_name(name))



    i = 0

    for value in enum_values:

        ret += mcgen('''

    %(c_enum)s = %(i)d,

    %(c_enum)s,

''',

                     c_enum=c_enum_const(name, value, prefix),

                     i=i)

        i += 1

                     c_enum=c_enum_const(name, value, prefix))



    ret += mcgen('''

} %(c_name)s;