summaryrefslogtreecommitdiffstats
path: root/scripts/qapi-types.py
diff options
context:
space:
mode:
authorAnthony Liguori2011-10-10 15:21:46 +0200
committerAnthony Liguori2011-10-10 15:21:46 +0200
commitebffe2afceb1a17b5d134b5debf553955fe5ea1a (patch)
tree223ee0630a56a8d1410d5ad283996486ec434ab7 /scripts/qapi-types.py
parentMerge remote-tracking branch 'stefanha/trivial-patches' into staging (diff)
parentqapi: Convert system_powerdown (diff)
downloadqemu-ebffe2afceb1a17b5d134b5debf553955fe5ea1a.tar.gz
qemu-ebffe2afceb1a17b5d134b5debf553955fe5ea1a.tar.xz
qemu-ebffe2afceb1a17b5d134b5debf553955fe5ea1a.zip
Merge remote-tracking branch 'qmp/queue/qmp' into staging
Diffstat (limited to 'scripts/qapi-types.py')
-rw-r--r--scripts/qapi-types.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index cece32546a..f64d84c39e 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -70,7 +70,7 @@ const char *%(name)s_lookup[] = {
ret += mcgen('''
"%(value)s",
''',
- value=c_var(value).lower())
+ value=value.lower())
ret += mcgen('''
NULL,
@@ -91,8 +91,11 @@ typedef enum %(name)s
''',
name=name)
+ # append automatically generated _MAX value
+ enum_values = values + [ 'MAX' ]
+
i = 0
- for value in values:
+ for value in enum_values:
enum_decl += mcgen('''
%(abbrev)s_%(value)s = %(i)d,
''',
@@ -254,6 +257,8 @@ for expr in exprs:
ret = "\n"
if expr.has_key('type'):
ret += generate_struct(expr['type'], "", expr['data']) + "\n"
+ ret += generate_type_cleanup_decl(expr['type'] + "List")
+ fdef.write(generate_type_cleanup(expr['type'] + "List") + "\n")
ret += generate_type_cleanup_decl(expr['type'])
fdef.write(generate_type_cleanup(expr['type']) + "\n")
elif expr.has_key('union'):
@@ -268,3 +273,6 @@ fdecl.write('''
fdecl.flush()
fdecl.close()
+
+fdef.flush()
+fdef.close()