From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyPOw-0001Ng-7P for qemu-devel@nongnu.org; Fri, 29 May 2015 14:53:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyPOq-0006Dk-7p for qemu-devel@nongnu.org; Fri, 29 May 2015 14:53:02 -0400 From: "Dr. David Alan Gilbert (git)" Date: Fri, 29 May 2015 19:52:52 +0100 Message-Id: <1432925572-487-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH 1/1] Add -incoming help text List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, armbru@redhat.com, quintela@redhat.com--dry-run From: "Dr. David Alan Gilbert" 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 --- qemu-options.hx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qemu-options.hx b/qemu-options.hx index dad49cf..3085412 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3238,7 +3238,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] @@ -3254,6 +3256,8 @@ 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. ETEXI DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \ -- 2.4.1