From: Markus Armbruster <arm...@redhat.com>
Missed in commit b0b5819.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
scripts/qapi-types.py | 6 ++----
scripts/qapi.py | 11 -----------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 6ca48c1..9eb08a6 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -180,11 +180,9 @@ const int %(name)s_qtypes[QTYPE_MAX] = {
assert qtype, "Invalid alternate member"
ret += mcgen('''
- [ %(qtype)s ] = %(abbrev)s_KIND_%(enum)s,
+ [ %(qtype)s ] = %(enum_const)s,
''',
- qtype = qtype,
- abbrev = de_camel_case(name).upper(),
- enum = c_name(de_camel_case(key),False).upper())
+ qtype = qtype, enum_const = c_enum_const(name + 'Kind', key))
ret += mcgen('''
};
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 9209fd5..967dadb 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -729,17 +729,6 @@ def parse_args(typeinfo):
# value of an optional argument.
yield (argname, argentry, optional)
-def de_camel_case(name):
- new_name = ''
- for ch in name:
- if ch.isupper() and new_name:
- new_name += '_'
- if ch == '-':
- new_name += '_'
- else:
- new_name += ch.lower()
- return new_name
-
def camel_case(name):
new_name = ''
first = True
--
2.1.0
