summary refs log tree commit diff stats
path: root/hmp-commands.hx
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-09-04 17:37:50 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-09-04 17:37:50 +0100
commitb597aa037dbd98014c8dec3d69a5e2240f432533 (patch)
tree065f5582704130451833b6c9a6f5722ffa39fd83 /hmp-commands.hx
parentb5bff7518d8e4feda95f5c523cb24f72863c1df6 (diff)
parent62313160cb5b6bdfbd77a063e94a5a7d25e59f2b (diff)
downloadfocaccia-qemu-b597aa037dbd98014c8dec3d69a5e2240f432533.tar.gz
focaccia-qemu-b597aa037dbd98014c8dec3d69a5e2240f432533.zip
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-09-04' into staging
Monitor patches

# gpg: Signature made Fri 04 Sep 2015 12:40:11 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-monitor-2015-09-04:
  hmp: add info iothreads command
  qmp-shell: add documentation

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hmp-commands.hx')
-rw-r--r--hmp-commands.hx2
1 files changed, 2 insertions, 0 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx
index d6e81e4df3..286dcc75aa 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1809,6 +1809,8 @@ show the TPM device
 show the memory devices
 @item info skeys
 Display the value of a storage key (s390 only)
+@item info iothreads
+show iothreads
 @end table
 ETEXI