aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/qapi-event.py5
-rw-r--r--scripts/qapi-types.py6
-rw-r--r--scripts/qapi-visit.py4
-rw-r--r--scripts/qapi.py6
4 files changed, 10 insertions, 11 deletions
diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py
index c4612e396e..a7e0033cc1 100644
--- a/scripts/qapi-event.py
+++ b/scripts/qapi-event.py
@@ -177,7 +177,7 @@ typedef enum %(event_enum_name)s
event_enum_name = event_enum_name)
# 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 ]
i = 0
@@ -343,8 +343,7 @@ for expr in exprs:
fdecl.write(ret)
# We need an enum value per event
- event_enum_value = generate_enum_full_value(event_enum_name,
- event_name)
+ event_enum_value = c_enum_const(event_enum_name, event_name)
ret = generate_event_implement(api_name, event_name, params)
fdef.write(ret)
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index e74cabece0..6ca48c11c0 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -118,13 +118,13 @@ const char *%(name)s_lookup[] = {
name=name)
i = 0
for value in values:
- index = generate_enum_full_value(name, value)
+ index = c_enum_const(name, value)
ret += mcgen('''
[%(index)s] = "%(value)s",
''',
index = index, value = value)
- max_index = generate_enum_full_value(name, 'MAX')
+ max_index = c_enum_const(name, 'MAX')
ret += mcgen('''
[%(max_index)s] = NULL,
};
@@ -150,7 +150,7 @@ typedef enum %(name)s
i = 0
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_full_value)s = %(i)d,
''',
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index ba623b10b8..0368e62d23 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -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_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('''
case %(enum_full_value)s:
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:
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('''
case %(enum_full_value)s:
''' + fmt + '''
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 7330f7cc64..1258f762ba 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -960,7 +960,7 @@ def camel_to_upper(value):
new_name += c
return new_name.lstrip('_').upper()
-def generate_enum_full_value(enum_name, enum_value):
- abbrev_string = camel_to_upper(enum_name)
- value_string = camel_to_upper(enum_value)
+def c_enum_const(type_name, const_name):
+ abbrev_string = camel_to_upper(type_name)
+ value_string = camel_to_upper(const_name)
return "%s_%s" % (abbrev_string, value_string)