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=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 F1239C1975A for ; Tue, 17 Mar 2020 21:22:55 +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 B4B0F20724 for ; Tue, 17 Mar 2020 21:22:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fpjmYMAG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4B0F20724 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]:41684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEJfq-0006Wq-Lx for qemu-devel@archiver.kernel.org; Tue, 17 Mar 2020 17:22:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51602) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEJLD-0002tT-LH for qemu-devel@nongnu.org; Tue, 17 Mar 2020 17:01:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEJLB-00035U-9y for qemu-devel@nongnu.org; Tue, 17 Mar 2020 17:01:35 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:51402) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEJLB-0002zb-2g for qemu-devel@nongnu.org; Tue, 17 Mar 2020 17:01:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584478892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sY3Y6qJLLd/kOvvX9S37wL/scXUbBQr1Fi5kv3BKMck=; b=fpjmYMAGcx2+MAsyW5/HRBdRhI5YU89uXQhNKmv8shKr98YWEii3QuWDZ+W6gQ3GIlV9Wu SXCH3mHhWtwqQj32NKglyXO6MCQv6kDB1Q/g+uaP1/h40SF2LTebA8aqrKUUICvghOCjWo zspTVOz7Pi0Tlsm4MKcxJsey8rrwU8s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-226-VaP-iEpDOOiWeyt12mwZbg-1; Tue, 17 Mar 2020 17:01:22 -0400 X-MC-Unique: VaP-iEpDOOiWeyt12mwZbg-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 44DAA13F5 for ; Tue, 17 Mar 2020 21:01:21 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-130.ams2.redhat.com [10.36.112.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89B111001DD8; Tue, 17 Mar 2020 21:01:18 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5890711366F3; Tue, 17 Mar 2020 22:01:15 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 12/30] qapi/schema: Clean up around QAPISchemaEntity.connect_doc() Date: Tue, 17 Mar 2020 22:00:57 +0100 Message-Id: <20200317210115.8864-13-armbru@redhat.com> In-Reply-To: <20200317210115.8864-1-armbru@redhat.com> References: <20200317210115.8864-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" QAPISchemaEntity calls doc.connect_feature() in .check(). Improper since commit ee1e6a1f6c8 split .connect_doc() off .check(). Move the call. Requires making the children call super().connect_doc() as they should. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake Message-Id: <20200317115459.31821-12-armbru@redhat.com> --- scripts/qapi/schema.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index d759308b4e..2a2b495987 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -53,13 +53,13 @@ class QAPISchemaEntity: seen =3D {} for f in self.features: f.check_clash(self.info, seen) - if self.doc: - self.doc.connect_feature(f) - self._checked =3D True =20 def connect_doc(self, doc=3DNone): - pass + doc =3D doc or self.doc + if doc: + for f in self.features: + doc.connect_feature(f) =20 def check_doc(self): if self.doc: @@ -250,6 +250,7 @@ class QAPISchemaEnumType(QAPISchemaType): m.check_clash(self.info, seen) =20 def connect_doc(self, doc=3DNone): + super().connect_doc(doc) doc =3D doc or self.doc if doc: for m in self.members: @@ -392,6 +393,7 @@ class QAPISchemaObjectType(QAPISchemaType): m.check_clash(info, seen) =20 def connect_doc(self, doc=3DNone): + super().connect_doc(doc) doc =3D doc or self.doc if doc: if self.base and self.base.is_implicit(): @@ -667,6 +669,7 @@ class QAPISchemaAlternateType(QAPISchemaType): types_seen[qt] =3D v.name =20 def connect_doc(self, doc=3DNone): + super().connect_doc(doc) doc =3D doc or self.doc if doc: for v in self.variants.variants: @@ -733,6 +736,7 @@ class QAPISchemaCommand(QAPISchemaEntity): % self.ret_type.describe()) =20 def connect_doc(self, doc=3DNone): + super().connect_doc(doc) doc =3D doc or self.doc if doc: if self.arg_type and self.arg_type.is_implicit(): @@ -775,6 +779,7 @@ class QAPISchemaEvent(QAPISchemaEntity): % self.arg_type.describe()) =20 def connect_doc(self, doc=3DNone): + super().connect_doc(doc) doc =3D doc or self.doc if doc: if self.arg_type and self.arg_type.is_implicit(): --=20 2.21.1