[{"id":1819229,"web_url":"http://patchwork.ozlabs.org/comment/1819229/","msgid":"<87d13o71r2.fsf@dusky.pond.sub.org>","list_archive_url":null,"date":"2017-12-09T08:18:41","subject":"Re: [Qemu-devel] [PATCH v3 23/50] qapi: add 'if' to struct members\n\tand implicit objects members","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> check_type() will now accept a DICT { 'type': TYPENAME, 'if': ... }\n> instead of a TYPENAME. This is the case in various situations where\n> implicit object types are allowed such as commands/events arguments\n> and return type, base and branches of union & alternate.\n\nUh, do you mean where implicit object type are *not* allowed?\n\n> Signed-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(-)\n>\n> diff --git a/scripts/qapi.py b/scripts/qapi.py\n> index 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@allow_dict becomes a misnomer: dictionaries are now always allowed, but\nthey have different meaning (implicit type vs. named type with\nadditional attributes).\n\nRename to @allow_implicit?\n\n> \n> if not isinstance(value, OrderedDict):\n> raise QAPISemError(info,\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 3yv2F61SJcz9s84\n\tfor ;\n\tSat, 9 Dec 2017 19:19:17 +1100 (AEDT)","from localhost ([::1]:40347 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1eNaLp-0006ol-58\n\tfor incoming@patchwork.ozlabs.org; Sat, 09 Dec 2017 03:19:13 -0500","from eggs.gnu.org ([2001:4830:134:3::10]:39469)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1eNaLR-0006oa-OI\n\tfor qemu-devel@nongnu.org; Sat, 09 Dec 2017 03:18:50 -0500","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1eNaLO-0004kl-K4\n\tfor qemu-devel@nongnu.org; Sat, 09 Dec 2017 03:18:49 -0500","from mx1.redhat.com ([209.132.183.28]:55650)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1eNaLO-0004ka-DP\n\tfor qemu-devel@nongnu.org; Sat, 09 Dec 2017 03:18:46 -0500","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 E018A7EBD3;\n\tSat, 9 Dec 2017 08:18:44 +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 A6A1768B23;\n\tSat, 9 Dec 2017 08:18:42 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid 3A46D1138658; Sat, 9 Dec 2017 09:18:41 +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-24-marcandre.lureau@redhat.com>","Date":"Sat, 09 Dec 2017 09:18:41 +0100","In-Reply-To":"<20170911110623.24981-24-marcandre.lureau@redhat.com> (\n\t=?utf-8?b?Ik1hcmMtQW5kcsOp?= Lureau\"'s message of \"Mon,\n\t11 Sep 2017 \t13:05:56 +0200\")","Message-ID":"<87d13o71r2.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.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tSat, 09 Dec 2017 08:18:45 +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 23/50] qapi: add 'if' to struct members\n\tand implicit 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":"qemu-devel@nongnu.org, Michael Roth ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]