summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau2016-06-23 14:59:33 +0200
committerMarkus Armbruster2017-01-16 09:19:46 +0100
commitb480abf3b8e77ff43179ea3e980da4254aa89c57 (patch)
treedbd64f3759c94a551f44ffd37b153d671251dcb6
parentqmp-commands: move 'x-blockdev-remove-medium' doc to schema (diff)
downloadqemu-b480abf3b8e77ff43179ea3e980da4254aa89c57.tar.gz
qemu-b480abf3b8e77ff43179ea3e980da4254aa89c57.tar.xz
qemu-b480abf3b8e77ff43179ea3e980da4254aa89c57.zip
qmp-commands: move 'x-blockdev-insert-medium' 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.txt33
-rw-r--r--qapi/block-core.json17
2 files changed, 17 insertions, 33 deletions
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index 7e3a6ce773..3f34512955 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -343,39 +343,6 @@ named schema entities. Entities are commands, events and various
types. See docs/qapi-code-gen.txt for information on their structure
and intended use.
-x-blockdev-insert-medium
-------------------------
-
-Inserts a medium (a block driver state tree) into a block device. That block
-device's tray must currently be open (unless there is no attached guest device)
-and there must be no medium inserted already.
-
-This command is still a work in progress and is considered experimental.
-Stay away from it unless you want to help with its development.
-
-Arguments:
-
-- "device": block device name (deprecated, use @id instead)
- (json-string, optional)
-- "id": the name or QOM path of the guest device (json-string, optional)
-- "node-name": root node of the BDS tree to insert into the block device
-
-Example:
-
--> { "execute": "blockdev-add",
- "arguments": { { "node-name": "node0",
- "driver": "raw",
- "file": { "driver": "file",
- "filename": "fedora.iso" } } }
-
-<- { "return": {} }
-
--> { "execute": "x-blockdev-insert-medium",
- "arguments": { "id": "ide0-1-0",
- "node-name": "node0" } }
-
-<- { "return": {} }
-
x-blockdev-change
-----------------
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 7fb2f11bcd..94a170af91 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -3059,6 +3059,23 @@
# Stay away from it unless you want to help with its development.
#
# Since: 2.5
+#
+# Example:
+#
+# -> { "execute": "blockdev-add",
+# "arguments": {
+# "options": { "node-name": "node0",
+# "driver": "raw",
+# "file": { "driver": "file",
+# "filename": "fedora.iso" } } } }
+# <- { "return": {} }
+#
+# -> { "execute": "x-blockdev-insert-medium",
+# "arguments": { "id": "ide0-1-0",
+# "node-name": "node0" } }
+#
+# <- { "return": {} }
+#
##
{ 'command': 'x-blockdev-insert-medium',
'data': { '*device': 'str',