qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, John Snow <jsnow@redhat.com>
Subject: [PATCH 02/18] qapi/introspect.py: assert schema is not None
Date: Fri, 19 Feb 2021 13:04:06 +0100	[thread overview]
Message-ID: <20210219120422.600850-3-armbru@redhat.com> (raw)
In-Reply-To: <20210219120422.600850-1-armbru@redhat.com>

From: John Snow <jsnow@redhat.com>

The introspect visitor is stateful, but expects that it will have a
schema to refer to. Add assertions that state this.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210216021809.134886-3-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 scripts/qapi/introspect.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index fafec94e02..43ab4be1f7 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -147,6 +147,8 @@ def _name(self, name):
         return self._name_map[name]
 
     def _use_type(self, typ):
+        assert self._schema is not None
+
         # Map the various integer types to plain int
         if typ.json_type() == 'int':
             typ = self._schema.lookup_type('int')
@@ -225,6 +227,8 @@ def visit_alternate_type(self, name, info, ifcond, features, variants):
     def visit_command(self, name, info, ifcond, features,
                       arg_type, ret_type, gen, success_response, boxed,
                       allow_oob, allow_preconfig, coroutine):
+        assert self._schema is not None
+
         arg_type = arg_type or self._schema.the_empty_object_type
         ret_type = ret_type or self._schema.the_empty_object_type
         obj = {'arg-type': self._use_type(arg_type),
@@ -234,6 +238,7 @@ def visit_command(self, name, info, ifcond, features,
         self._gen_tree(name, 'command', obj, ifcond, features)
 
     def visit_event(self, name, info, ifcond, features, arg_type, boxed):
+        assert self._schema is not None
         arg_type = arg_type or self._schema.the_empty_object_type
         self._gen_tree(name, 'event', {'arg-type': self._use_type(arg_type)},
                        ifcond, features)
-- 
2.26.2



  parent reply	other threads:[~2021-02-19 12:13 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-19 12:04 [PATCH 00/18] QAPI patches patches for 2021-02-18 Markus Armbruster
2021-02-19 12:04 ` [PATCH 01/18] qapi: Replace List[str] with Sequence[str] for ifcond Markus Armbruster
2021-02-19 12:04 ` Markus Armbruster [this message]
2021-02-19 12:04 ` [PATCH 03/18] qapi/introspect.py: use _make_tree for features nodes Markus Armbruster
2021-02-19 12:04 ` [PATCH 04/18] qapi/introspect.py: add _gen_features helper Markus Armbruster
2021-02-19 12:04 ` [PATCH 05/18] qapi/introspect.py: guard against ifcond/comment misuse Markus Armbruster
2021-02-19 12:04 ` [PATCH 06/18] qapi/introspect.py: Unify return type of _make_tree() Markus Armbruster
2021-02-19 12:04 ` [PATCH 07/18] qapi/introspect.py: replace 'extra' dict with 'comment' argument Markus Armbruster
2021-02-19 12:04 ` [PATCH 08/18] qapi/introspect.py: Always define all 'extra' dict keys Markus Armbruster
2021-02-19 12:04 ` [PATCH 09/18] qapi/introspect.py: Introduce preliminary tree typing Markus Armbruster
2021-02-19 12:04 ` [PATCH 10/18] qapi/introspect.py: create a typed 'Annotated' data strutcure Markus Armbruster
2021-02-19 12:04 ` [PATCH 11/18] qapi/introspect.py: improve _tree_to_qlit error message Markus Armbruster
2021-02-19 12:04 ` [PATCH 12/18] qapi/introspect.py: improve readability of _tree_to_qlit Markus Armbruster
2021-02-19 12:04 ` [PATCH 13/18] qapi/introspect.py: remove _gen_variants helper Markus Armbruster
2021-02-19 12:04 ` [PATCH 14/18] qapi/introspect.py: add type hint annotations Markus Armbruster
2021-02-19 12:04 ` [PATCH 15/18] qapi/introspect.py: Add docstrings to _gen_tree and _tree_to_qlit Markus Armbruster
2021-02-19 12:04 ` [PATCH 16/18] qapi/introspect.py: Update copyright and authors list Markus Armbruster
2021-02-19 12:04 ` [PATCH 17/18] qapi/introspect.py: Type _gen_tree variants as Sequence[str] Markus Armbruster
2021-02-19 12:04 ` [PATCH 18/18] qapi/introspect.py: set _gen_tree's default ifcond argument to () Markus Armbruster
2021-02-19 14:49 ` [PATCH 00/18] QAPI patches patches for 2021-02-18 Markus Armbruster

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=20210219120422.600850-3-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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).