In the process of getting rid of docs/qmp-commands.txt, we
managed to regress on any text that changed after the point
where the move was first branched and when the move actually
occurred. For example, commit 3282eca for blockdev-snapshot
re-added the extra "options" layer which had been cleaned up
in commit 0153d2f.
While I didn't audit for all such regressions, I did scrub
for all bogus uses of nested "options".
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
qapi/block-core.json | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 6b974b9..3bd7fa2 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -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": {} }
#
@@ -3237,10 +3237,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",
@@ -3693,10 +3693,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",
--
2.9.4
