{"id":812337,"url":"http://patchwork.ozlabs.org/api/patches/812337/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-17-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170911110623.24981-17-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:05:49","name":"[v3,16/50] qapi-types: add #if conditions to types & visitors","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f38eed6f70e4afeaa0d39bd2b6c353ff6a2ee4e9","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-17-marcandre.lureau@redhat.com/mbox/","series":[{"id":2480,"url":"http://patchwork.ozlabs.org/api/series/2480/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2480","date":"2017-09-11T11:05:33","name":"Hi,","version":3,"mbox":"http://patchwork.ozlabs.org/series/2480/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812337/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812337/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcandre.lureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrQYK1LS2z9sBd\n\tfor ;\n\tMon, 11 Sep 2017 21:24:05 +1000 (AEST)","from localhost ([::1]:56813 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drMot-0002js-3m\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:24:03 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43012)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMYg-0005XY-9c\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:19 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMYa-0006NE-6n\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:18 -0400","from mx1.redhat.com ([209.132.183.28]:29830)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1drMYZ-0006MZ-Ui\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:12 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 0C0E72E2151;\n\tMon, 11 Sep 2017 11:07:11 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 8DE46649CC;\n\tMon, 11 Sep 2017 11:07:10 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0C0E72E2151","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:05:49 +0200","Message-Id":"<20170911110623.24981-17-marcandre.lureau@redhat.com>","In-Reply-To":"<20170911110623.24981-1-marcandre.lureau@redhat.com>","References":"<20170911110623.24981-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tMon, 11 Sep 2017 11:07:11 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v3 16/50] qapi-types: add #if conditions to\n\ttypes & visitors","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\tarmbru@redhat.com, Michael Roth ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Types & visitors are coupled and must be handled together to avoid\ntemporary build regression.\n\nWrap generated types/visitor code with #if/#endif using the\nifcond_decorator & helpers.\n\nSigned-off-by: Marc-André Lureau \n---\n scripts/qapi-types.py | 18 ++++++++++++++----\n scripts/qapi-visit.py | 5 +++++\n 2 files changed, 19 insertions(+), 4 deletions(-)","diff":"diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py\nindex 2b3588267b..789e89ff59 100644\n--- a/scripts/qapi-types.py\n+++ b/scripts/qapi-types.py\n@@ -59,8 +59,10 @@ def gen_variants_objects(variants):\n for v in variants.variants:\n if isinstance(v.type, QAPISchemaObjectType):\n ret += gen_variants_objects(v.type.variants)\n+ ret += gen_if(v.type.ifcond)\n ret += gen_object(v.type.name, v.type.base,\n v.type.local_members, v.type.variants)\n+ ret += gen_endif(v.type.ifcond)\n return ret\n \n \n@@ -175,6 +177,7 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor):\n self.defn = None\n self._fwdecl = None\n self._btin = None\n+ self.if_members = ['decl', 'defn', '_fwdecl', '_btin']\n \n def visit_begin(self, schema):\n # gen_object() is recursive, ensure it doesn't visit the empty type\n@@ -199,6 +202,7 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor):\n self.decl += gen_type_cleanup_decl(name)\n self.defn += gen_type_cleanup(name)\n \n+ @ifcond_decorator\n def visit_enum_type(self, name, info, ifcond, values, prefix):\n # Special case for our lone builtin enum type\n # TODO use something cleaner than existence of info\n@@ -210,6 +214,7 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor):\n self._fwdecl += gen_enum(name, values, prefix)\n self.defn += gen_enum_lookup(name, values, prefix)\n \n+ @ifcond_decorator\n def visit_array_type(self, name, info, ifcond, element_type):\n if isinstance(element_type, QAPISchemaBuiltinType):\n self._btin += gen_fwd_object_or_array(name)\n@@ -222,6 +227,7 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor):\n self.decl += gen_array(name, element_type)\n self._gen_type_cleanup(name)\n \n+ @ifcond_decorator\n def _gen_object(self, name, info, ifcond, base, members, variants):\n self.decl += gen_object(name, base, members, variants)\n if base and not base.is_implicit():\n@@ -232,18 +238,22 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor):\n # implicit types won't be directly allocated/freed\n self._gen_type_cleanup(name)\n \n+ @ifcond_decorator\n+ def _gen_fwd_object_or_array(self, name, ifcond):\n+ self._fwdecl += gen_fwd_object_or_array(name)\n+\n def visit_object_type(self, name, info, ifcond, base, members, variants):\n # Nothing to do for the special empty builtin\n if name == 'q_empty':\n return\n- self._fwdecl += gen_fwd_object_or_array(name)\n+ self._gen_fwd_object_or_array(name, ifcond)\n self.decl += gen_variants_objects(variants)\n- self._gen_object(name, info, None, base, members, variants)\n+ self._gen_object(name, info, ifcond, base, members, variants)\n \n def visit_alternate_type(self, name, info, ifcond, variants):\n- self._fwdecl += gen_fwd_object_or_array(name)\n+ self._gen_fwd_object_or_array(name, ifcond)\n self.decl += gen_variants_objects(variants)\n- self._gen_object(name, info, None, None,\n+ self._gen_object(name, info, ifcond, None,\n [variants.tag_member], variants)\n \n # If you link code generated from multiple schemata, you want only one\ndiff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py\nindex aceea2a9f9..4b0e005437 100644\n--- a/scripts/qapi-visit.py\n+++ b/scripts/qapi-visit.py\n@@ -267,6 +267,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaVisitor):\n self.decl = None\n self.defn = None\n self._btin = None\n+ self.if_members = ['decl', 'defn', '_btin']\n \n def visit_begin(self, schema):\n self.decl = ''\n@@ -282,6 +283,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaVisitor):\n self.decl = self._btin + self.decl\n self._btin = None\n \n+ @ifcond_decorator\n def visit_enum_type(self, name, info, ifcond, values, prefix):\n # Special case for our lone builtin enum type\n # TODO use something cleaner than existence of info\n@@ -293,6 +295,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaVisitor):\n self.decl += gen_visit_decl(name, scalar=True)\n self.defn += gen_visit_enum(name)\n \n+ @ifcond_decorator\n def visit_array_type(self, name, info, ifcond, element_type):\n decl = gen_visit_decl(name)\n defn = gen_visit_list(name, element_type)\n@@ -304,6 +307,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaVisitor):\n self.decl += decl\n self.defn += defn\n \n+ @ifcond_decorator\n def visit_object_type(self, name, info, ifcond, base, members, variants):\n # Nothing to do for the special empty builtin\n if name == 'q_empty':\n@@ -317,6 +321,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaVisitor):\n self.decl += gen_visit_decl(name)\n self.defn += gen_visit_object(name, base, members, variants)\n \n+ @ifcond_decorator\n def visit_alternate_type(self, name, info, ifcond, variants):\n self.decl += gen_visit_decl(name)\n self.defn += gen_visit_alternate(name, variants)\n","prefixes":["v3","16/50"]}