summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Edmondson2020-10-13 16:14:14 +0200
committerMarkus Armbruster2020-10-27 11:11:06 +0100
commitfca9d723232a8bc756ca74982ee342f73ebf833c (patch)
tree30eb88bc89e9e9f03b11bdb6d9c2b42ef484a66a
parentMerge remote-tracking branch 'remotes/philmd-gitlab/tags/sd-next-20201026' in... (diff)
downloadqemu-fca9d723232a8bc756ca74982ee342f73ebf833c.tar.gz
qemu-fca9d723232a8bc756ca74982ee342f73ebf833c.tar.xz
qemu-fca9d723232a8bc756ca74982ee342f73ebf833c.zip
qmp-shell: Sort by key when pretty-printing
If the user selects pretty-printing (-p) the contents of any dictionaries in the output are sorted by key. Signed-off-by: David Edmondson <david.edmondson@oracle.com> Message-Id: <20201013141414.18398-1-david.edmondson@oracle.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rwxr-xr-xscripts/qmp/qmp-shell2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index c5eef06f3f..b4d06096ab 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -260,7 +260,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
indent = None
if self._pretty:
indent = 4
- jsobj = json.dumps(qmp, indent=indent)
+ jsobj = json.dumps(qmp, indent=indent, sort_keys=self._pretty)
print(str(jsobj))
def _execute_cmd(self, cmdline):