{"id":812352,"url":"http://patchwork.ozlabs.org/api/patches/812352/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-28-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-28-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:06:00","name":"[v3,27/50] qapi: add #if conditions to generated variants","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"cf4f4e1ebba3b4065553f708dee11d798ef8c7c1","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-28-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/812352/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812352/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 3xrQq20KWJz9sBd\n\tfor ;\n\tMon, 11 Sep 2017 21:35:58 +1000 (AEST)","from localhost ([::1]:56871 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drN0O-0005C9-3d\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:35:56 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43339)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMZ8-0005zy-4c\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:47 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMZ2-0006mc-43\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:46 -0400","from mx1.redhat.com ([209.132.183.28]:32974)\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 1drMZ1-0006m5-Sd\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:40 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 0A7752E2151;\n\tMon, 11 Sep 2017 11:07:39 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 8705D4DA7C;\n\tMon, 11 Sep 2017 11:07:36 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0A7752E2151","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:06:00 +0200","Message-Id":"<20170911110623.24981-28-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.16","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:39 +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 27/50] qapi: add #if conditions to generated\n\tvariants","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 | 3 ++-\n scripts/qapi-types.py | 2 ++\n scripts/qapi-visit.py | 4 ++++\n 3 files changed, 8 insertions(+), 1 deletion(-)","diff":"diff --git a/scripts/qapi-introspect.py b/scripts/qapi-introspect.py\nindex 0e43e470bb..ef2d5577db 100644\n--- a/scripts/qapi-introspect.py\n+++ b/scripts/qapi-introspect.py\n@@ -148,7 +148,8 @@ const QLitObject %(c_name)s = %(c_string)s;\n 'variants': [self._gen_variant(v) for v in variants]}\n \n def _gen_variant(self, variant):\n- return {'case': variant.name, 'type': self._use_type(variant.type)}\n+ return ({'case': variant.name, 'type': self._use_type(variant.type)},\n+ variant.ifcond)\n \n def visit_builtin_type(self, name, info, json_type):\n self._gen_qlit(name, 'builtin', {'json-type': json_type}, None)\ndiff --git a/scripts/qapi-types.py b/scripts/qapi-types.py\nindex 7e6df21f53..312685c295 100644\n--- a/scripts/qapi-types.py\n+++ b/scripts/qapi-types.py\n@@ -131,11 +131,13 @@ def gen_variants(variants):\n c_name=c_name(variants.tag_member.name))\n \n for var in variants.variants:\n+ ret += gen_if(var.ifcond)\n ret += mcgen('''\n %(c_type)s %(c_name)s;\n ''',\n c_type=var.type.c_unboxed_type(),\n c_name=c_name(var.name))\n+ ret += gen_endif(var.ifcond)\n \n ret += mcgen('''\n } u;\ndiff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py\nindex 6a3a52e39d..369e1f927d 100644\n--- a/scripts/qapi-visit.py\n+++ b/scripts/qapi-visit.py\n@@ -82,6 +82,7 @@ void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp)\n c_name=c_name(variants.tag_member.name))\n \n for var in variants.variants:\n+ ret += gen_if(var.ifcond)\n ret += mcgen('''\n case %(case)s:\n visit_type_%(c_type)s_members(v, &obj->u.%(c_name)s, &err);\n@@ -92,6 +93,7 @@ void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp)\n variants.tag_member.type.prefix),\n c_type=var.type.c_name(), c_name=c_name(var.name))\n \n+ ret += gen_endif(var.ifcond)\n ret += mcgen('''\n default:\n abort();\n@@ -182,6 +184,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error\n c_name=c_name(name))\n \n for var in variants.variants:\n+ ret += gen_if(var.ifcond)\n ret += mcgen('''\n case %(case)s:\n ''',\n@@ -209,6 +212,7 @@ void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error\n ret += mcgen('''\n break;\n ''')\n+ ret += gen_endif(var.ifcond)\n \n ret += mcgen('''\n case QTYPE_NONE:\n","prefixes":["v3","27/50"]}