{"id":812318,"url":"http://patchwork.ozlabs.org/api/patches/812318/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-5-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-5-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:05:37","name":"[v3,04/50] qapi: add 'if' to top-level expressions","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0bf2ae0b0b74688d9f9069f6866eda1b8a6a1add","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-5-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/812318/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812318/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 3xrQJK3B1Yz9s7G\n\tfor ;\n\tMon, 11 Sep 2017 21:12:49 +1000 (AEST)","from localhost ([::1]:56763 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drMdy-0001Ig-L6\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:12:46 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42661)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMYA-0004xP-FD\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:06:48 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMY4-00062V-4G\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:06:46 -0400","from mx1.redhat.com ([209.132.183.28]:38354)\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 1drMY3-00061t-Ry\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:06: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 F1958C0A5248;\n\tMon, 11 Sep 2017 11:06:38 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 535F05C54A;\n\tMon, 11 Sep 2017 11:06:36 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com F1958C0A5248","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:05:37 +0200","Message-Id":"<20170911110623.24981-5-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.31]);\n\tMon, 11 Sep 2017 11:06: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 04/50] qapi: add 'if' to top-level\n\texpressions","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":"Accept 'if' key in top-level elements, accepted as string or list of\nstring type. The following patches will modify the test visitor to\ncheck the value is correctly saved, and generate #if/#endif code (as a\nsingle #if/endif line or a series for a list).\n\nExample of 'if' key:\n{ 'struct': 'TestIfStruct', 'data': { 'foo': 'int' },\n 'if': 'defined(TEST_IF_STRUCT)' }\n\nThe generated code is for now *unconditional*. Later patches generate\nthe conditionals.\n\nA following patch for qapi-code-gen.txt will provide more complete\ndocumentation for 'if' usage.\n\nSigned-off-by: Marc-André Lureau \n---\n scripts/qapi.py | 35 +++++++++++++++++++++++++++------\n tests/test-qmp-commands.c | 6 ++++++\n tests/qapi-schema/qapi-schema-test.json | 20 +++++++++++++++++++\n tests/qapi-schema/qapi-schema-test.out | 22 +++++++++++++++++++++\n 4 files changed, 77 insertions(+), 6 deletions(-)","diff":"diff --git a/scripts/qapi.py b/scripts/qapi.py\nindex 62dc52ed6e..20c1abf915 100644\n--- a/scripts/qapi.py\n+++ b/scripts/qapi.py\n@@ -639,6 +639,26 @@ def add_name(name, info, meta, implicit=False):\n all_names[name] = meta\n \n \n+def check_if(expr, info):\n+\n+ def check_if_str(ifcond, info):\n+ if ifcond == '':\n+ raise QAPISemError(info, \"'if' condition '' makes no sense\")\n+\n+ ifcond = expr['if']\n+ if isinstance(ifcond, str):\n+ check_if_str(ifcond, info)\n+ elif (isinstance(ifcond, list)\n+ and all(isinstance(elt, str) for elt in ifcond)):\n+ if ifcond == []:\n+ raise QAPISemError(info, \"'if' condition [] is useless\")\n+ for elt in ifcond:\n+ check_if_str(elt, info)\n+ else:\n+ raise QAPISemError(\n+ info, \"'if' condition must be a string or a list of strings\")\n+\n+\n def check_type(info, source, value, allow_array=False,\n allow_dict=False, allow_optional=False,\n allow_metas=[]):\n@@ -878,6 +898,8 @@ def check_keys(expr_elem, meta, required, optional=[]):\n raise QAPISemError(info,\n \"'%s' of %s '%s' should only use true value\"\n % (key, meta, name))\n+ if key == 'if':\n+ check_if(expr, info)\n for key in required:\n if key not in expr:\n raise QAPISemError(info, \"Key '%s' is missing from %s '%s'\"\n@@ -903,27 +925,28 @@ def check_exprs(exprs):\n \n if 'enum' in expr:\n meta = 'enum'\n- check_keys(expr_elem, 'enum', ['data'], ['prefix'])\n+ check_keys(expr_elem, 'enum', ['data'], ['if', 'prefix'])\n enum_types[expr[meta]] = expr\n elif 'union' in expr:\n meta = 'union'\n check_keys(expr_elem, 'union', ['data'],\n- ['base', 'discriminator'])\n+ ['base', 'discriminator', 'if'])\n union_types[expr[meta]] = expr\n elif 'alternate' in expr:\n meta = 'alternate'\n- check_keys(expr_elem, 'alternate', ['data'])\n+ check_keys(expr_elem, 'alternate', ['data'], ['if'])\n elif 'struct' in expr:\n meta = 'struct'\n- check_keys(expr_elem, 'struct', ['data'], ['base'])\n+ check_keys(expr_elem, 'struct', ['data'], ['base', 'if'])\n struct_types[expr[meta]] = expr\n elif 'command' in expr:\n meta = 'command'\n check_keys(expr_elem, 'command', [],\n- ['data', 'returns', 'gen', 'success-response', 'boxed'])\n+ ['data', 'returns', 'gen', 'success-response', 'boxed',\n+ 'if'])\n elif 'event' in expr:\n meta = 'event'\n- check_keys(expr_elem, 'event', [], ['data', 'boxed'])\n+ check_keys(expr_elem, 'event', [], ['data', 'boxed', 'if'])\n else:\n raise QAPISemError(expr_elem['info'],\n \"Expression is missing metatype\")\ndiff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c\nindex 904c89d4d4..9b9a7ffee7 100644\n--- a/tests/test-qmp-commands.c\n+++ b/tests/test-qmp-commands.c\n@@ -10,6 +10,12 @@\n \n static QmpCommandList qmp_commands;\n \n+/* #if defined(TEST_IF_CMD) */\n+void qmp_TestIfCmd(TestIfStruct *foo, Error **errp)\n+{\n+}\n+/* #endif */\n+\n void qmp_user_def_cmd(Error **errp)\n {\n }\ndiff --git a/tests/qapi-schema/qapi-schema-test.json b/tests/qapi-schema/qapi-schema-test.json\nindex c72dbd8050..dc2c444fc1 100644\n--- a/tests/qapi-schema/qapi-schema-test.json\n+++ b/tests/qapi-schema/qapi-schema-test.json\n@@ -188,3 +188,23 @@\n 'data': { 'a': ['__org.qemu_x-Enum'], 'b': ['__org.qemu_x-Struct'],\n 'c': '__org.qemu_x-Union2', 'd': '__org.qemu_x-Alt' },\n 'returns': '__org.qemu_x-Union1' }\n+\n+# test 'if' condition handling\n+\n+{ 'struct': 'TestIfStruct', 'data': { 'foo': 'int' },\n+ 'if': 'defined(TEST_IF_STRUCT)' }\n+\n+{ 'enum': 'TestIfEnum', 'data': [ 'foo', 'bar' ],\n+ 'if': 'defined(TEST_IF_ENUM)' }\n+\n+{ 'union': 'TestIfUnion', 'data': { 'foo': 'TestStruct' },\n+ 'if': 'defined(TEST_IF_UNION) && defined(TEST_IF_STRUCT)' }\n+\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' },\n+ 'if': 'defined(TEST_IF_CMD) && defined(TEST_IF_STRUCT)' }\n+\n+{ 'event': 'TestIfEvent', 'data': { 'foo': 'TestIfStruct' },\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 3b1e9082d3..7fbaea19bc 100644\n--- a/tests/qapi-schema/qapi-schema-test.out\n+++ b/tests/qapi-schema/qapi-schema-test.out\n@@ -52,6 +52,22 @@ enum QEnumTwo ['value1', 'value2']\n prefix QENUM_TWO\n enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool']\n prefix QTYPE\n+alternate TestIfAlternate\n+ tag type\n+ case foo: int\n+ case bar: TestStruct\n+command TestIfCmd q_obj_TestIfCmd-arg -> None\n+ gen=True success_response=True boxed=False\n+enum TestIfEnum ['foo', 'bar']\n+event TestIfEvent q_obj_TestIfEvent-arg\n+ boxed=False\n+object TestIfStruct\n+ member foo: int optional=False\n+object TestIfUnion\n+ member type: TestIfUnionKind optional=False\n+ tag type\n+ case foo: q_obj_TestStruct-wrapper\n+enum TestIfUnionKind ['foo']\n object TestStruct\n member integer: int optional=False\n member boolean: bool optional=False\n@@ -172,6 +188,12 @@ object q_obj_EVENT_D-arg\n member b: str optional=False\n member c: str optional=True\n member enum3: EnumOne optional=True\n+object q_obj_TestIfCmd-arg\n+ member foo: TestIfStruct optional=False\n+object q_obj_TestIfEvent-arg\n+ member foo: TestIfStruct optional=False\n+object q_obj_TestStruct-wrapper\n+ member data: TestStruct optional=False\n object q_obj_UserDefFlatUnion2-base\n member integer: int optional=True\n member string: str optional=False\n","prefixes":["v3","04/50"]}