aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2021-02-15 21:18:03 -0500
committerMarkus Armbruster <armbru@redhat.com>2021-02-18 19:45:20 +0100
commitcf5db2142b674ebab8e0799fd07e3884cfb00fc5 (patch)
tree5c261f31c125217248b0b06e56c2e599ae4ef907
parentc0e8d9f3c199357d89f362c54e1edced82c3c084 (diff)
downloadqemu-cf5db2142b674ebab8e0799fd07e3884cfb00fc5.zip
qemu-cf5db2142b674ebab8e0799fd07e3884cfb00fc5.tar.gz
qemu-cf5db2142b674ebab8e0799fd07e3884cfb00fc5.tar.bz2
qapi/introspect.py: remove _gen_variants helper
It is easier to give a name to all of the dictly-typed objects we pass around in introspect.py by removing this helper, as it does not return an object that has any knowable type by itself. Inline it into its only caller instead. Signed-off-by: John Snow <jsnow@redhat.com> Message-Id: <20210216021809.134886-14-jsnow@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--scripts/qapi/introspect.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 26e6f73..da7bc88 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -242,10 +242,6 @@ const QLitObject %(c_name)s = %(c_string)s;
obj['features'] = self._gen_features(member.features)
return Annotated(obj, member.ifcond)
- def _gen_variants(self, tag_name, variants):
- return {'tag': tag_name,
- 'variants': [self._gen_variant(v) for v in variants]}
-
def _gen_variant(self, variant):
obj = {'case': variant.name, 'type': self._use_type(variant.type)}
return Annotated(obj, variant.ifcond)
@@ -269,9 +265,8 @@ const QLitObject %(c_name)s = %(c_string)s;
members, variants):
obj = {'members': [self._gen_member(m) for m in members]}
if variants:
- obj.update(self._gen_variants(variants.tag_member.name,
- variants.variants))
-
+ obj['tag'] = variants.tag_member.name
+ obj['variants'] = [self._gen_variant(v) for v in variants.variants]
self._gen_tree(name, 'object', obj, ifcond, features)
def visit_alternate_type(self, name, info, ifcond, features, variants):