mirror of https://github.com/proxmox/mirror_qemu
qapi script: do not add "_" for every capitalized char in enum
Now "enum AIOContext" will generate AIO_CONTEXT instead of A_I_O_CONTEXT, "X86CPU" will generate X86_CPU instead of X86_C_P_U. 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>master
parent
5223070c47
commit
5d371f41b4
|
@ -159,7 +159,7 @@ void qerror_report_err(Error *err);
|
||||||
ERROR_CLASS_GENERIC_ERROR, "Invalid JSON syntax"
|
ERROR_CLASS_GENERIC_ERROR, "Invalid JSON syntax"
|
||||||
|
|
||||||
#define QERR_KVM_MISSING_CAP \
|
#define QERR_KVM_MISSING_CAP \
|
||||||
ERROR_CLASS_K_V_M_MISSING_CAP, "Using KVM without %s, %s unavailable"
|
ERROR_CLASS_KVM_MISSING_CAP, "Using KVM without %s, %s unavailable"
|
||||||
|
|
||||||
#define QERR_MIGRATION_ACTIVE \
|
#define QERR_MIGRATION_ACTIVE \
|
||||||
ERROR_CLASS_GENERIC_ERROR, "There's a migration process in progress"
|
ERROR_CLASS_GENERIC_ERROR, "There's a migration process in progress"
|
||||||
|
|
|
@ -498,17 +498,29 @@ def guardend(name):
|
||||||
''',
|
''',
|
||||||
name=guardname(name))
|
name=guardname(name))
|
||||||
|
|
||||||
def _generate_enum_value_string(value):
|
# ENUMName -> ENUM_NAME, EnumName1 -> ENUM_NAME1
|
||||||
|
# ENUM_NAME -> ENUM_NAME, ENUM_NAME1 -> ENUM_NAME1, ENUM_Name2 -> ENUM_NAME2
|
||||||
|
# ENUM24_Name -> ENUM24_NAME
|
||||||
|
def _generate_enum_string(value):
|
||||||
|
c_fun_str = c_fun(value, False)
|
||||||
if value.isupper():
|
if value.isupper():
|
||||||
return c_fun(value, False)
|
return c_fun_str
|
||||||
|
|
||||||
new_name = ''
|
new_name = ''
|
||||||
for c in c_fun(value, False):
|
l = len(c_fun_str)
|
||||||
if c.isupper():
|
for i in range(l):
|
||||||
|
c = c_fun_str[i]
|
||||||
|
# When c is upper and no "_" appears before, do more checks
|
||||||
|
if c.isupper() and (i > 0) and c_fun_str[i - 1] != "_":
|
||||||
|
# Case 1: next string is lower
|
||||||
|
# Case 2: previous string is digit
|
||||||
|
if (i < (l - 1) and c_fun_str[i + 1].islower()) or \
|
||||||
|
c_fun_str[i - 1].isdigit():
|
||||||
new_name += '_'
|
new_name += '_'
|
||||||
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 generate_enum_full_value(enum_name, enum_value):
|
||||||
abbrev_string = de_camel_case(enum_name).upper()
|
abbrev_string = _generate_enum_string(enum_name)
|
||||||
value_string = _generate_enum_value_string(enum_value)
|
value_string = _generate_enum_string(enum_value)
|
||||||
return "%s_%s" % (abbrev_string, value_string)
|
return "%s_%s" % (abbrev_string, value_string)
|
||||||
|
|
|
@ -315,7 +315,7 @@ typedef struct X86RegisterInfo32 {
|
||||||
} X86RegisterInfo32;
|
} X86RegisterInfo32;
|
||||||
|
|
||||||
#define REGISTER(reg) \
|
#define REGISTER(reg) \
|
||||||
[R_##reg] = { .name = #reg, .qapi_enum = X86_C_P_U_REGISTER32_##reg }
|
[R_##reg] = { .name = #reg, .qapi_enum = X86_CPU_REGISTER32_##reg }
|
||||||
X86RegisterInfo32 x86_reg_info_32[CPU_NB_REGS32] = {
|
X86RegisterInfo32 x86_reg_info_32[CPU_NB_REGS32] = {
|
||||||
REGISTER(EAX),
|
REGISTER(EAX),
|
||||||
REGISTER(ECX),
|
REGISTER(ECX),
|
||||||
|
|
Loading…
Reference in New Issue