From patchwork Fri Oct 19 02:42:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 192529 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 437932C0098 for ; Fri, 19 Oct 2012 14:59:25 +1100 (EST) Received: from localhost ([::1]:56917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2Yc-00060V-DW for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 22:43:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2Xp-0003rh-Qy for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TP2Xo-0002gM-Bz for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:41 -0400 Received: from mail-oa0-f45.google.com ([209.85.219.45]:49553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2Xo-0002dj-6g for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:40 -0400 Received: by mail-oa0-f45.google.com with SMTP id i18so3273oag.4 for ; Thu, 18 Oct 2012 19:42:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=lc8Sx8JV9s44eych+cDD21vuoh0uOMaVsUvgSKsXP9o=; b=P0CGZLQ5hMRjlukxHEEjsOJzUb+SKQ1s83EDAt6N1gJIVWqklzq4jSwPeuRjc75Fbb d0I8kmOBghlq6mqpiU5DRqL8+bNtQ96Q4V+crvCN881rK8CB3RUCyijI/kqx/taPTYmN 18ueNbiYqdLV6QTjx1QG1rfocgbVGMayX4eAdPlfkGv0cUhsK4jCdLauoegFpjFFvdNx Z5ukkZfQ6m6mDtTbBFiDEVP2F7fcpEOuwaKaVit4rDdC+qRzOCpApTlSHCPknB3KDBME 9kao+sAJQrz4DZBiqtAzGW2MbPdCGw/O9BNFXlnz16t1nomXnUkE6RWqvbZvSxE9HNA2 r7sg== Received: by 10.60.31.165 with SMTP id b5mr20331774oei.58.1350614559883; Thu, 18 Oct 2012 19:42:39 -0700 (PDT) Received: from loki.austin.ibm.com ([32.97.110.59]) by mx.google.com with ESMTPS id m6sm475144obk.3.2012.10.18.19.42.38 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 19:42:39 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 21:42:00 -0500 Message-Id: <1350614540-28583-7-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350614540-28583-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1350614540-28583-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.219.45 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 06/26] qapi: qapi_visit.py, support generating static functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qidl embeds visitor code into object files rather than linking against seperate files, so allow for static declarations when we're using qapi_visit.py as a library as we do with qidl.py Reviewed-by: Anthony Liguori Reviewed-by: Paolo Bonzini Signed-off-by: Michael Roth --- scripts/qapi_visit.py | 51 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/scripts/qapi_visit.py b/scripts/qapi_visit.py index d80d3d8..856df5e 100644 --- a/scripts/qapi_visit.py +++ b/scripts/qapi_visit.py @@ -179,13 +179,16 @@ visit_end_optional(m, &err); ''') return ret -def generate_visit_struct(name, members): +def generate_visit_struct(name, members, static=False): + ret_type = "void" + if static: + ret_type = "static " + ret_type ret = mcgen(''' -void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp) +%(ret_type)s visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp) { ''', - name=name) + name=name, ret_type=ret_type) push_indent() ret += generate_visit_struct_body("", name, members) @@ -196,10 +199,13 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** ''') return ret -def generate_visit_list(name, members): +def generate_visit_list(name, members, static=False): + ret_type = "void" + if static: + ret_type = "static " + ret_type return mcgen(''' -void visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, Error **errp) +%(ret_type)s visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, Error **errp) { GenericList *i, **prev = (GenericList **)obj; Error *err = NULL; @@ -221,19 +227,22 @@ void visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, } } ''', - name=name) + name=name, ret_type=ret_type) -def generate_visit_enum(name, members): +def generate_visit_enum(name, members, static=False): + ret_type = "void" + if static: + ret_type = "static " + ret_type return mcgen(''' -void visit_type_%(name)s(Visitor *m, %(name)s * obj, const char *name, Error **errp) +%(ret_type)s visit_type_%(name)s(Visitor *m, %(name)s * obj, const char *name, Error **errp) { visit_type_enum(m, (int *)obj, %(name)s_lookup, "%(name)s", name, errp); } ''', - name=name) + name=name, ret_type=ret_type) -def generate_visit_union(name, members): +def generate_visit_union(name, members, static=False): ret = generate_visit_enum('%sKind' % name, members.keys()) ret += mcgen(''' @@ -290,18 +299,21 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** return ret -def generate_declaration(name, members, genlist=True): +def generate_declaration(name, members, genlist=True, static=False): + ret_type = "void" + if static: + ret_type = "static " + ret_type ret = mcgen(''' -void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp); +%(ret_type)s visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error **errp); ''', - name=name) + name=name, ret_type=ret_type) if genlist: ret += mcgen(''' -void visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, Error **errp); +%(ret_type)s visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, Error **errp); ''', - name=name) + name=name, ret_type=ret_type) return ret @@ -315,12 +327,15 @@ void visit_type_%(name)sList(Visitor *m, %(name)sList ** obj, const char *name, return ret -def generate_decl_enum(name, members, genlist=True): +def generate_decl_enum(name, members, genlist=True, static=False): + ret_type = "void" + if static: + ret_type = "static " + ret_type return mcgen(''' -void visit_type_%(name)s(Visitor *m, %(name)s * obj, const char *name, Error **errp); +%(ret_type)s visit_type_%(name)s(Visitor *m, %(name)s * obj, const char *name, Error **errp); ''', - name=name) + name=name, ret_type=ret_type) def main(argv=[]): try: