summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Snow2021-02-16 03:17:58 +0100
committerMarkus Armbruster2021-02-18 19:37:54 +0100
commitd4c5b429fd18d30f2e23aef6e944fe40f2319024 (patch)
tree650acff53a7e6570bb3230390f093aba34060ce3
parentqapi/introspect.py: replace 'extra' dict with 'comment' argument (diff)
downloadqemu-d4c5b429fd18d30f2e23aef6e944fe40f2319024.tar.gz
qemu-d4c5b429fd18d30f2e23aef6e944fe40f2319024.tar.xz
qemu-d4c5b429fd18d30f2e23aef6e944fe40f2319024.zip
qapi/introspect.py: Always define all 'extra' dict keys
This mimics how a typed object works, where 'if' and 'comment' are always set, regardless of if they have a value set or not. It is safe to do this because of the way that _tree_to_qlit processes these values (using dict.get with a default of None), resulting in no change of output from _tree_to_qlit. There are no other users of this data. Signed-off-by: John Snow <jsnow@redhat.com> Message-Id: <20210216021809.134886-9-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, 4 insertions, 5 deletions
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index c4326d42cb..88af5383d5 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -27,11 +27,10 @@ from .schema import (
def _make_tree(obj, ifcond, comment=None):
- extra = {}
- if ifcond:
- extra['if'] = ifcond
- if comment:
- extra['comment'] = comment
+ extra = {
+ 'if': ifcond,
+ 'comment': comment
+ }
return (obj, extra)