{"id":812327,"url":"http://patchwork.ozlabs.org/api/patches/812327/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-16-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-16-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:05:48","name":"[v3,15/50] qapi-types: refactor variants handling","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"99b5b9b2d7bcc0751cee169bbcfdda4a3184966f","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-16-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/812327/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812327/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-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.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 3xrQQT2WTxz9s7G\n\tfor ;\n\tMon, 11 Sep 2017 21:18:09 +1000 (AEST)","from localhost ([::1]:56787 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drMj9-0006Bo-Bs\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:18:07 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42988)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMYe-0005UL-H0\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:20 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMYY-0006M7-Ok\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:16 -0400","from mx1.redhat.com ([209.132.183.28]:47940)\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 1drMYY-0006Lc-Gy\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:10 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 68B141908F9;\n\tMon, 11 Sep 2017 11:07:09 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 3298A6AD36;\n\tMon, 11 Sep 2017 11:07:07 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 68B141908F9","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:05:48 +0200","Message-Id":"<20170911110623.24981-16-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.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tMon, 11 Sep 2017 11:07:09 +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 15/50] qapi-types: refactor variants handling","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":"Generate variants objects outside gen_object(). This will allow to\neasily wrap gen_object() with ifcond_decorator in the following patch.\n\nSigned-off-by: Marc-André Lureau \n---\n scripts/qapi-types.py | 37 +++++++++++++++++++++++--------------\n 1 file changed, 23 insertions(+), 14 deletions(-)","diff":"diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py\nindex 915786c463..2b3588267b 100644\n--- a/scripts/qapi-types.py\n+++ b/scripts/qapi-types.py\n@@ -53,23 +53,27 @@ def gen_struct_members(members):\n return ret\n \n \n-def gen_object(name, base, members, variants):\n- if name in objects_seen:\n- return ''\n- objects_seen.add(name)\n-\n+def gen_variants_objects(variants):\n ret = ''\n if variants:\n for v in variants.variants:\n if isinstance(v.type, QAPISchemaObjectType):\n+ ret += gen_variants_objects(v.type.variants)\n ret += gen_object(v.type.name, v.type.base,\n v.type.local_members, v.type.variants)\n+ return ret\n \n- ret += mcgen('''\n+\n+def gen_object(name, base, members, variants):\n+ if name in objects_seen:\n+ return ''\n+ objects_seen.add(name)\n+\n+ ret = mcgen('''\n \n struct %(c_name)s {\n ''',\n- c_name=c_name(name))\n+ c_name=c_name(name))\n \n if base:\n if not base.is_implicit():\n@@ -218,11 +222,7 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor):\n self.decl += gen_array(name, element_type)\n self._gen_type_cleanup(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+ 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 self.decl += gen_upcast(name, base)\n@@ -232,10 +232,19 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor):\n # implicit types won't be directly allocated/freed\n self._gen_type_cleanup(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.decl += gen_variants_objects(variants)\n+ self._gen_object(name, info, None, 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.decl += gen_object(name, None, [variants.tag_member], variants)\n- self._gen_type_cleanup(name)\n+ self.decl += gen_variants_objects(variants)\n+ self._gen_object(name, info, None, None,\n+ [variants.tag_member], variants)\n \n # If you link code generated from multiple schemata, you want only one\n # instance of the code for built-in types. Generate it only when\n","prefixes":["v3","15/50"]}