From b3ac5a0de9b88454e42d0ee2755cc1083ccc25bb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Thu, 23 Jun 2016 13:23:44 +0200
Subject: [PATCH] qmp-commands: move 'migrate' doc to schema
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 docs/qmp-commands.txt | 24 ------------------------
 qapi-schema.json      | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index f4645f532f..7194ab1e2b 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -219,30 +219,6 @@ Example:
      "arguments": { "enable": true } }
 <- { "return": {} }
 
-migrate
--------
-
-Migrate to URI.
-
-Arguments:
-
-- "blk": block migration, full disk copy (json-bool, optional)
-- "inc": incremental disk copy (json-bool, optional)
-- "uri": Destination URI (json-string)
-
-Example:
-
--> { "execute": "migrate", "arguments": { "uri": "tcp:0:4446" } }
-<- { "return": {} }
-
-Notes:
-
-(1) The 'query-migrate' command should be used to check migration's progress
-    and final result (this information is provided by the 'status' member)
-(2) All boolean arguments default to false
-(3) The user Monitor's "detach" argument is invalid in QMP and should not
-    be used
-
 migrate-incoming
 ----------------
 
diff --git a/qapi-schema.json b/qapi-schema.json
index e7c14b994d..ef27197460 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2973,6 +2973,22 @@
 # Returns: nothing on success
 #
 # Since: 0.14.0
+#
+# Notes:
+#
+# 1. The 'query-migrate' command should be used to check migration's progress
+#    and final result (this information is provided by the 'status' member)
+#
+# 2. All boolean arguments default to false
+#
+# 3. The user Monitor's "detach" argument is invalid in QMP and should not
+#    be used
+#
+# Example:
+#
+# -> { "execute": "migrate", "arguments": { "uri": "tcp:0:4446" } }
+# <- { "return": {} }
+#
 ##
 { 'command': 'migrate',
   'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } }
-- 
2.11.4.GIT