{"id":812322,"url":"http://patchwork.ozlabs.org/api/patches/812322/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-13-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-13-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:05:45","name":"[v3,12/50] qapi-introspect: add preprocessor conditions to generated QLit","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2e42e04d5250f778d834db8de0b390b046951b58","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-13-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/812322/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812322/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-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.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 3xrQMP1Sg0z9s7G\n\tfor ;\n\tMon, 11 Sep 2017 21:15:24 +1000 (AEST)","from localhost ([::1]:56773 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drMgU-0003lj-7I\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:15:22 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42888)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMYV-0005HT-5s\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:08 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMYP-0006EE-49\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:07 -0400","from mx1.redhat.com ([209.132.183.28]:36478)\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 1drMYO-0006D3-Rt\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:01 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 EC29D13D08D;\n\tMon, 11 Sep 2017 11:06:59 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id AF3556EC9D;\n\tMon, 11 Sep 2017 11:06:57 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com EC29D13D08D","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:05:45 +0200","Message-Id":"<20170911110623.24981-13-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.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tMon, 11 Sep 2017 11:07:00 +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 12/50] qapi-introspect: add preprocessor\n\tconditions to generated QLit","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":"Add 'ifcond' condition to top-level QLit objects.\n\nto_qlit() handles the (obj, ifcond) tuples in previous patch.\n\nSigned-off-by: Marc-André Lureau \n---\n scripts/qapi-introspect.py | 20 +++++++++++---------\n 1 file changed, 11 insertions(+), 9 deletions(-)","diff":"diff --git a/scripts/qapi-introspect.py b/scripts/qapi-introspect.py\nindex dc70954e8a..69d9afc792 100644\n--- a/scripts/qapi-introspect.py\n+++ b/scripts/qapi-introspect.py\n@@ -128,12 +128,12 @@ const QLitObject %(c_name)s = %(c_string)s;\n return '[' + self._use_type(typ.element_type) + ']'\n return self._name(typ.name)\n \n- def _gen_qlit(self, name, mtype, obj):\n+ def _gen_qlit(self, name, mtype, obj, ifcond):\n if mtype not in ('command', 'event', 'builtin', 'array'):\n name = self._name(name)\n obj['name'] = name\n obj['meta-type'] = mtype\n- self._qlits.append(obj)\n+ self._qlits.append((obj, ifcond))\n \n def _gen_member(self, member):\n ret = {'name': member.name, 'type': self._use_type(member.type)}\n@@ -149,26 +149,27 @@ const QLitObject %(c_name)s = %(c_string)s;\n return {'case': variant.name, 'type': self._use_type(variant.type)}\n \n def visit_builtin_type(self, name, info, json_type):\n- self._gen_qlit(name, 'builtin', {'json-type': json_type})\n+ self._gen_qlit(name, 'builtin', {'json-type': json_type}, None)\n \n def visit_enum_type(self, name, info, ifcond, values, prefix):\n- self._gen_qlit(name, 'enum', {'values': values})\n+ self._gen_qlit(name, 'enum', {'values': values}, ifcond)\n \n def visit_array_type(self, name, info, ifcond, element_type):\n element = self._use_type(element_type)\n- self._gen_qlit('[' + element + ']', 'array', {'element-type': element})\n+ self._gen_qlit('[' + element + ']', 'array', {'element-type': element},\n+ ifcond)\n \n def visit_object_type_flat(self, name, info, ifcond, members, variants):\n obj = {'members': [self._gen_member(m) for m in members]}\n if variants:\n obj.update(self._gen_variants(variants.tag_member.name,\n variants.variants))\n- self._gen_qlit(name, 'object', obj)\n+ self._gen_qlit(name, 'object', obj, ifcond)\n \n def visit_alternate_type(self, name, info, ifcond, variants):\n self._gen_qlit(name, 'alternate',\n {'members': [{'type': self._use_type(m.type)}\n- for m in variants.variants]})\n+ for m in variants.variants]}, ifcond)\n \n def visit_command(self, name, info, ifcond, arg_type, ret_type,\n gen, success_response, boxed):\n@@ -176,11 +177,12 @@ const QLitObject %(c_name)s = %(c_string)s;\n ret_type = ret_type or self._schema.the_empty_object_type\n self._gen_qlit(name, 'command',\n {'arg-type': self._use_type(arg_type),\n- 'ret-type': self._use_type(ret_type)})\n+ 'ret-type': self._use_type(ret_type)}, ifcond)\n \n def visit_event(self, name, info, ifcond, arg_type, boxed):\n arg_type = arg_type or self._schema.the_empty_object_type\n- self._gen_qlit(name, 'event', {'arg-type': self._use_type(arg_type)})\n+ self._gen_qlit(name, 'event', {'arg-type': self._use_type(arg_type)},\n+ ifcond)\n \n # Debugging aid: unmask QAPI schema's type names\n # We normally mask them, because they're not QMP wire ABI\n","prefixes":["v3","12/50"]}