From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: eblake@redhat.com, armbru@redhat.com,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH 17/30] qmp-commands: move 'migrate-incoming' doc to schema
Date: Thu, 22 Sep 2016 13:22:52 +0400 [thread overview]
Message-ID: <20160922092305.2895-18-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20160922092305.2895-1-marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
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
next prev parent reply other threads:[~2016-09-22 9:24 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-22 9:22 [Qemu-devel] [PATCH 00/30] Move qapi documentation to schema (part 2/5) Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 01/30] qmp-commands: move 'pmemsave' doc to schema Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 02/30] qmp-commands: move 'cont' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 03/30] qmp-commands: move 'system_wakeup' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 04/30] qmp-commands: move 'inject-nmi' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 05/30] qmp-commands: move 'set_link' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 06/30] qmp-commands: move 'balloon' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 07/30] qmp-commands: move 'transaction' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 08/30] qmp-commands: move 'human-monitor-command' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 09/30] qmp-commands: move 'migrate_cancel' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 10/30] qmp-commands: move 'migrate_set_downtime' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 11/30] qmp-commands: move 'migrate_set_speed' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 12/30] qmp-commands: move 'query-migrate-cache-size' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 13/30] qmp-commands: move 'set_password' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 14/30] qmp-commands: move 'expire_password' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 15/30] qmp-commands: move 'change' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 16/30] qmp-commands: move 'migrate' " Marc-André Lureau
2016-09-22 9:22 ` Marc-André Lureau [this message]
2016-09-22 9:22 ` [Qemu-devel] [PATCH 18/30] qmp-commands: move 'xen-save-devices-state' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 19/30] qmp-commands: move 'xen-set-global-dirty-log' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 20/30] qmp-commands: move 'device_del' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 21/30] qmp-commands: move 'dump-guest-memory' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 22/30] qmp-commands: move 'query-dump-guest-memory-capability' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 23/30] qmp-commands: move 'dump-skeys' " Marc-André Lureau
2016-09-22 9:22 ` [Qemu-devel] [PATCH 24/30] qmp-commands: move 'netdev_add' " Marc-André Lureau
2016-09-22 9:23 ` [Qemu-devel] [PATCH 25/30] qmp-commands: move 'netdev_del' " Marc-André Lureau
2016-09-22 9:23 ` [Qemu-devel] [PATCH 26/30] qmp-commands: move 'object-add' " Marc-André Lureau
2016-09-22 9:23 ` [Qemu-devel] [PATCH 27/30] qmp-commands: move 'object-del' " Marc-André Lureau
2016-09-22 9:23 ` [Qemu-devel] [PATCH 28/30] qmp-commands: move 'getfd' " Marc-André Lureau
2016-09-22 9:23 ` [Qemu-devel] [PATCH 29/30] qmp-commands: move 'closefd' " Marc-André Lureau
2016-09-22 9:23 ` [Qemu-devel] [PATCH 30/30] qmp-commands: move 'add-fd' " Marc-André Lureau
2016-09-22 13:12 ` [Qemu-devel] [PATCH 00/30] Move qapi documentation to schema (part 2/5) Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160922092305.2895-18-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).