qapi: Fix some QMP documentation regressions
In the process of getting rid of docs/qmp-commands.txt, we managed to regress on some of the text that changed after the point where the move was first branched and when the move actually occurred. For example, commit3282eca
for blockdev-snapshot re-added the extra "options" layer which had been cleaned up in commit0153d2f
. This clears up all regressions identified over the range 02b351d..bd6092e: https://lists.gnu.org/archive/html/qemu-devel/2017-05/msg05127.html as well as a cleanup to x-blockdev-remove-medium to prefer 'id' over 'device' (matching the cleanup for 'eject'). Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
parent
2283adfb0a
commit
244d04db58
@ -1206,11 +1206,11 @@
|
||||
# Example:
|
||||
#
|
||||
# -> { "execute": "blockdev-add",
|
||||
# "arguments": { "options": { "driver": "qcow2",
|
||||
# "node-name": "node1534",
|
||||
# "file": { "driver": "file",
|
||||
# "filename": "hd1.qcow2" },
|
||||
# "backing": "" } } }
|
||||
# "arguments": { "driver": "qcow2",
|
||||
# "node-name": "node1534",
|
||||
# "file": { "driver": "file",
|
||||
# "filename": "hd1.qcow2" },
|
||||
# "backing": "" } }
|
||||
#
|
||||
# <- { "return": {} }
|
||||
#
|
||||
@ -3214,7 +3214,7 @@
|
||||
# <- { "return": {} }
|
||||
#
|
||||
# -> { "execute": "x-blockdev-remove-medium",
|
||||
# "arguments": { "device": "ide0-1-0" } }
|
||||
# "arguments": { "id": "ide0-1-0" } }
|
||||
#
|
||||
# <- { "return": {} }
|
||||
#
|
||||
@ -3245,10 +3245,10 @@
|
||||
#
|
||||
# -> { "execute": "blockdev-add",
|
||||
# "arguments": {
|
||||
# "options": { "node-name": "node0",
|
||||
# "driver": "raw",
|
||||
# "file": { "driver": "file",
|
||||
# "filename": "fedora.iso" } } } }
|
||||
# "node-name": "node0",
|
||||
# "driver": "raw",
|
||||
# "file": { "driver": "file",
|
||||
# "filename": "fedora.iso" } } }
|
||||
# <- { "return": {} }
|
||||
#
|
||||
# -> { "execute": "x-blockdev-insert-medium",
|
||||
@ -3701,10 +3701,10 @@
|
||||
# 1. Add a new node to a quorum
|
||||
# -> { "execute": "blockdev-add",
|
||||
# "arguments": {
|
||||
# "options": { "driver": "raw",
|
||||
# "node-name": "new_node",
|
||||
# "file": { "driver": "file",
|
||||
# "filename": "test.raw" } } } }
|
||||
# "driver": "raw",
|
||||
# "node-name": "new_node",
|
||||
# "file": { "driver": "file",
|
||||
# "filename": "test.raw" } } }
|
||||
# <- { "return": {} }
|
||||
# -> { "execute": "x-blockdev-change",
|
||||
# "arguments": { "parent": "disk1",
|
||||
|
@ -180,7 +180,7 @@
|
||||
#
|
||||
# Example:
|
||||
#
|
||||
# -> { "execute": "eject", "arguments": { "device": "ide1-0-1" } }
|
||||
# -> { "execute": "eject", "arguments": { "id": "ide1-0-1" } }
|
||||
# <- { "return": {} }
|
||||
##
|
||||
{ 'command': 'eject',
|
||||
|
Loading…
Reference in New Issue
Block a user