From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdw54-0002so-Qd for qemu-devel@nongnu.org; Mon, 21 Sep 2015 04:04:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zdw53-0004yM-Eh for qemu-devel@nongnu.org; Mon, 21 Sep 2015 04:04:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdw53-0004xs-7d for qemu-devel@nongnu.org; Mon, 21 Sep 2015 04:04:09 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id D25228E68B for ; Mon, 21 Sep 2015 08:04:08 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-38.ams2.redhat.com [10.36.116.38]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8L845FD027026 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 21 Sep 2015 04:04:08 -0400 From: Markus Armbruster Date: Mon, 21 Sep 2015 10:03:48 +0200 Message-Id: <1442822640-29912-15-git-send-email-armbru@redhat.com> In-Reply-To: <1442822640-29912-1-git-send-email-armbru@redhat.com> References: <1442822640-29912-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 14/26] qapi-visit: Rearrange code a bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Move gen_visit_decl() to a better place. Inline generate_visit_struct_body(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Daniel P. Berrange Message-Id: <1442401589-24189-15-git-send-email-armbru@redhat.com> --- scripts/qapi-visit.py | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index fae70e2..97343cf 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -19,6 +19,16 @@ implicit_structs_seen = set() struct_fields_seen = set() +def gen_visit_decl(name, scalar=False): + c_type = c_name(name) + ' *' + if not scalar: + c_type += '*' + return mcgen(''' +void visit_type_%(c_name)s(Visitor *m, %(c_type)sobj, const char *name, Error **errp); +''', + c_name=c_name(name), c_type=c_type) + + def gen_visit_implicit_struct(typ): if typ in implicit_structs_seen: return '' @@ -117,12 +127,17 @@ out: return ret -def gen_visit_struct_body(name): +def gen_visit_struct(name, base, members): + ret = gen_visit_struct_fields(name, base, members) + # FIXME: if *obj is NULL on entry, and visit_start_struct() assigns to # *obj, but then visit_type_FOO_fields() fails, we should clean up *obj # rather than leaving it non-NULL. As currently written, the caller must # call qapi_free_FOO() to avoid a memory leak of the partial FOO. - ret = mcgen(''' + ret += mcgen(''' + +void visit_type_%(c_name)s(Visitor *m, %(c_name)s **obj, const char *name, Error **errp) +{ Error *err = NULL; visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(c_name)s), &err); @@ -133,25 +148,10 @@ def gen_visit_struct_body(name): visit_end_struct(m, &err); } error_propagate(errp, err); -''', - name=name, c_name=c_name(name)) - return ret - - -def gen_visit_struct(name, base, members): - ret = gen_visit_struct_fields(name, base, members) - ret += mcgen(''' - -void visit_type_%(c_name)s(Visitor *m, %(c_name)s **obj, const char *name, Error **errp) -{ -''', - c_name=c_name(name)) - - ret += gen_visit_struct_body(name) - - ret += mcgen(''' } -''') +''', + name=name, c_name=c_name(name)) + return ret @@ -342,16 +342,6 @@ out: return ret -def gen_visit_decl(name, scalar=False): - c_type = c_name(name) + ' *' - if not scalar: - c_type += '*' - return mcgen(''' -void visit_type_%(c_name)s(Visitor *m, %(c_type)sobj, const char *name, Error **errp); -''', - c_name=c_name(name), c_type=c_type) - - class QAPISchemaGenVisitVisitor(QAPISchemaVisitor): def __init__(self): self.decl = None -- 2.4.3