{"id":812343,"url":"http://patchwork.ozlabs.org/api/patches/812343/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-27-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-27-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:05:59","name":"[v3,26/50] qapi: add 'if' on union variants","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"46db832bf42c70174b2a4fe7d67f8900a4ca5fe5","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-27-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/812343/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812343/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-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.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 3xrQg26KDGz9sBd\n\tfor ;\n\tMon, 11 Sep 2017 21:29:02 +1000 (AEST)","from localhost ([::1]:56836 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drMtg-0007o3-TV\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:29:00 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43279)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMZ4-0005wu-Kh\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 1drMYy-0006kF-DL\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:42 -0400","from mx1.redhat.com ([209.132.183.28]:55252)\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-0006im-5l\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:36 -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 501B615AD79;\n\tMon, 11 Sep 2017 11:07:35 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 0F39A6EC83;\n\tMon, 11 Sep 2017 11:07:32 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 501B615AD79","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:05:59 +0200","Message-Id":"<20170911110623.24981-27-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.26]);\n\tMon, 11 Sep 2017 11:07:35 +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 26/50] qapi: add 'if' on union variants","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.py | 15 ++++++++++-----\n tests/qapi-schema/qapi-schema-test.json | 7 ++++++-\n tests/qapi-schema/qapi-schema-test.out | 8 ++++++++\n tests/qapi-schema/test-qapi.py | 5 ++++-\n 4 files changed, 28 insertions(+), 7 deletions(-)","diff":"diff --git a/scripts/qapi.py b/scripts/qapi.py\nindex 15711f96fa..2f14edfa1f 100644\n--- a/scripts/qapi.py\n+++ b/scripts/qapi.py\n@@ -1412,8 +1412,8 @@ class QAPISchemaObjectTypeVariants(object):\n class QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember):\n role = 'branch'\n \n- def __init__(self, name, typ):\n- QAPISchemaObjectTypeMember.__init__(self, name, typ, False)\n+ def __init__(self, name, typ, ifcond=None):\n+ QAPISchemaObjectTypeMember.__init__(self, name, typ, False, ifcond)\n \n \n class QAPISchemaAlternateType(QAPISchemaType):\n@@ -1674,13 +1674,18 @@ class QAPISchema(object):\n return QAPISchemaObjectTypeVariant(case, typ)\n \n def _make_simple_variant(self, case, typ, info):\n+ ifcond = None\n+ if isinstance(typ, dict):\n+ check_unknown_keys(info, typ, {'type', 'if'})\n+ ifcond = typ.get('if')\n+ typ = typ['type']\n if isinstance(typ, list):\n assert len(typ) == 1\n typ = self._make_array_type(typ[0], info)\n typ = self._make_implicit_object_type(\n typ, info, None, self.lookup_type(typ).ifcond,\n 'wrapper', [self._make_member('data', typ, info)])\n- return QAPISchemaObjectTypeVariant(case, typ)\n+ return QAPISchemaObjectTypeVariant(case, typ, ifcond)\n \n def _def_union_type(self, expr, info, doc):\n name = expr['union']\n@@ -1700,8 +1705,8 @@ class QAPISchema(object):\n else:\n variants = [self._make_simple_variant(key, value, info)\n for (key, value) in data.iteritems()]\n- typ = self._make_implicit_enum_type(name, info, ifcond,\n- [v.name for v in variants])\n+ values = [{'name': v.name, 'if': v.ifcond} for v in variants]\n+ typ = self._make_implicit_enum_type(name, info, ifcond, values)\n tag_member = QAPISchemaObjectTypeMember('type', typ, False)\n members = [tag_member]\n self._def_entity(\ndiff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json\nindex 5cfccabb3d..895e80a978 100644\n--- a/tests/qapi-schema/qapi-schema-test.json\n+++ b/tests/qapi-schema/qapi-schema-test.json\n@@ -200,9 +200,14 @@\n [ 'foo', { 'name' : 'bar', 'if': 'defined(TEST_IF_ENUM_BAR)' } ],\n 'if': 'defined(TEST_IF_ENUM)' }\n \n-{ 'union': 'TestIfUnion', 'data': { 'foo': 'TestStruct' },\n+{ 'union': 'TestIfUnion', 'data':\n+ { 'foo': 'TestStruct',\n+ 'union_bar': { 'type': 'str', 'if': 'defined(TEST_IF_UNION_BAR)'} },\n 'if': 'defined(TEST_IF_UNION) && defined(TEST_IF_STRUCT)' }\n \n+{ 'command': 'TestIfUnionCmd', 'data': { 'union_cmd_arg': 'TestIfUnion' },\n+ 'if': 'defined(TEST_IF_UNION)' }\n+\n { 'alternate': 'TestIfAlternate', 'data': { 'foo': 'int', 'bar': 'TestStruct' },\n 'if': 'defined(TEST_IF_ALT) && defined(TEST_IF_STRUCT)' }\n \ndiff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qapi-schema-test.out\nindex 6df4e49c69..ee009c5626 100644\n--- a/tests/qapi-schema/qapi-schema-test.out\n+++ b/tests/qapi-schema/qapi-schema-test.out\n@@ -87,9 +87,14 @@ object TestIfUnion\n member type: TestIfUnionKind optional=False\n tag type\n case foo: q_obj_TestStruct-wrapper\n+ case union_bar: q_obj_str-wrapper if=defined(TEST_IF_UNION_BAR)\n if defined(TEST_IF_UNION) && defined(TEST_IF_STRUCT)\n+command TestIfUnionCmd q_obj_TestIfUnionCmd-arg -> None\n+ gen=True success_response=True boxed=False\n+ if defined(TEST_IF_UNION)\n enum TestIfUnionKind\n member foo:\n+ member union_bar: if=defined(TEST_IF_UNION_BAR)\n if defined(TEST_IF_UNION) && defined(TEST_IF_STRUCT)\n object TestStruct\n member integer: int optional=False\n@@ -235,6 +240,9 @@ object q_obj_TestIfEvent-arg\n member foo: TestIfStruct optional=False\n member bar: TestIfEnum optional=False if=defined(TEST_IF_EVT_BAR)\n if defined(TEST_IF_EVT) && defined(TEST_IF_STRUCT)\n+object q_obj_TestIfUnionCmd-arg\n+ member union_cmd_arg: TestIfUnion optional=False\n+ if defined(TEST_IF_UNION)\n object q_obj_TestStruct-wrapper\n member data: TestStruct optional=False\n object q_obj_UserDefFlatUnion2-base\ndiff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py\nindex a86c3b5ee1..87a8efff78 100644\n--- a/tests/qapi-schema/test-qapi.py\n+++ b/tests/qapi-schema/test-qapi.py\n@@ -65,7 +65,10 @@ class QAPISchemaTestVisitor(QAPISchemaVisitor):\n if variants:\n print ' tag %s' % variants.tag_member.name\n for v in variants.variants:\n- print ' case %s: %s' % (v.name, v.type.name)\n+ print ' case %s: %s' % (v.name, v.type.name),\n+ if v.ifcond:\n+ print 'if=%s' % v.ifcond,\n+ print\n \n @staticmethod\n def _print_if(ifcond):\n","prefixes":["v3","26/50"]}