[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/30] qmp-commands: move 'device_del' doc to schema
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 20/30] qmp-commands: move 'device_del' doc to schema |
Date: |
Thu, 22 Sep 2016 13:22:55 +0400 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
docs/qmp-commands.txt | 19 -------------------
qapi-schema.json | 11 ++++++++++-
2 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index dc7c2f11..0359516 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -109,25 +109,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 59a5e41..19bb04d 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3023,7 +3023,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
@@ -3036,6 +3036,15 @@
# 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'} }
--
2.10.0
- [Qemu-devel] [PATCH 10/30] qmp-commands: move 'migrate_set_downtime' doc to schema, (continued)
- [Qemu-devel] [PATCH 10/30] qmp-commands: move 'migrate_set_downtime' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 11/30] qmp-commands: move 'migrate_set_speed' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 12/30] qmp-commands: move 'query-migrate-cache-size' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 13/30] qmp-commands: move 'set_password' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 14/30] qmp-commands: move 'expire_password' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 15/30] qmp-commands: move 'change' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 16/30] qmp-commands: move 'migrate' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 17/30] qmp-commands: move 'migrate-incoming' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 18/30] qmp-commands: move 'xen-save-devices-state' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 19/30] qmp-commands: move 'xen-set-global-dirty-log' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 20/30] qmp-commands: move 'device_del' doc to schema,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 21/30] qmp-commands: move 'dump-guest-memory' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 22/30] qmp-commands: move 'query-dump-guest-memory-capability' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 23/30] qmp-commands: move 'dump-skeys' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 24/30] qmp-commands: move 'netdev_add' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 25/30] qmp-commands: move 'netdev_del' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 26/30] qmp-commands: move 'object-add' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 27/30] qmp-commands: move 'object-del' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 28/30] qmp-commands: move 'getfd' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 29/30] qmp-commands: move 'closefd' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 30/30] qmp-commands: move 'add-fd' doc to schema, Marc-André Lureau, 2016/09/22