[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/30] qmp-commands: move 'migrate-incoming' doc to
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 17/30] qmp-commands: move 'migrate-incoming' doc to schema |
Date: |
Thu, 22 Sep 2016 13:22:52 +0400 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
docs/qmp-commands.txt | 20 --------------------
qapi-schema.json | 20 +++++++++++++++++---
2 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index 799ac72..32e5b0a 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -217,26 +217,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 d9f4b1e..cd77264 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2915,9 +2915,23 @@
# 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' } }
--
2.10.0
- [Qemu-devel] [PATCH 07/30] qmp-commands: move 'transaction' doc to schema, (continued)
- [Qemu-devel] [PATCH 07/30] qmp-commands: move 'transaction' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 08/30] qmp-commands: move 'human-monitor-command' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 09/30] qmp-commands: move 'migrate_cancel' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 10/30] qmp-commands: move 'migrate_set_downtime' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 11/30] qmp-commands: move 'migrate_set_speed' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 12/30] qmp-commands: move 'query-migrate-cache-size' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 13/30] qmp-commands: move 'set_password' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 14/30] qmp-commands: move 'expire_password' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 15/30] qmp-commands: move 'change' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 16/30] qmp-commands: move 'migrate' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 17/30] qmp-commands: move 'migrate-incoming' doc to schema,
Marc-André Lureau <=
- [Qemu-devel] [PATCH 18/30] qmp-commands: move 'xen-save-devices-state' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 19/30] qmp-commands: move 'xen-set-global-dirty-log' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 20/30] qmp-commands: move 'device_del' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 21/30] qmp-commands: move 'dump-guest-memory' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 22/30] qmp-commands: move 'query-dump-guest-memory-capability' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 23/30] qmp-commands: move 'dump-skeys' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 24/30] qmp-commands: move 'netdev_add' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 25/30] qmp-commands: move 'netdev_del' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 26/30] qmp-commands: move 'object-add' doc to schema, Marc-André Lureau, 2016/09/22
- [Qemu-devel] [PATCH 27/30] qmp-commands: move 'object-del' doc to schema, Marc-André Lureau, 2016/09/22