[{"id":1822479,"web_url":"http://patchwork.ozlabs.org/comment/1822479/","msgid":"<87y3m5uvxi.fsf@dusky.pond.sub.org>","list_archive_url":null,"date":"2017-12-14T16:16:25","subject":"Re: [Qemu-devel] [PATCH v3 42/50] qapi: add a -u/--unit option to\n\tspecify which unit to visit","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> Allow to filter expressions based on unit name.\n>\n> By default, only default units are processed (unspecified pragma).\n>\n> 'all' will include all units. Anything else will filter by unit name.\n\nYou therefore can't have a unit called 'all'. Hardly a loss, but I\nsuspect documenting and guarding against it is more trouble than the\nfeature's worth.\n\nIf we want to keep it, the previous patch needs to reject { 'pragma': {\n'unit': 'all' } }.\n\n> (add a FIXME to make implicit array types use the element type unit,\n> not the unit of the first expression using that array type. This isn't\n> necessary for now, and I am not sure how to best do it yet)\n>\n> Signed-off-by: Marc-André Lureau \n> ---\n> scripts/qapi.py | 14 ++++++++++++--\n> scripts/qapi2texi.py | 1 +\n> 2 files changed, 13 insertions(+), 2 deletions(-)\n>\n> diff --git a/scripts/qapi.py b/scripts/qapi.py\n> index 1d0defd638..7778585819 100644\n> --- a/scripts/qapi.py\n> +++ b/scripts/qapi.py\n> @@ -47,6 +47,9 @@ returns_whitelist = []\n> # Whitelist of entities allowed to violate case conventions\n> name_case_whitelist = []\n> \n> +# Unit to consider for the visit, 'all' for all units\n> +visit_unit = None\n> +\n> enum_types = {}\n> struct_types = {}\n> union_types = {}\n> @@ -1796,6 +1799,10 @@ class QAPISchema(object):\n> def visit(self, visitor):\n> visitor.visit_begin(self)\n> for (name, entity) in sorted(self._entity_dict.items()):\n> + # FIXME: implicit array types should use element type unit\n> + unit = entity.info and entity.info.get('unit')\n\n@unit is str, ensured by QAPISchemaParser.\n\n> + if visit_unit != 'all' and visit_unit != unit:\n> + continue\n\nIf visit_unit is still None, we don't visit anything.\n\n> if visitor.visit_needed(entity):\n> entity.visit(visitor)\n> visitor.visit_end()\n> @@ -2103,13 +2110,14 @@ def parse_command_line(extra_options='', extra_long_options=[]):\n> \n> try:\n> opts, args = getopt.gnu_getopt(sys.argv[1:],\n> - 'chp:o:i:' + extra_options,\n> + 'chp:o:u:i:' + extra_options,\n> ['source', 'header', 'prefix=', 'output-dir=',\n> - 'include='] + extra_long_options)\n> + 'unit=', 'include='] + extra_long_options)\n> except getopt.GetoptError as err:\n> print >>sys.stderr, \"%s: %s\" % (sys.argv[0], str(err))\n> sys.exit(1)\n> \n> + global visit_unit\n> output_dir = ''\n> prefix = ''\n> do_c = False\n> @@ -2129,6 +2137,8 @@ def parse_command_line(extra_options='', extra_long_options=[]):\n> prefix = a\n> elif o in ('-o', '--output-dir'):\n> output_dir = a + '/'\n> + elif o in ('-u', '--unit'):\n> + visit_unit = a\n> elif o in ('-c', '--source'):\n> do_c = True\n> elif o in ('-h', '--header'):\n\nIf the user doesn't give -u, @visit_unit remains None, and\nQAPISchema.visit() won't visit anything.\n\nI recommend to dumb this down as follows. No special unit name 'all'.\nIf you want all, don't specify -u. @visit_unit remains None then.\n\n> diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py\n> index 4e7b1cda87..6c856d4cb7 100755\n> --- a/scripts/qapi2texi.py\n> +++ b/scripts/qapi2texi.py\n> @@ -293,6 +293,7 @@ def main(argv):\n> print >>sys.stderr, \"%s: need exactly 1 argument: SCHEMA\" % argv[0]\n> sys.exit(1)\n> \n> + qapi.visit_unit = 'all'\n> schema = qapi.QAPISchema(argv[1])\n> if not qapi.doc_required:\n> print >>sys.stderr, (\"%s: need pragma 'doc-required' \"\n\nBonus: this hunk won't be needed then, because the default value just\nworks.","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 3yyJcT5dL6z9t4B\n\tfor ;\n\tFri, 15 Dec 2017 03:17:28 +1100 (AEDT)","from localhost ([::1]:41792 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ePWCI-0001LX-CT\n\tfor incoming@patchwork.ozlabs.org; Thu, 14 Dec 2017 11:17:22 -0500","from eggs.gnu.org ([2001:4830:134:3::10]:51681)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ePWBn-0001L2-IP\n\tfor qemu-devel@nongnu.org; Thu, 14 Dec 2017 11:16:55 -0500","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ePWBj-0004ll-3c\n\tfor qemu-devel@nongnu.org; Thu, 14 Dec 2017 11:16:51 -0500","from mx1.redhat.com ([209.132.183.28]:46880)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1ePWBi-0004jv-Qc\n\tfor qemu-devel@nongnu.org; Thu, 14 Dec 2017 11:16:47 -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 29BD5C03349C;\n\tThu, 14 Dec 2017 16:16:45 +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 34E1271924;\n\tThu, 14 Dec 2017 16:16:27 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid A4FEF1138658; Thu, 14 Dec 2017 17:16:25 +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-43-marcandre.lureau@redhat.com>","Date":"Thu, 14 Dec 2017 17:16:25 +0100","In-Reply-To":"<20170911110623.24981-43-marcandre.lureau@redhat.com> (\n\t=?utf-8?b?Ik1hcmMtQW5kcsOp?= Lureau\"'s message of \"Mon,\n\t11 Sep 2017 \t13:06:15 +0200\")","Message-ID":"<87y3m5uvxi.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.32]);\n\tThu, 14 Dec 2017 16:16: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 42/50] qapi: add a -u/--unit option to\n\tspecify which unit to visit","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"}}]