From patchwork Fri Sep 21 14:07:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 185811 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 8BDD62C0079 for ; Sat, 22 Sep 2012 02:07:09 +1000 (EST) Received: from localhost ([::1]:35638 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF3ur-0002Y9-P0 for incoming@patchwork.ozlabs.org; Fri, 21 Sep 2012 10:09:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF3u5-00013D-Ea for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF3tw-0007EQ-7v for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:25 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:34534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF3tw-0007Cw-3e for qemu-devel@nongnu.org; Fri, 21 Sep 2012 10:08:16 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so990551iea.4 for ; Fri, 21 Sep 2012 07:08:16 -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=9lrJIqopE/cEjoqTgTRDMFAN96Veutl2yZSSHYH9v+I=; b=A0FGjLQ0R40gbKKLioOXWXdZfW+HSM1nDss3ArQfUEQQayBMFJ2QMn8NUMqiuiZTBn 7iAAzBuGhNEmybsK9LmILowTj3sBUtYJU6JMaRjWfX10m56LxQeC1J7clZEdSBXXZ31X kngnT3KCrsab9rXXl9no1DYiM8aVstMKOjwnhF8ivvHiDrJbGXa5BBhFJ+ek4pny1UdT 7dGoZ6wD20h78My7L0uOj4Kf3874Rol4NUOYm8JKiS6VdnRciqxx1blShIk0FFhkNb0u dfo4ehtHHcJUMMB6MRTiJ6t8JzqiCUS/ZClGiYoqEuOoA79oRMCCabJ0r8ekZjcviUos LEMA== Received: by 10.50.47.234 with SMTP id g10mr1769547ign.16.1348236495909; Fri, 21 Sep 2012 07:08:15 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id ua5sm17301156igb.10.2012.09.21.07.08.14 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Sep 2012 07:08:15 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Fri, 21 Sep 2012 09:07:29 -0500 Message-Id: <1348236465-23124-7-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348236465-23124-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1348236465-23124-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.223.173 Cc: blauwirbel@gmail.com, peter.maydell@linaro.org, aliguori@us.ibm.com, eblake@redhat.com Subject: [Qemu-devel] [PATCH 06/22] 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 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 b3f34a2..af23770 100644 --- a/scripts/qapi_visit.py +++ b/scripts/qapi_visit.py @@ -141,13 +141,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) @@ -158,10 +161,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; @@ -183,19 +189,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(''' @@ -252,18 +261,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 @@ -277,12 +289,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: