From: Dr. David Alan Gilbert Date: Fri, 29 May 2015 18:52:52 +0000 (+0100) Subject: Add -incoming help text X-Git-Tag: v2.4.0-rc0~100^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1597051b84b816c9608e1ee0947f8e6dc9876b56;p=thirdparty%2Fqemu.git 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 Reviewed-by: Markus Armbruster Signed-off-by: Michael Tokarev --- diff --git a/qemu-options.hx b/qemu-options.hx index 7edd1f18ce4..b3db6cbe86f 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, \