{"id":812339,"url":"http://patchwork.ozlabs.org/api/patches/812339/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-24-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-24-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:05:56","name":"[v3,23/50] qapi: add 'if' to struct members and implicit objects members","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"212e0fbd6f5b7844b390ee28855eb2c91c1c06bd","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-24-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/812339/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812339/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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3xrQc81f2Xz9sBd\n\tfor ;\n\tMon, 11 Sep 2017 21:26:31 +1000 (AEST)","from localhost ([::1]:56825 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drMrF-0005EP-Hk\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:26:29 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43133)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMYo-0005e2-G9\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:32 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMYn-0006Z2-Ay\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:26 -0400","from mx1.redhat.com ([209.132.183.28]:39654)\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 1drMYn-0006YV-2u\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:07:25 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 3F6ADC0A5242;\n\tMon, 11 Sep 2017 11:07:24 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C979660A98;\n\tMon, 11 Sep 2017 11:07:23 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 3F6ADC0A5242","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:05:56 +0200","Message-Id":"<20170911110623.24981-24-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.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tMon, 11 Sep 2017 11:07:24 +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 23/50] qapi: add 'if' to struct members and\n\timplicit objects 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":"check_type() will now accept a DICT { 'type': TYPENAME, 'if': ... }\ninstead of a TYPENAME. This is the case in various situations where\nimplicit object types are allowed such as commands/events arguments\nand return type, base and branches of union & alternate.\n\nSigned-off-by: Marc-André Lureau \n---\n scripts/qapi.py | 20 ++++++++++++++++----\n tests/qapi-schema/qapi-schema-test.json | 12 +++++++++---\n tests/qapi-schema/qapi-schema-test.out | 4 +++-\n 3 files changed, 28 insertions(+), 8 deletions(-)","diff":"diff --git a/scripts/qapi.py b/scripts/qapi.py\nindex df2a304e8f..15711f96fa 100644\n--- a/scripts/qapi.py\n+++ b/scripts/qapi.py\n@@ -696,7 +696,15 @@ def check_type(info, source, value, allow_array=False,\n return\n \n if not allow_dict:\n- raise QAPISemError(info, \"%s should be a type name\" % source)\n+ if isinstance(value, dict) and 'type' in value:\n+ check_type(info, source, value['type'], allow_array,\n+ allow_dict, allow_optional, allow_metas)\n+ if 'if' in value:\n+ check_if(value, info)\n+ check_unknown_keys(info, value, {'type', 'if'})\n+ return\n+ else:\n+ raise QAPISemError(info, \"%s should be a type name\" % source)\n \n if not isinstance(value, OrderedDict):\n raise QAPISemError(info,\n@@ -1345,8 +1353,8 @@ class QAPISchemaMember(object):\n \n \n class QAPISchemaObjectTypeMember(QAPISchemaMember):\n- def __init__(self, name, typ, optional):\n- QAPISchemaMember.__init__(self, name)\n+ def __init__(self, name, typ, optional, ifcond=None):\n+ QAPISchemaMember.__init__(self, name, ifcond)\n assert isinstance(typ, str)\n assert isinstance(optional, bool)\n self._type_name = typ\n@@ -1637,13 +1645,17 @@ class QAPISchema(object):\n \n def _make_member(self, name, typ, info):\n optional = False\n+ ifcond = None\n if name.startswith('*'):\n name = name[1:]\n optional = True\n+ if isinstance(typ, dict):\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- return QAPISchemaObjectTypeMember(name, typ, optional)\n+ return QAPISchemaObjectTypeMember(name, typ, optional, ifcond)\n \n def _make_members(self, data, info):\n return [self._make_member(key, value, info)\ndiff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json\nindex ad2b405d83..5cfccabb3d 100644\n--- a/tests/qapi-schema/qapi-schema-test.json\n+++ b/tests/qapi-schema/qapi-schema-test.json\n@@ -191,7 +191,9 @@\n \n # test 'if' condition handling\n \n-{ 'struct': 'TestIfStruct', 'data': { 'foo': 'int' },\n+{ 'struct': 'TestIfStruct', 'data':\n+ { 'foo': 'int',\n+ 'bar': { 'type': 'int', 'if': 'defined(TEST_IF_STRUCT_BAR)'} },\n 'if': 'defined(TEST_IF_STRUCT)' }\n \n { 'enum': 'TestIfEnum', 'data':\n@@ -204,8 +206,12 @@\n { 'alternate': 'TestIfAlternate', 'data': { 'foo': 'int', 'bar': 'TestStruct' },\n 'if': 'defined(TEST_IF_ALT) && defined(TEST_IF_STRUCT)' }\n \n-{ 'command': 'TestIfCmd', 'data': { 'foo': 'TestIfStruct', 'bar': 'TestIfEnum' },\n+{ 'command': 'TestIfCmd', 'data':\n+ { 'foo': 'TestIfStruct',\n+ 'bar': { 'type': 'TestIfEnum', 'if': 'defined(TEST_IF_CMD_BAR)' } },\n 'if': 'defined(TEST_IF_CMD) && defined(TEST_IF_STRUCT)' }\n \n-{ 'event': 'TestIfEvent', 'data': { 'foo': 'TestIfStruct' },\n+{ 'event': 'TestIfEvent', 'data':\n+ { 'foo': 'TestIfStruct',\n+ 'bar': { 'type': 'TestIfEnum', 'if': 'defined(TEST_IF_EVT_BAR)' } },\n 'if': 'defined(TEST_IF_EVT) && defined(TEST_IF_STRUCT)' }\ndiff --git a/tests/qapi-schema/qapi-schema-test.out b/tests/qapi-schema/qapi-schema-test.out\nindex 8a0cf1a551..6df4e49c69 100644\n--- a/tests/qapi-schema/qapi-schema-test.out\n+++ b/tests/qapi-schema/qapi-schema-test.out\n@@ -81,6 +81,7 @@ event TestIfEvent q_obj_TestIfEvent-arg\n if defined(TEST_IF_EVT) && defined(TEST_IF_STRUCT)\n object TestIfStruct\n member foo: int optional=False\n+ member bar: int optional=False if=defined(TEST_IF_STRUCT_BAR)\n if defined(TEST_IF_STRUCT)\n object TestIfUnion\n member type: TestIfUnionKind optional=False\n@@ -228,10 +229,11 @@ object q_obj_EVENT_D-arg\n member enum3: EnumOne optional=True\n object q_obj_TestIfCmd-arg\n member foo: TestIfStruct optional=False\n- member bar: TestIfEnum optional=False\n+ member bar: TestIfEnum optional=False if=defined(TEST_IF_CMD_BAR)\n if defined(TEST_IF_CMD) && defined(TEST_IF_STRUCT)\n 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_TestStruct-wrapper\n member data: TestStruct optional=False\n","prefixes":["v3","23/50"]}