diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-20 12:04:02 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-20 12:10:23 +0000 |
commit | 4c0c9bbe78901a706497a8fa1a27935bafc20cf7 (patch) | |
tree | 43fe900e8e748606dcdb0ef22d10068cc4608aaa /scripts | |
parent | 46eef33b89e936ca793e13c4aeea1414e97e8dbb (diff) | |
parent | 1094fd3a6219923c8d1abfc7dee5af996a181e7a (diff) | |
download | qemu-4c0c9bbe78901a706497a8fa1a27935bafc20cf7.zip qemu-4c0c9bbe78901a706497a8fa1a27935bafc20cf7.tar.gz qemu-4c0c9bbe78901a706497a8fa1a27935bafc20cf7.tar.bz2 |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp:
monitor: Add object_add class argument completion.
monitor: Add object_del id argument completion.
monitor: Add device_add device argument completion.
monitor: Add device_del id argument completion.
qmp: expose list of supported character device backends
Use error_is_set() only when necessary
QMP: allow JSON dict arguments in qmp-shell
hmp: migrate command (without -d) now blocks correctly
Conflicts:
blockdev.c
[PMM: resolved trivial conflict in blockdev.c]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/qmp/qmp-shell | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index d6b420f..d374b35 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -31,6 +31,7 @@ # (QEMU) import qmp +import json import readline import sys import pprint @@ -107,6 +108,8 @@ class QMPShell(qmp.QEMUMonitorProtocol): value = True elif opt[1] == 'false': value = False + elif opt[1].startswith('{'): + value = json.loads(opt[1]) else: value = opt[1] qmpcmd['arguments'][opt[0]] = value |