[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/22] qapi: Fix some QMP documentation regressions
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 15/22] qapi: Fix some QMP documentation regressions |
Date: |
Sun, 4 Jun 2017 18:45:19 +0300 |
From: Eric Blake <address@hidden>
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 3282eca for blockdev-snapshot re-added the
extra "options" layer which had been cleaned up in commit 0153d2f.
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
qapi/block-core.json | 28 ++++++++++++++--------------
qapi/block.json | 2 +-
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 309b1df214..88a7471a23 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": {} }
#
@@ -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",
diff --git a/qapi/block.json b/qapi/block.json
index 6a2fdc73f7..414b61bde7 100644
--- a/qapi/block.json
+++ b/qapi/block.json
@@ -180,7 +180,7 @@
#
# Example:
#
-# -> { "execute": "eject", "arguments": { "device": "ide1-0-1" } }
+# -> { "execute": "eject", "arguments": { "id": "ide1-0-1" } }
# <- { "return": {} }
##
{ 'command': 'eject',
--
2.11.0
- [Qemu-devel] [PULL 08/22] trivial: Remove unneeded ifndef in memory.h, (continued)
- [Qemu-devel] [PULL 08/22] trivial: Remove unneeded ifndef in memory.h, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 10/22] target/arm: add data cache invalidation cp15 instruction to cortex-r5, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 07/22] altera_timer: fix incorrect memset, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 05/22] tests/libqtest: Print error instead of aborting when env variable is missing, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 22/22] hw/core: nmi.c can be compiled as common-obj nowadays, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 11/22] hw/xtensa: sim: use g_string/g_new, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 14/22] hw/mips: add missing include, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 01/22] qemu-doc: Move the qemu-ga description into a separate chapter, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 17/22] qemu-ga: remove useless allocation, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 19/22] ide-test: check return of fwrite, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 15/22] qapi: Fix some QMP documentation regressions,
Michael Tokarev <=
- [Qemu-devel] [PULL 18/22] help: Add newline to end of thread option help text, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 04/22] docs/qdev-device-use.txt: update section Default Devices, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 13/22] register: display register prefix (name) since it is available, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 20/22] dump: fix memory_mapping_filter leak, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 03/22] docs qemu-doc: Avoid ide-drive, it's deprecated, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 16/22] scsi/lsi53c895a: Remove unused lsi_mem_*() return value, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 12/22] hw/sparc: use ARRAY_SIZE() macro, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 06/22] configure: Detect native NetBSD curses(3), Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 21/22] ivshmem-server: ivshmem-client: Build when eventfd() is available, Michael Tokarev, 2017/06/04
- [Qemu-devel] [PULL 09/22] block: Correct documentation for BLOCK_WRITE_THRESHOLD, Michael Tokarev, 2017/06/04