yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-08-04 08:51:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Consistent generated code: prefer common labels

Browse source 
We had some pointless differences in the generated code for visit,
command marshalling, and events; unifying them makes it easier for
future patches to consolidate to common helper functions.
This is one patch of a series to clean up these differences.

This patch names the goto labels 'out' (not 'clean') and 'out_obj'
(not 'out_end'). Additionally, the generator was inconsistent on
whether labels had a leading space [our HACKING is silent; while
emacs 'gnu' style adds the space to avoid littering column 1].
For minimal churn, prefer no leading space; this also matches
the style that is more prevalent in current qemu.git.

No change in semantics to the generated code.

Backports commit f782399cb4fa3fc4182cb046817f65a6db92ab07 from qemu
This commit is contained in:
Eric Blake 2018-02-19 18:23:12 -05:00 committed by Lioncash
parent 4e9c5e4d52
commit 53c2c709af
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qemu/scripts/qapi-event.py
View file

@ -84,7 +84,7 @@ def generate_event_implement(api_name, event_name, params):
/* Fake visit, as if all members are under a structure */ /* Fake visit, as if all members are under a structure */
visit_start_struct(v, NULL, "", "%(event_name)s", 0, &err); visit_start_struct(v, NULL, "", "%(event_name)s", 0, &err);
if (err) { if (err) {
goto clean; goto out;
} }
""", """,
@ -106,7 +106,7 @@ def generate_event_implement(api_name, event_name, params):
ret += mcgen(""" ret += mcgen("""
visit_type_%(type)s(v, %(var_type)s&%(var)s, "%(name)s", &err); visit_type_%(type)s(v, %(var_type)s&%(var)s, "%(name)s", &err);
if (err) { if (err) {
goto clean; goto out;
} }
""", """,
var_type = var_type, var_type = var_type,
@ -124,7 +124,7 @@ def generate_event_implement(api_name, event_name, params):
visit_end_struct(v, &err); visit_end_struct(v, &err);
if (err) { if (err) {
goto clean; goto out;
} }
obj = qmp_output_get_qobject(qov); obj = qmp_output_get_qobject(qov);
@ -143,7 +143,7 @@ def generate_event_implement(api_name, event_name, params):
# step 5: clean up # step 5: clean up
if params and params.members: if params and params.members:
ret += mcgen(""" ret += mcgen("""
clean: out:
qmp_output_visitor_cleanup(qov); qmp_output_visitor_cleanup(qov);
""") """)
ret += mcgen(""" ret += mcgen("""

4
qemu/scripts/qapi-visit.py
View file

@ -207,7 +207,7 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error
} }
visit_get_next_type(v, (int*) &(*obj)->kind, %(c_name)s_qtypes, name, &err); visit_get_next_type(v, (int*) &(*obj)->kind, %(c_name)s_qtypes, name, &err);
if (err) { if (err) {
goto out_end; goto out_obj;
} }
switch ((*obj)->kind) { switch ((*obj)->kind) {
''', ''',
@ -228,7 +228,7 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error
default: default:
abort(); abort();
} }
out_end: out_obj:
error_propagate(errp, err); error_propagate(errp, err);
err = NULL; err = NULL;
visit_end_implicit_struct(v); visit_end_implicit_struct(v);