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-22 16:51:36 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-09-22 16:51:37 +0100
commit482d7c0854423608e20e56b5824b7340bd3af7df (patch)
treec035d32bede1323bd40a53aaa39dd4528904f89d /hmp-commands.hx
parent6138fbdebd72f6822367e88d14ddc635b5a5ddfb (diff)
parentabadcbc838a3b256819fd8932c34a4af41ec187f (diff)
downloadfocaccia-qemu-482d7c0854423608e20e56b5824b7340bd3af7df.tar.gz
focaccia-qemu-482d7c0854423608e20e56b5824b7340bd3af7df.zip
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-09-22' into staging
Monitor patches

# gpg: Signature made Tue 22 Sep 2015 10:33:34 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-22:
  hmp: Restore "info pci"
  monitor: allow device_del to accept QOM paths

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hmp-commands.hx')
-rw-r--r--hmp-commands.hx3
1 files changed, 2 insertions, 1 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx
index a511004434..3a4ae3950a 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -676,7 +676,8 @@ ETEXI
 STEXI
 @item device_del @var{id}
 @findex device_del
-Remove device @var{id}.
+Remove device @var{id}. @var{id} may be a short ID
+or a QOM object path.
 ETEXI
 
     {