jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

qapi: Drop useless gen_err_check()

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>

authored by

Eric Blake and committed by
Markus Armbruster fa274ed6 b6167706

+9 -11
+3 -1
scripts/qapi-commands.py
··· 46 46 ''', 47 47 c_name=c_name(name), args=argstr, lhs=lhs) 48 48 if ret_type: 49 - ret += gen_err_check() 50 49 ret += mcgen(''' 50 + if (err) { 51 + goto out; 52 + } 51 53 52 54 qmp_marshal_output_%(c_name)s(retval, ret, &err); 53 55 ''',
+6 -2
scripts/qapi-visit.py
··· 47 47 if base: 48 48 ret += mcgen(''' 49 49 visit_type_%(c_type)s_members(v, (%(c_type)s *)obj, &err); 50 + if (err) { 51 + goto out; 52 + } 50 53 ''', 51 54 c_type=base.c_name()) 52 - ret += gen_err_check() 53 55 54 56 for memb in members: 55 57 if memb.optional: ··· 60 62 push_indent() 61 63 ret += mcgen(''' 62 64 visit_type_%(c_type)s(v, "%(name)s", &obj->%(c_name)s, &err); 65 + if (err) { 66 + goto out; 67 + } 63 68 ''', 64 69 c_type=memb.type.c_name(), name=memb.name, 65 70 c_name=c_name(memb.name)) 66 - ret += gen_err_check() 67 71 if memb.optional: 68 72 pop_indent() 69 73 ret += mcgen('''
-8
scripts/qapi.py
··· 1656 1656 return ret 1657 1657 1658 1658 1659 - def gen_err_check(): 1660 - return mcgen(''' 1661 - if (err) { 1662 - goto out; 1663 - } 1664 - ''') 1665 - 1666 - 1667 1659 # 1668 1660 # Common command line parsing 1669 1661 #