Received: from eggs.gnu.org ([2001:4830:134:3::10]:56704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzKRE-0001cg-Cd for qemu-devel@nongnu.org; Mon, 01 Jun 2015 03:47:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzKR8-0004Hc-PS for qemu-devel@nongnu.org; Mon, 01 Jun 2015 03:47:12 -0400 From: Markus Armbruster References: <1432925572-487-1-git-send-email-dgilbert@redhat.com> <5569C5F9.3080608@msgid.tls.msk.ru> Date: Mon, 01 Jun 2015 09:47:01 +0200 In-Reply-To: <5569C5F9.3080608@msgid.tls.msk.ru> (Michael Tokarev's message of "Sat, 30 May 2015 17:15:21 +0300") Message-ID: <87pp5flvka.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 1/1] Add -incoming help text List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Tokarev Cc: qemu-trivial@nongnu.org, quintela@redhat.com, "Dr. David Alan Gilbert (git)" , qemu-devel@nongnu.org Michael Tokarev writes: > 29.05.2015 21:52, Dr. David Alan Gilbert (git) wrote: >> 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. > > I wonder what's the reason of mentioning it twice with > such a short and _identical_ text each time... Because that's the way our documentation works. The first hunk patches the fourth argument of DEF(), which goes into -help. The second hunk patches STEXI..ETEXI, which goes via qemu-options.texi into qemu.1 and qemu-doc.{dvi,info,html,pdf}. > Maybe > it's a good idea to reword the second message a bit. > Because actually it is not clear what does the whole > thing mean, what qemu will do when starting? Will it > accept other commands? You're right in that .texi allows more verbose explanations than -help. David's text looks okay to me as is. Perhaps your questions inspire further improvements.