aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2018-12-21 04:35:25 -0500
committerEric Blake <eblake@redhat.com>2019-01-14 10:09:46 -0600
commit0706e87d72b02f28bfa04400388f9c9df1b9c943 (patch)
treedf8b5a48e7b7e8be90826aa2d3c0fff739905ec7 /vl.c
parentfa1151f811ffa1973b6980b09f095d0e2ebea08b (diff)
downloadqemu-0706e87d72b02f28bfa04400388f9c9df1b9c943.zip
qemu-0706e87d72b02f28bfa04400388f9c9df1b9c943.tar.gz
qemu-0706e87d72b02f28bfa04400388f9c9df1b9c943.tar.bz2
iotests: add qmp recursive sorting function
Python before 3.6 does not sort dictionaries (including kwargs). Therefore, printing QMP objects involves sorting the keys to have a predictable ordering in the iotests output. This means that iotests output will sometimes show arguments in an order not specified by the test author. Presently, we accomplish this by using json.dumps' sort_keys argument, where we only serialize the arguments dictionary, but not the command. However, if we want to pretty-print QMP objects being sent to the QEMU process, we need to build the entire command before logging it. Ordinarily, this would then involve "arguments" being sorted above "execute", which would necessitate a rather ugly and harder-to-read change to many iotests outputs. To facilitate pretty-printing AND maintaining predictable output AND having "arguments" sort after "execute", add a custom sort function that takes a dictionary and recursively builds an OrderedDict that maintains the specific key order we wish to see in iotests output. The qmp_log function uses this to build a QMP object that keeps "execute" above "arguments", but sorts all keys and keys in any subdicts in "arguments" lexicographically to maintain consistent iotests output, with no incompatible changes to any current test. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20181221093529.23855-8-jsnow@redhat.com> Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'vl.c')
0 files changed, 0 insertions, 0 deletions