{"id":812349,"url":"http://patchwork.ozlabs.org/api/patches/812349/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-26-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-26-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:05:58","name":"[v3,25/50] qapi: add #if conditions to generated struct members","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c2b9cd10b8f7975d3ca08a17c90802c3b30b381c","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-26-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/812349/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812349/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 3xrQlm1nBQz9sBd\n\tfor ;\n\tMon, 11 Sep 2017 21:33:08 +1000 (AEST)","from localhost ([::1]:56855 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drMxe-0002r5-8N\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:33:06 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43219)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMYy-0005r6-Rd\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:37 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMYu-0006hV-T5\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:36 -0400","from mx1.redhat.com ([209.132.183.28]:48558)\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 1drMYu-0006h5-Ne\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:32 -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 DA97A230762;\n\tMon, 11 Sep 2017 11:07:31 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id EC6E36AD36;\n\tMon, 11 Sep 2017 11:07:28 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com DA97A230762","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:05:58 +0200","Message-Id":"<20170911110623.24981-26-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:32 +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 25/50] qapi: add #if conditions to generated\n\tstruct members","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":"Signed-off-by: Marc-André Lureau \n---\n scripts/qapi-introspect.py | 2 ++\n scripts/qapi-types.py | 2 ++\n scripts/qapi-visit.py | 2 ++\n 3 files changed, 6 insertions(+)","diff":"diff --git a/scripts/qapi-introspect.py b/scripts/qapi-introspect.py\nindex 32a58cf879..0e43e470bb 100644\n--- a/scripts/qapi-introspect.py\n+++ b/scripts/qapi-introspect.py\n@@ -139,6 +139,8 @@ const QLitObject %(c_name)s = %(c_string)s;\n ret = {'name': member.name, 'type': self._use_type(member.type)}\n if member.optional:\n ret['default'] = None\n+ if member.ifcond:\n+ ret = (ret, member.ifcond)\n return ret\n \n def _gen_variants(self, tag_name, variants):\ndiff --git a/scripts/qapi-types.py b/scripts/qapi-types.py\nindex 75c1823e44..7e6df21f53 100644\n--- a/scripts/qapi-types.py\n+++ b/scripts/qapi-types.py\n@@ -41,6 +41,7 @@ struct %(c_name)s {\n def gen_struct_members(members):\n ret = ''\n for memb in members:\n+ ret += gen_if(memb.ifcond)\n if memb.optional:\n ret += mcgen('''\n bool has_%(c_name)s;\n@@ -50,6 +51,7 @@ def gen_struct_members(members):\n %(c_type)s %(c_name)s;\n ''',\n c_type=memb.type.c_type(), c_name=c_name(memb.name))\n+ ret += gen_endif(memb.ifcond)\n return ret\n \n \ndiff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py\nindex 7e816ae98e..6a3a52e39d 100644\n--- a/scripts/qapi-visit.py\n+++ b/scripts/qapi-visit.py\n@@ -53,6 +53,7 @@ void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp)\n c_type=base.c_name())\n \n for memb in members:\n+ ret += gen_if(memb.ifcond)\n if memb.optional:\n ret += mcgen('''\n if (visit_optional(v, \"%(name)s\", &obj->has_%(c_name)s)) {\n@@ -72,6 +73,7 @@ void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp)\n ret += mcgen('''\n }\n ''')\n+ ret += gen_endif(memb.ifcond)\n \n if variants:\n ret += mcgen('''\n","prefixes":["v3","25/50"]}