Commit 244d04db authored by Eric Blake's avatar Eric Blake Committed by Michael Tokarev
Browse files

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, commit 3282eca4 for blockdev-snapshot re-added the
extra "options" layer which had been cleaned up in commit 0153d2f5.

This clears up all regressions identified over the range
02b351d8..bd6092e4:
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: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 2283adfb

qapi/block-core.json

+14 −14
Original line number Diff line number Diff line
@@ -1206,11 +1206,11 @@ 
# Example:

#

# -> { "execute": "blockdev-add",

#      "arguments": { "options": { "driver": "qcow2",

#      "arguments": { "driver": "qcow2",

#                     "node-name": "node1534",

#                     "file": { "driver": "file",

#                               "filename": "hd1.qcow2" },

#                                  "backing": "" } } }

#                     "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",

#          "node-name": "node0",

#          "driver": "raw",

#          "file": { "driver": "file",

#                                 "filename": "fedora.iso" } } } }

#                    "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",

#          "driver": "raw",

#          "node-name": "new_node",

#          "file": { "driver": "file",

#                                  "filename": "test.raw" } } } }

#                    "filename": "test.raw" } } }

# <- { "return": {} }

# -> { "execute": "x-blockdev-change",

#      "arguments": { "parent": "disk1",

qapi/block.json

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ 
#

# Example:

#

# -> { "execute": "eject", "arguments": { "device": "ide1-0-1" } }

# -> { "execute": "eject", "arguments": { "id": "ide1-0-1" } }

# <- { "return": {} }

##

{ 'command': 'eject',