From nobody Wed Nov 12 10:09:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569697072; cv=none; d=zoho.com; s=zohoarc; b=aWORECp4etFxU6Pz6HFPpl6VVo2Z9rlMCpBLMvaH5mhYlpxmIHov0HOHQkPYUQbqUcj5Xr5SPdrexBvBYv630n8ezBPxaMXnyEihNjYqCHS5HkMp0f7/ncyhJ60LJaCL3XIMPZSxu4GC5cFoxIskTdy/6LNlW3vplv3JC++lRlE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569697072; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=IowBI4OI8zJsCm4+fOdieMEvVTmM5ZuEP5AM9rGe/3g=; b=JdUgLeSZ9vrljKDeQApZuuiFl3/ALxlJC4vOpAtP1RAHhenHN6oNZEqrAZqD2T6LrBxRpJr9+/9dUlnLv8XlM1TcT5nJrfRS5ClYdF8ECm5b/cbExIL1OA5JKCgG7UGATIKPCUJQbqPpFTXQXxyg8AuUoRqD8UWt2roqTIRZq74= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569697072094268.8390603227989; Sat, 28 Sep 2019 11:57:52 -0700 (PDT) Received: from localhost ([::1]:34476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEHuY-0000ml-Uw for importer@patchew.org; Sat, 28 Sep 2019 14:57:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44036) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEHdD-0008VE-Kz for qemu-devel@nongnu.org; Sat, 28 Sep 2019 14:39:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iEHd7-00041f-Vb for qemu-devel@nongnu.org; Sat, 28 Sep 2019 14:39:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57406) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iEHd7-0003uK-BB for qemu-devel@nongnu.org; Sat, 28 Sep 2019 14:39:41 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6AE7F308FC20 for ; Sat, 28 Sep 2019 18:39:39 +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 3895E1000337; Sat, 28 Sep 2019 18:39:39 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6956F1138406; Sat, 28 Sep 2019 20:39:34 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 18/27] qapi: Move context-free checking to the proper place Date: Sat, 28 Sep 2019 20:39:25 +0200 Message-Id: <20190928183934.12459-19-armbru@redhat.com> In-Reply-To: <20190928183934.12459-1-armbru@redhat.com> References: <20190928183934.12459-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Sat, 28 Sep 2019 18:39:39 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" QAPISchemaCommand.check() and QAPISchemaEvent().check() check 'data' is present when 'boxed': true. That's context-free. Move to check_command() and check_event(). Tweak the error message while there. check_exprs() & friends now check exactly what qapi-code-gen.txt calls the second layer of syntax. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20190927134639.4284-18-armbru@redhat.com> --- scripts/qapi/common.py | 16 ++++++++-------- tests/qapi-schema/event-boxed-empty.err | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index f22e84c4a8..2e1d8158d6 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -768,10 +768,12 @@ def check_type(value, info, source, =20 def check_command(expr, info): name =3D expr['command'] + args =3D expr.get('data') boxed =3D expr.get('boxed', False) =20 - check_type(expr.get('data'), info, - "'data' for command '%s'" % name, + if boxed and args is None: + raise QAPISemError(info, "'boxed': true requires 'data'") + check_type(args, info, "'data' for command '%s'" % name, allow_dict=3Dnot boxed) check_type(expr.get('returns'), info, "'returns' for command '%s'" % name, @@ -780,10 +782,12 @@ def check_command(expr, info): =20 def check_event(expr, info): name =3D expr['event'] + args =3D expr.get('data') boxed =3D expr.get('boxed', False) =20 - check_type(expr.get('data'), info, - "'data' for event '%s'" % name, + if boxed and args is None: + raise QAPISemError(info, "'boxed': true requires 'data'") + check_type(args, info, "'data' for event '%s'" % name, allow_dict=3Dnot boxed) =20 =20 @@ -1699,8 +1703,6 @@ class QAPISchemaCommand(QAPISchemaEntity): self.info, "command's 'data' can take %s only with 'boxed': true" % self.arg_type.describe()) - elif self.boxed: - raise QAPISemError(self.info, "use of 'boxed' requires 'data'") if self._ret_type_name: self.ret_type =3D schema.resolve_type( self._ret_type_name, self.info, "command's 'returns'") @@ -1748,8 +1750,6 @@ class QAPISchemaEvent(QAPISchemaEntity): self.info, "event's 'data' can take %s only with 'boxed': true" % self.arg_type.describe()) - elif self.boxed: - raise QAPISemError(self.info, "use of 'boxed' requires 'data'") =20 def visit(self, visitor): QAPISchemaEntity.visit(self, visitor) diff --git a/tests/qapi-schema/event-boxed-empty.err b/tests/qapi-schema/ev= ent-boxed-empty.err index 9c691b7d97..931c10b036 100644 --- a/tests/qapi-schema/event-boxed-empty.err +++ b/tests/qapi-schema/event-boxed-empty.err @@ -1,2 +1,2 @@ tests/qapi-schema/event-boxed-empty.json: In event 'FOO': -tests/qapi-schema/event-boxed-empty.json:2: use of 'boxed' requires 'data' +tests/qapi-schema/event-boxed-empty.json:2: 'boxed': true requires 'data' --=20 2.21.0