aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-06-23 13:27:06 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-01-16 09:15:29 +0100
commite389c0049afae90de2b958afa439dd9f47b12c1d (patch)
treee9700c3bca44326dcd6da09c513ce4b8511bcf2a
parenta4df6eff46e366e8c6ac69d93ea59f95ebd802fc (diff)
qmp-commands: move 'device_del' doc to schema
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--docs/qmp-commands.txt19
-rw-r--r--qapi-schema.json13
2 files changed, 12 insertions, 20 deletions
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index d7104e8721..8adc1060dc 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -111,25 +111,6 @@ Notes:
(2) It's possible to list device properties by running QEMU with the
"-device DEVICE,\?" command-line argument, where DEVICE is the device's name
-device_del
-----------
-
-Remove a device.
-
-Arguments:
-
-- "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": {} }
-
send-key
----------
diff --git a/qapi-schema.json b/qapi-schema.json
index 1c4039a085..affcad129a 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3114,7 +3114,7 @@
#
# Remove a device from a guest
#
-# @id: the name or QOM path of the device
+# @id: the device's ID or QOM path
#
# Returns: Nothing on success
# If @id is not a valid device, DeviceNotFound
@@ -3127,6 +3127,17 @@
# for all devices.
#
# Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "device_del",
+# "arguments": { "id": "net1" } }
+# <- { "return": {} }
+#
+# -> { "execute": "device_del",
+# "arguments": { "id": "/machine/peripheral-anon/device[0]" } }
+# <- { "return": {} }
+#
##
{ 'command': 'device_del', 'data': {'id': 'str'} }