From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 12/30] qapi/schema: Clean up around QAPISchemaEntity.connect_doc()
Date: Tue, 17 Mar 2020 22:00:57 +0100 [thread overview]
Message-ID: <20200317210115.8864-13-armbru@redhat.com> (raw)
In-Reply-To: <20200317210115.8864-1-armbru@redhat.com>
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 <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
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 = {}
for f in self.features:
f.check_clash(self.info, seen)
- if self.doc:
- self.doc.connect_feature(f)
-
self._checked = True
def connect_doc(self, doc=None):
- pass
+ doc = doc or self.doc
+ if doc:
+ for f in self.features:
+ doc.connect_feature(f)
def check_doc(self):
if self.doc:
@@ -250,6 +250,7 @@ class QAPISchemaEnumType(QAPISchemaType):
m.check_clash(self.info, seen)
def connect_doc(self, doc=None):
+ super().connect_doc(doc)
doc = doc or self.doc
if doc:
for m in self.members:
@@ -392,6 +393,7 @@ class QAPISchemaObjectType(QAPISchemaType):
m.check_clash(info, seen)
def connect_doc(self, doc=None):
+ super().connect_doc(doc)
doc = doc or self.doc
if doc:
if self.base and self.base.is_implicit():
@@ -667,6 +669,7 @@ class QAPISchemaAlternateType(QAPISchemaType):
types_seen[qt] = v.name
def connect_doc(self, doc=None):
+ super().connect_doc(doc)
doc = doc or self.doc
if doc:
for v in self.variants.variants:
@@ -733,6 +736,7 @@ class QAPISchemaCommand(QAPISchemaEntity):
% self.ret_type.describe())
def connect_doc(self, doc=None):
+ super().connect_doc(doc)
doc = 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())
def connect_doc(self, doc=None):
+ super().connect_doc(doc)
doc = doc or self.doc
if doc:
if self.arg_type and self.arg_type.is_implicit():
--
2.21.1
next prev parent reply other threads:[~2020-03-17 21:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 21:00 [PULL 00/30] QAPI patches for 2020-03-17 Markus Armbruster
2020-03-17 21:00 ` [PULL 01/30] docs/devel/qapi-code-gen: Fix typo in grammar Markus Armbruster
2020-03-17 21:00 ` [PULL 02/30] qemu-doc: Belatedly document QMP command arg & result deprecation Markus Armbruster
2020-03-17 21:00 ` [PULL 03/30] qapi: Belatedly update doc comment for @wait deprecation Markus Armbruster
2020-03-17 21:00 ` [PULL 04/30] docs/devel/qapi-code-gen: Clarify allow-oob introspection Markus Armbruster
2020-03-17 21:00 ` [PULL 05/30] docs/devel/qapi-code-gen: Document 'features' introspection Markus Armbruster
2020-03-17 21:00 ` [PULL 06/30] tests/test-qmp-cmds: Factor out qmp_dispatch() test helpers Markus Armbruster
2020-03-17 21:00 ` [PULL 07/30] tests/test-qmp-cmds: Check responses more thoroughly Markus Armbruster
2020-03-17 21:00 ` [PULL 08/30] tests/test-qmp-cmds: Simplify test data setup Markus Armbruster
2020-03-17 21:00 ` [PULL 09/30] tests/test-qmp-event: " Markus Armbruster
2020-03-17 21:00 ` [PULL 10/30] tests/test-qmp-event: Use qobject_is_equal() Markus Armbruster
2020-03-17 21:00 ` [PULL 11/30] tests/test-qmp-event: Check event is actually emitted Markus Armbruster
2020-03-17 21:00 ` Markus Armbruster [this message]
2020-03-17 21:00 ` [PULL 13/30] qapi: Add feature flags to remaining definitions Markus Armbruster
2020-03-17 21:00 ` [PULL 14/30] qapi: Consistently put @features parameter right after @ifcond Markus Armbruster
2020-03-17 21:01 ` [PULL 15/30] qapi/introspect: Rename *qlit* to reduce confusion Markus Armbruster
2020-03-17 21:01 ` [PULL 16/30] qapi/introspect: Factor out _make_tree() Markus Armbruster
2020-03-17 21:01 ` [PULL 17/30] qapi/schema: Change _make_features() to a take feature list Markus Armbruster
2020-03-17 21:01 ` [PULL 18/30] qapi/schema: Reorder classes so related ones are together Markus Armbruster
2020-03-17 21:01 ` [PULL 19/30] qapi/schema: Rename QAPISchemaObjectType{Variant, Variants} Markus Armbruster
2020-03-17 21:01 ` [PULL 20/30] qapi/schema: Call QAPIDoc.connect_member() in just one place Markus Armbruster
2020-03-17 21:01 ` [PULL 21/30] qapi: Add feature flags to struct members Markus Armbruster
2020-03-17 21:01 ` [PULL 22/30] qapi: Inline do_qmp_dispatch() into qmp_dispatch() Markus Armbruster
2020-03-17 21:01 ` [PULL 23/30] qapi: Simplify how qmp_dispatch() deals with QCO_NO_SUCCESS_RESP Markus Armbruster
2020-03-17 21:01 ` [PULL 24/30] qapi: Simplify how qmp_dispatch() gets the request ID Markus Armbruster
2020-03-17 21:01 ` [PULL 25/30] qapi: Replace qmp_dispatch()'s TODO comment by an explanation Markus Armbruster
2020-03-17 21:01 ` [PULL 26/30] qapi: New special feature flag "deprecated" Markus Armbruster
2020-03-17 21:01 ` [PULL 27/30] qapi: Mark deprecated QMP parts with feature 'deprecated' Markus Armbruster
2020-03-17 21:01 ` [PULL 28/30] qmp: constify QmpCommand and list Markus Armbruster
2020-03-17 21:01 ` [PULL 29/30] net: Complete qapi-fication of netdev_add Markus Armbruster
2020-03-17 21:01 ` [PULL 30/30] net: Track netdevs in NetClientState rather than QemuOpt Markus Armbruster
2020-03-19 11:00 ` [PULL 00/30] QAPI patches for 2020-03-17 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200317210115.8864-13-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).