OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: Drop useless gen_err_check()

Browse Source 
Ever since commit 12f254f removed the last parameterization
of gen_err_check(), it no longer makes sense to hide the three
lines of generated C code behind a macro call. Just inline it
into the remaining users.

No change to generated code.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1468468228-27827-7-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2016-07-13 21:50:17 -06:00 committed by Markus Armbruster
parent b616770682
commit fa274ed6fb
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/qapi-commands.py
View File

@ -46,8 +46,10 @@ def gen_call(name, arg_type, ret_type):
''', ''',
c_name=c_name(name), args=argstr, lhs=lhs) c_name=c_name(name), args=argstr, lhs=lhs)
if ret_type: if ret_type:
ret += gen_err_check()
ret += mcgen(''' ret += mcgen('''
if (err) {
goto out;
}
qmp_marshal_output_%(c_name)s(retval, ret, &err); qmp_marshal_output_%(c_name)s(retval, ret, &err);
''', ''',

8
scripts/qapi-visit.py
View File

@ -47,9 +47,11 @@ void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp)
if base: if base:
ret += mcgen(''' ret += mcgen('''
visit_type_%(c_type)s_members(v, (%(c_type)s *)obj, &err); visit_type_%(c_type)s_members(v, (%(c_type)s *)obj, &err);
if (err) {
goto out;
}
''', ''',
c_type=base.c_name()) c_type=base.c_name())
ret += gen_err_check()
for memb in members: for memb in members:
if memb.optional: if memb.optional:
@ -60,10 +62,12 @@ void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp)
push_indent() push_indent()
ret += mcgen(''' ret += mcgen('''
visit_type_%(c_type)s(v, "%(name)s", &obj->%(c_name)s, &err); visit_type_%(c_type)s(v, "%(name)s", &obj->%(c_name)s, &err);
if (err) {
goto out;
}
''', ''',
c_type=memb.type.c_name(), name=memb.name, c_type=memb.type.c_name(), name=memb.name,
c_name=c_name(memb.name)) c_name=c_name(memb.name))
ret += gen_err_check()
if memb.optional: if memb.optional:
pop_indent() pop_indent()
ret += mcgen(''' ret += mcgen('''

8
scripts/qapi.py
View File

@ -1656,14 +1656,6 @@ def gen_params(arg_type, extra):
return ret return ret
def gen_err_check():
return mcgen('''
if (err) {
goto out;
}
''')
# #
# Common command line parsing # Common command line parsing
# #