diff options
| -rw-r--r-- | scripts/qapi-commands.py | 4 | ||||
| -rw-r--r-- | scripts/qapi-visit.py | 8 | ||||
| -rw-r--r-- | scripts/qapi.py | 8 |
3 files changed, 9 insertions, 11 deletions
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index c93470cf2a..333a46f623 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -46,8 +46,10 @@ def gen_call(name, arg_type, ret_type): ''', c_name=c_name(name), args=argstr, lhs=lhs) if ret_type: - ret += gen_err_check() ret += mcgen(''' + if (err) { + goto out; + } qmp_marshal_output_%(c_name)s(retval, ret, &err); ''', diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 0b9e298bc4..96f2491c16 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -47,9 +47,11 @@ void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp) if base: ret += mcgen(''' visit_type_%(c_type)s_members(v, (%(c_type)s *)obj, &err); + if (err) { + goto out; + } ''', c_type=base.c_name()) - ret += gen_err_check() for memb in members: if memb.optional: @@ -60,10 +62,12 @@ void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp) push_indent() ret += mcgen(''' 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_name=c_name(memb.name)) - ret += gen_err_check() if memb.optional: pop_indent() ret += mcgen(''' diff --git a/scripts/qapi.py b/scripts/qapi.py index 27284be144..9c48f6d80a 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1656,14 +1656,6 @@ def gen_params(arg_type, extra): return ret -def gen_err_check(): - return mcgen(''' - if (err) { - goto out; - } -''') - - # # Common command line parsing # |