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=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no 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 2EC94C432C2 for ; Wed, 25 Sep 2019 06:14:48 +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 0265A217F4 for ; Wed, 25 Sep 2019 06:14:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0265A217F4 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]:45830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD0Zb-0006oU-5G for qemu-devel@archiver.kernel.org; Wed, 25 Sep 2019 02:14:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34183) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD0Y8-0005aZ-TV for qemu-devel@nongnu.org; Wed, 25 Sep 2019 02:13:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iD0Y7-0005fG-NX for qemu-devel@nongnu.org; Wed, 25 Sep 2019 02:13:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47023) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iD0Y7-0005et-I5 for qemu-devel@nongnu.org; Wed, 25 Sep 2019 02:13:15 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B5291309BF13; Wed, 25 Sep 2019 06:13:14 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-142.ams2.redhat.com [10.36.117.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 497445B69A; Wed, 25 Sep 2019 06:13:12 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C51D1113864E; Wed, 25 Sep 2019 08:13:10 +0200 (CEST) From: Markus Armbruster To: Eric Blake Subject: Re: [PATCH 19/25] qapi: Improve reporting of invalid flags References: <20190924132830.15835-1-armbru@redhat.com> <20190924132830.15835-20-armbru@redhat.com> <4d3b7c95-87dd-d41f-1ad5-ba917287a432@redhat.com> <87v9th8lxk.fsf@dusky.pond.sub.org> Date: Wed, 25 Sep 2019 08:13:10 +0200 In-Reply-To: <87v9th8lxk.fsf@dusky.pond.sub.org> (Markus Armbruster's message of "Tue, 24 Sep 2019 22:43:35 +0200") Message-ID: <87d0fosy2x.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 25 Sep 2019 06:13:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Markus Armbruster writes: > Eric Blake writes: > >> On 9/24/19 8:28 AM, Markus Armbruster wrote: >>> Split check_flags() off check_keys() and have check_exprs() call it >>> later, so its error messages gain an "in definition" line. Tweak the >>> error messages. >>> >>> Checking values in a function named check_keys() is unclean anyway. >>> >>> Signed-off-by: Markus Armbruster >>> --- >>> scripts/qapi/common.py | 22 ++++++++++++---------- >>> tests/qapi-schema/allow-preconfig-test.err | 3 ++- >>> tests/qapi-schema/args-bad-boxed.err | 3 ++- >>> tests/qapi-schema/oob-test.err | 3 ++- >>> tests/qapi-schema/type-bypass-bad-gen.err | 3 ++- >>> 5 files changed, 20 insertions(+), 14 deletions(-) >>> >> >>> + >>> +def check_flags(expr, info): >>> + for key in ['gen', 'success-response']: >>> + if key in expr and expr[key] is not False: >> >> Is it any more pythonic and/or a micro-optimization to compress this to: >> >> if expr.get(key, False) is not False: >> >>> + raise QAPISemError( >>> + info, "flag '%s' may only use false value" % key) >>> + for key in ['boxed', 'allow-oob', 'allow-preconfig']: >>> + if key in expr and expr[key] is not True: >> >> and here too. > > Will do. Second thoughts in the morning: if key in expr and expr[key] is not VALUE: feels slightly clearer than if expr.get(key, VALUE) is not VALUE: >> Reviewed-by: Eric Blake > > Thanks!