aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2015-05-29 19:52:52 +0100
committerMichael Tokarev <mjt@tls.msk.ru>2015-06-03 14:21:24 +0300
commit1597051b84b816c9608e1ee0947f8e6dc9876b56 (patch)
treedbb26863aac2d06c8d26ace64c2863e4da0a6dcc /qemu-options.hx
parent26c8acb3f326166bf9dc60c3e8184f4b862e8451 (diff)
downloadqemu-arm-1597051b84b816c9608e1ee0947f8e6dc9876b56.tar.gz
Add -incoming help text
The help/man text for -incoming defer didn't make it through the merge of the code that implemented it. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx9
1 files changed, 8 insertions, 1 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index 7edd1f18ce..b3db6cbe86 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3239,7 +3239,9 @@ DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \
"-incoming fd:fd\n" \
"-incoming exec:cmdline\n" \
" accept incoming migration on given file descriptor\n" \
- " or from given external command\n",
+ " or from given external command\n" \
+ "-incoming defer\n" \
+ " wait for the URI to be specified via migrate_incoming\n",
QEMU_ARCH_ALL)
STEXI
@item -incoming tcp:[@var{host}]:@var{port}[,to=@var{maxport}][,ipv4][,ipv6]
@@ -3255,6 +3257,11 @@ Accept incoming migration from a given filedescriptor.
@item -incoming exec:@var{cmdline}
Accept incoming migration as an output from specified external command.
+
+@item -incoming defer
+Wait for the URI to be specified via migrate_incoming. The monitor can
+be used to change settings (such as migration parameters) prior to issuing
+the migrate_incoming to allow the migration to begin.
ETEXI
DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \