ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qapi: Rename generate_enum_full_value() to c_enum_const() 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2015-05-14 06:50:50 -06:00
parent fa6068a1e8
commit 7c81c61f9c
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/qapi-event.py
View File

@ -177,7 +177,7 @@ typedef enum %(event_enum_name)s
event_enum_name = event_enum_name) event_enum_name = event_enum_name)
# append automatically generated _MAX value # append automatically generated _MAX value
enum_max_value = generate_enum_full_value(event_enum_name, "MAX") enum_max_value = c_enum_const(event_enum_name, "MAX")
enum_values = event_enum_values + [ enum_max_value ] enum_values = event_enum_values + [ enum_max_value ]
i = 0 i = 0
@ -343,8 +343,7 @@ for expr in exprs:
fdecl.write(ret) fdecl.write(ret)
# We need an enum value per event # We need an enum value per event
event_enum_value = generate_enum_full_value(event_enum_name, event_enum_value = c_enum_const(event_enum_name, event_name)
event_name)
ret = generate_event_implement(api_name, event_name, params) ret = generate_event_implement(api_name, event_name, params)
fdef.write(ret) fdef.write(ret)

6
scripts/qapi-types.py
View File

@ -118,13 +118,13 @@ const char *%(name)s_lookup[] = {
name=name) name=name)
i = 0 i = 0
for value in values: for value in values:
index = generate_enum_full_value(name, value) index = c_enum_const(name, value)
ret += mcgen(''' ret += mcgen('''
[%(index)s] = "%(value)s", [%(index)s] = "%(value)s",
''', ''',
index = index, value = value) index = index, value = value)
max_index = generate_enum_full_value(name, 'MAX') max_index = c_enum_const(name, 'MAX')
ret += mcgen(''' ret += mcgen('''
[%(max_index)s] = NULL, [%(max_index)s] = NULL,
}; };
@ -150,7 +150,7 @@ typedef enum %(name)s
i = 0 i = 0
for value in enum_values: for value in enum_values:
enum_full_value = generate_enum_full_value(name, value) enum_full_value = c_enum_const(name, value)
enum_decl += mcgen(''' enum_decl += mcgen('''
%(enum_full_value)s = %(i)d, %(enum_full_value)s = %(i)d,
''', ''',

4
scripts/qapi-visit.py
View File

@ -214,7 +214,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **e
or find_union(members[key]) or find_union(members[key])
or find_enum(members[key])), "Invalid alternate member" or find_enum(members[key])), "Invalid alternate member"
enum_full_value = generate_enum_full_value(disc_type, key) enum_full_value = c_enum_const(disc_type, key)
ret += mcgen(''' ret += mcgen('''
case %(enum_full_value)s: case %(enum_full_value)s:
visit_type_%(c_type)s(m, &(*obj)->%(c_name)s, name, &err); visit_type_%(c_type)s(m, &(*obj)->%(c_name)s, name, &err);
@ -315,7 +315,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **e
else: else:
fmt = 'visit_type_implicit_%(c_type)s(m, &(*obj)->%(c_name)s, &err);' fmt = 'visit_type_implicit_%(c_type)s(m, &(*obj)->%(c_name)s, &err);'
enum_full_value = generate_enum_full_value(disc_type, key) enum_full_value = c_enum_const(disc_type, key)
ret += mcgen(''' ret += mcgen('''
case %(enum_full_value)s: case %(enum_full_value)s:
''' + fmt + ''' ''' + fmt + '''

6
scripts/qapi.py
View File

@ -960,7 +960,7 @@ def camel_to_upper(value):
new_name += c new_name += c
return new_name.lstrip('_').upper() return new_name.lstrip('_').upper()
def generate_enum_full_value(enum_name, enum_value): def c_enum_const(type_name, const_name):
abbrev_string = camel_to_upper(enum_name) abbrev_string = camel_to_upper(type_name)
value_string = camel_to_upper(enum_value) value_string = camel_to_upper(const_name)
return "%s_%s" % (abbrev_string, value_string) return "%s_%s" % (abbrev_string, value_string)