From: Markus Armbruster <[email protected]> Instead of emitting the comment for certain meta-types, simply emit it when introspection name and name differ.
This additionally emits it for arrays, which is fine. Signed-off-by: Markus Armbruster <[email protected]> Reviewed-by: Marc-André Lureau <[email protected]> --- scripts/qapi/introspect.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 644461560c64..49d1ed2897e8 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -253,12 +253,12 @@ def _gen_tree(self, name: str, mtype: str, obj: Dict[str, object], Will be omitted from the output if empty. """ comment: Optional[str] = None - if mtype not in ('command', 'event', 'builtin', 'array'): - if not self._unmask: - # Output a comment to make it easy to map masked names - # back to the source when reading the generated output. - comment = f'"{self._name(name)}" = {name}' - obj['name'] = self._name(name) + introspection_name = self._name(name) + if introspection_name != name: + # Output a comment to make it easy to map masked names + # back to the source when reading the generated output. + comment = f'"{introspection_name}" = {name}' + obj['name'] = introspection_name obj['meta-type'] = mtype if features: obj['features'] = self._gen_features(features) -- 2.56.0.116.g6de20f6092dc
