From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28775C4CECD for ; Tue, 17 Sep 2019 20:46:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EBB28214AF for ; Tue, 17 Sep 2019 20:46:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EBB28214AF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAKND-0002N0-T9 for qemu-devel@archiver.kernel.org; Tue, 17 Sep 2019 16:46:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55617) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAKKw-0000zB-PA for qemu-devel@nongnu.org; Tue, 17 Sep 2019 16:44:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAKKu-00044e-8z for qemu-devel@nongnu.org; Tue, 17 Sep 2019 16:44:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50383) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAKKu-00043D-01 for qemu-devel@nongnu.org; Tue, 17 Sep 2019 16:44:32 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6EFE8859FF; Tue, 17 Sep 2019 20:44:30 +0000 (UTC) Received: from [10.3.116.249] (ovpn-116-249.phx2.redhat.com [10.3.116.249]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E7D025D9D5; Tue, 17 Sep 2019 20:44:27 +0000 (UTC) To: Markus Armbruster , qemu-devel@nongnu.org References: <20190914153506.2151-1-armbru@redhat.com> <20190914153506.2151-15-armbru@redhat.com> From: Eric Blake Openpgp: preference=signencrypt Autocrypt: addr=eblake@redhat.com; keydata= xsBNBEvHyWwBCACw7DwsQIh0kAbUXyqhfiKAKOTVu6OiMGffw2w90Ggrp4bdVKmCaEXlrVLU xphBM8mb+wsFkU+pq9YR621WXo9REYVIl0FxKeQo9dyQBZ/XvmUMka4NOmHtFg74nvkpJFCD TUNzmqfcjdKhfFV0d7P/ixKQeZr2WP1xMcjmAQY5YvQ2lUoHP43m8TtpB1LkjyYBCodd+LkV GmCx2Bop1LSblbvbrOm2bKpZdBPjncRNob73eTpIXEutvEaHH72LzpzksfcKM+M18cyRH+nP sAd98xIbVjm3Jm4k4d5oQyE2HwOur+trk2EcxTgdp17QapuWPwMfhaNq3runaX7x34zhABEB AAHNHkVyaWMgQmxha2UgPGVibGFrZUByZWRoYXQuY29tPsLAegQTAQgAJAIbAwULCQgHAwUV CgkICwUWAgMBAAIeAQIXgAUCS8fL9QIZAQAKCRCnoWtKJSdDahBHCACbl/5FGkUqJ89GAjeX RjpAeJtdKhujir0iS4CMSIng7fCiGZ0fNJCpL5RpViSo03Q7l37ss+No+dJI8KtAp6ID+PMz wTJe5Egtv/KGUKSDvOLYJ9WIIbftEObekP+GBpWP2+KbpADsc7EsNd70sYxExD3liwVJYqLc Rw7so1PEIFp+Ni9A1DrBR5NaJBnno2PHzHPTS9nmZVYm/4I32qkLXOcdX0XElO8VPDoVobG6 gELf4v/vIImdmxLh/w5WctUpBhWWIfQDvSOW2VZDOihm7pzhQodr3QP/GDLfpK6wI7exeu3P pfPtqwa06s1pae3ad13mZGzkBdNKs1HEm8x6zsBNBEvHyWwBCADGkMFzFjmmyqAEn5D+Mt4P zPdO8NatsDw8Qit3Rmzu+kUygxyYbz52ZO40WUu7EgQ5kDTOeRPnTOd7awWDQcl1gGBXgrkR pAlQ0l0ReO57Q0eglFydLMi5bkwYhfY+TwDPMh3aOP5qBXkm4qIYSsxb8A+i00P72AqFb9Q7 3weG/flxSPApLYQE5qWGSXjOkXJv42NGS6o6gd4RmD6Ap5e8ACo1lSMPfTpGzXlt4aRkBfvb NCfNsQikLZzFYDLbQgKBA33BDeV6vNJ9Cj0SgEGOkYyed4I6AbU0kIy1hHAm1r6+sAnEdIKj cHi3xWH/UPrZW5flM8Kqo14OTDkI9EtlABEBAAHCwF8EGAEIAAkFAkvHyWwCGwwACgkQp6Fr SiUnQ2q03wgAmRFGDeXzc58NX0NrDijUu0zx3Lns/qZ9VrkSWbNZBFjpWKaeL1fdVeE4TDGm I5mRRIsStjQzc2R9b+2VBUhlAqY1nAiBDv0Qnt+9cLiuEICeUwlyl42YdwpmY0ELcy5+u6wz mK/jxrYOpzXKDwLq5k4X+hmGuSNWWAN3gHiJqmJZPkhFPUIozZUCeEc76pS/IUN72NfprZmF Dp6/QDjDFtfS39bHSWXKVZUbqaMPqlj/z6Ugk027/3GUjHHr8WkeL1ezWepYDY7WSoXwfoAL 2UXYsMAr/uUncSKlfjvArhsej0S4zbqim2ZY6S8aRWw94J3bSvJR+Nwbs34GPTD4Pg== Organization: Red Hat, Inc. Message-ID: Date: Tue, 17 Sep 2019 14:01:05 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190914153506.2151-15-armbru@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="oRy08hCwZFggXGib5jojnI5P67sVBo9W6" X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 17 Sep 2019 20:44:30 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH 14/19] qapi: Simplify check_keys() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --oRy08hCwZFggXGib5jojnI5P67sVBo9W6 Content-Type: multipart/mixed; boundary="giefxXjWSP4AvaBMCSbAKvJXz44OTbZ9E"; protected-headers="v1" From: Eric Blake To: Markus Armbruster , qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, marcandre.lureau@redhat.com Message-ID: Subject: Re: [PATCH 14/19] qapi: Simplify check_keys() References: <20190914153506.2151-1-armbru@redhat.com> <20190914153506.2151-15-armbru@redhat.com> In-Reply-To: <20190914153506.2151-15-armbru@redhat.com> --giefxXjWSP4AvaBMCSbAKvJXz44OTbZ9E Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 9/14/19 10:35 AM, Markus Armbruster wrote: > check_keys() parameter expr_elem expects a dictionary with keys 'expr' > and 'info'. Passing the two values separately is simpler, so do that. >=20 > Signed-off-by: Markus Armbruster > --- > scripts/qapi/common.py | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > -def check_keys(expr_elem, meta, required, optional=3D[]): > - expr =3D expr_elem['expr'] > - info =3D expr_elem['info'] > +def check_keys(expr, info, meta, required, optional=3D[]): > name =3D expr[meta] > if not isinstance(name, str): > raise QAPISemError(info, "'%s' key must have a string value" %= meta) > @@ -1100,40 +1098,39 @@ def check_exprs(exprs): > =20 > if 'enum' in expr: > meta =3D 'enum' > - check_keys(expr_elem, 'enum', ['data'], ['if', 'prefix']) > + check_keys(expr, info, 'enum', ['data'], ['if', 'prefix'])= Works since the caller already separated out the two values in question. Reviewed-by: Eric Blake --=20 Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org --giefxXjWSP4AvaBMCSbAKvJXz44OTbZ9E-- --oRy08hCwZFggXGib5jojnI5P67sVBo9W6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEccLMIrHEYCkn0vOqp6FrSiUnQ2oFAl2BLXEACgkQp6FrSiUn Q2qbrAf/YdM+iDjHjEskFug0BBzTr4GHAEQU8xMZ5GtJpJ1yiRqbCO7coHZgBxYO aHvy8phqroAW2knIXTrbpaNsxIcUAwXXtrEgI0VQxiC2gbebzc2TTWSNBnTNKGJ6 BZYNFfTmwCI/MDTA4p219xH+2pqwPOkF2N0BIU9arCwvkeUYkBvyOssYvn/tBMWs cPi5qxUPt9DawP+RGBcGUDcNpLVoYdLMBroUgON6E8gTJostqEh+0ug6KbbTQqI6 1jbuF41ksICsT5c8Ch4lgiVuxu6lU7lS7bFko29aUI2SmksJmNLg2vCiDYTFgul+ AnUZVQN6Qw9ip/tQ5lJeAXxVTnQJ+w== =iCJA -----END PGP SIGNATURE----- --oRy08hCwZFggXGib5jojnI5P67sVBo9W6--