[{"id":1817013,"web_url":"http://patchwork.ozlabs.org/comment/1817013/","msgid":"<87fu8nzwo5.fsf@dusky.pond.sub.org>","list_archive_url":null,"date":"2017-12-06T15:46:34","subject":"Re: [Qemu-devel] [PATCH v3 04/50] qapi: add 'if' to top-level\n\texpressions","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/","name":"Markus Armbruster","email":"armbru@redhat.com"},"content":"Marc-André Lureau writes:\n\n> Accept 'if' key in top-level elements, accepted as string or list of\n> string type. The following patches will modify the test visitor to\n> check the value is correctly saved, and generate #if/#endif code (as a\n> single #if/endif line or a series for a list).\n>\n> Example of 'if' key:\n> { 'struct': 'TestIfStruct', 'data': { 'foo': 'int' },\n> 'if': 'defined(TEST_IF_STRUCT)' }\n>\n> The generated code is for now *unconditional*. Later patches generate\n> the conditionals.\n>\n> A following patch for qapi-code-gen.txt will provide more complete\n> documentation for 'if' usage.\n>\n> Signed-off-by: Marc-André Lureau \n\nReviewed-by: Markus Armbruster ","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=)","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 3ysNKQ4Zqnz9s03\n\tfor ;\n\tThu, 7 Dec 2017 02:47:22 +1100 (AEDT)","from localhost ([::1]:56335 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1eMbuq-0005oe-Qk\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Dec 2017 10:47:20 -0500","from eggs.gnu.org ([2001:4830:134:3::10]:53211)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1eMbuQ-0005nn-IC\n\tfor qemu-devel@nongnu.org; Wed, 06 Dec 2017 10:46:55 -0500","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1eMbuL-0002EP-JG\n\tfor qemu-devel@nongnu.org; Wed, 06 Dec 2017 10:46:54 -0500","from mx1.redhat.com ([209.132.183.28]:44306)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1eMbuL-0002ED-CU\n\tfor qemu-devel@nongnu.org; Wed, 06 Dec 2017 10:46:49 -0500","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 4BB837EA93;\n\tWed, 6 Dec 2017 15:46:48 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-74.ams2.redhat.com\n\t[10.36.116.74])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 5C16E7A3CC;\n\tWed, 6 Dec 2017 15:46:36 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid DFE061138658; Wed, 6 Dec 2017 16:46:34 +0100 (CET)"],"From":"Markus Armbruster ","To":"=?utf-8?q?Marc-Andr=C3=A9?= Lureau ","References":"<20170911110623.24981-1-marcandre.lureau@redhat.com>\n\t<20170911110623.24981-5-marcandre.lureau@redhat.com>","Date":"Wed, 06 Dec 2017 16:46:34 +0100","In-Reply-To":"<20170911110623.24981-5-marcandre.lureau@redhat.com> (\n\t=?utf-8?b?Ik1hcmMtQW5kcsOp?= Lureau\"'s message of \"Mon,\n\t11 Sep 2017 13:05:37 +0200\")","Message-ID":"<87fu8nzwo5.fsf@dusky.pond.sub.org>","User-Agent":"Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"quoted-printable","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tWed, 06 Dec 2017 15:46:48 +0000 (UTC)","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":"Re: [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":"qemu-devel@nongnu.org, Michael Roth ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}},{"id":1817036,"web_url":"http://patchwork.ozlabs.org/comment/1817036/","msgid":"<87mv2vx1tc.fsf@dusky.pond.sub.org>","list_archive_url":null,"date":"2017-12-06T16:23:43","subject":"Re: [Qemu-devel] [PATCH v3 04/50] qapi: add 'if' to top-level\n\texpressions","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/","name":"Markus Armbruster","email":"armbru@redhat.com"},"content":"Second thoughts...\n\nMarc-André Lureau writes:\n\n> Accept 'if' key in top-level elements, accepted as string or list of\n> string type. The following patches will modify the test visitor to\n> check the value is correctly saved, and generate #if/#endif code (as a\n> single #if/endif line or a series for a list).\n>\n> Example of 'if' key:\n> { 'struct': 'TestIfStruct', 'data': { 'foo': 'int' },\n> 'if': 'defined(TEST_IF_STRUCT)' }\n>\n> The generated code is for now *unconditional*. Later patches generate\n> the conditionals.\n>\n> A following patch for qapi-code-gen.txt will provide more complete\n> documentation for 'if' usage.\n>\n> Signed-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(-)\n>\n> diff --git a/scripts/qapi.py b/scripts/qapi.py\n> index 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\nSlightly terser:\n\n def check_if(expr, info):\n\n def check_if_str(ifcond, info):\n if not isinstance(ifcond, str):\n raise QAPISemError(\n info, \"'if' condition must be a string or a list of strings\")\n if ifcond == '':\n raise QAPISemError(info, \"'if' condition '' makes no sense\")\n\n ifcond = expr['if']\n if isinstance(ifcond, list):\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 check_if_str(ifcond, info)\n\nCan slot this in on commit.\n\n> def check_type(info, source, value, allow_array=False,\n> allow_dict=False, allow_optional=False,\n> allow_metas=[]):\n[...]","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=)","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 3ysP873qPzz9s83\n\tfor ;\n\tThu, 7 Dec 2017 03:24:21 +1100 (AEDT)","from localhost ([::1]:56434 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1eMcUd-0007NN-A3\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Dec 2017 11:24:19 -0500","from eggs.gnu.org ([2001:4830:134:3::10]:43257)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1eMcUB-0007NB-R4\n\tfor qemu-devel@nongnu.org; Wed, 06 Dec 2017 11:23:52 -0500","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1eMcU9-0002Ob-4u\n\tfor qemu-devel@nongnu.org; Wed, 06 Dec 2017 11:23:51 -0500","from mx1.redhat.com ([209.132.183.28]:53804)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1eMcU8-0002Nh-Rg\n\tfor qemu-devel@nongnu.org; Wed, 06 Dec 2017 11:23:49 -0500","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 A5BA985541;\n\tWed, 6 Dec 2017 16:23:47 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-74.ams2.redhat.com\n\t[10.36.116.74])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 5C97A68D80;\n\tWed, 6 Dec 2017 16:23:45 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid E3AAC1138658; Wed, 6 Dec 2017 17:23:43 +0100 (CET)"],"From":"Markus Armbruster ","To":"=?utf-8?q?Marc-Andr=C3=A9?= Lureau ","References":"<20170911110623.24981-1-marcandre.lureau@redhat.com>\n\t<20170911110623.24981-5-marcandre.lureau@redhat.com>","Date":"Wed, 06 Dec 2017 17:23:43 +0100","In-Reply-To":"<20170911110623.24981-5-marcandre.lureau@redhat.com> (\n\t=?utf-8?b?Ik1hcmMtQW5kcsOp?= Lureau\"'s message of \"Mon,\n\t11 Sep 2017 13:05:37 +0200\")","Message-ID":"<87mv2vx1tc.fsf@dusky.pond.sub.org>","User-Agent":"Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux)","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"quoted-printable","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.28]);\n\tWed, 06 Dec 2017 16:23:47 +0000 (UTC)","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":"Re: [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":"qemu-devel@nongnu.org, Michael Roth ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]