summaryrefslogtreecommitdiffstats
path: root/scripts/qapi-types.py
diff options
context:
space:
mode:
authorWenchao Xia2014-03-05 03:44:36 +0100
committerLuiz Capitulino2014-03-11 14:07:42 +0100
commitb0b58195e4a3039b6a473124dc27ed707db50240 (patch)
tree062c3d5249606860f0779a2720cdea69c0f8ac13 /scripts/qapi-types.py
parentqapi script: code move for generate_enum_name() (diff)
downloadqemu-b0b58195e4a3039b6a473124dc27ed707db50240.tar.gz
qemu-b0b58195e4a3039b6a473124dc27ed707db50240.tar.xz
qemu-b0b58195e4a3039b6a473124dc27ed707db50240.zip
qapi script: use same function to generate enum string
Prior to this patch, qapi-visit.py used custom code to generate enum names used for handling a qapi union. Fix it to instead reuse common code, with identical generated results, and allowing future updates to generation to only need to touch one place. Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'scripts/qapi-types.py')
-rw-r--r--scripts/qapi-types.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 35ad9931b6..5885bac5ba 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -144,11 +144,11 @@ typedef enum %(name)s
i = 0
for value in enum_values:
+ enum_full_value = generate_enum_full_value(name, value)
enum_decl += mcgen('''
- %(abbrev)s_%(value)s = %(i)d,
+ %(enum_full_value)s = %(i)d,
''',
- abbrev=de_camel_case(name).upper(),
- value=generate_enum_name(value),
+ enum_full_value = enum_full_value,
i=i)
i += 1