From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 23 Jun 2016 12:01:09 +0000 (+0200)
Subject: qmp-commands: move 'block_passwd' doc to schema
X-Git-Tag: v2.9.0-rc0~148^2~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91f96b643c43cf8253d383f505f10737e3149ca2;p=thirdparty%2Fqemu.git

qmp-commands: move 'block_passwd' doc to schema

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---

diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index 41797c8f4d2..8bf810be295 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -652,23 +652,6 @@ Arguments:
 Returns: Nothing on success
          If "device" does not exist or cannot be determined, DeviceNotFound
 
-block_passwd
-------------
-
-Set the password of encrypted block devices.
-
-Arguments:
-
-- "device": device name (json-string)
-- "node-name": name in the block driver state graph (json-string)
-- "password": password (json-string)
-
-Example:
-
--> { "execute": "block_passwd", "arguments": { "device": "ide0-hd0",
-                                               "password": "12345" } }
-<- { "return": {} }
-
 block_set_io_throttle
 ------------
 
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 4a90df446cc..439463dec5f 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -971,6 +971,13 @@
 #         occur if an invalid password is specified.
 #
 # Since: 0.14.0
+#
+# Example:
+#
+# -> { "execute": "block_passwd", "arguments": { "device": "ide0-hd0",
+#                                                "password": "12345" } }
+# <- { "return": {} }
+#
 ##
 { 'command': 'block_passwd', 'data': {'*device': 'str',
                                       '*node-name': 'str', 'password': 'str'} }