summary refs log tree commit diff stats
path: root/qmp-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 /qmp-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 'qmp-commands.hx')
-rw-r--r--qmp-commands.hx7
1 files changed, 6 insertions, 1 deletions
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 66f03007ec..d2ba800d5e 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -321,13 +321,18 @@ Remove a device.
 
 Arguments:
 
-- "id": the device's ID (json-string)
+- "id": the device's ID or QOM path (json-string)
 
 Example:
 
 -> { "execute": "device_del", "arguments": { "id": "net1" } }
 <- { "return": {} }
 
+Example:
+
+-> { "execute": "device_del", "arguments": { "id": "/machine/peripheral-anon/device[0]" } }
+<- { "return": {} }
+
 EQMP
 
     {