aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-06-23 13:24:40 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-01-16 09:15:28 +0100
commitdbdbddb96e55da26a503cfa107689b77f7d65dd9 (patch)
tree286f345dc12794d9f71a977284b2de497d73c6f6
parentb3ac5a0de9b88454e42d0ee2755cc1083ccc25bb (diff)
downloadqemu-dbdbddb96e55da26a503cfa107689b77f7d65dd9.zip
qemu-dbdbddb96e55da26a503cfa107689b77f7d65dd9.tar.gz
qemu-dbdbddb96e55da26a503cfa107689b77f7d65dd9.tar.bz2
qmp-commands: move 'migrate-incoming' doc to schema
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--docs/qmp-commands.txt20
-rw-r--r--qapi-schema.json21
2 files changed, 18 insertions, 23 deletions
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index 7194ab1..116d2f7 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -219,26 +219,6 @@ Example:
"arguments": { "enable": true } }
<- { "return": {} }
-migrate-incoming
-----------------
-
-Continue an incoming migration
-
-Arguments:
-
-- "uri": Source/listening URI (json-string)
-
-Example:
-
--> { "execute": "migrate-incoming", "arguments": { "uri": "tcp::4446" } }
-<- { "return": {} }
-
-Notes:
-
-(1) QEMU must be started with -incoming defer to allow migrate-incoming to
- be used
-(2) The uri format is the same as for -incoming
-
migrate-set-cache-size
----------------------
diff --git a/qapi-schema.json b/qapi-schema.json
index ef27197..f021cd0 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3005,9 +3005,24 @@
# Returns: nothing on success
#
# Since: 2.3
-# Note: It's a bad idea to use a string for the uri, but it needs to stay
-# compatible with -incoming and the format of the uri is already exposed
-# above libvirt
+#
+# Notes:
+#
+# 1. It's a bad idea to use a string for the uri, but it needs to stay
+# compatible with -incoming and the format of the uri is already exposed
+# above libvirt.
+#
+# 2. QEMU must be started with -incoming defer to allow migrate-incoming to
+# be used.
+#
+# 3. The uri format is the same as for -incoming
+#
+# Example:
+#
+# -> { "execute": "migrate-incoming",
+# "arguments": { "uri": "tcp::4446" } }
+# <- { "return": {} }
+#
##
{ 'command': 'migrate-incoming', 'data': {'uri': 'str' } }