Received: from eggs.gnu.org ([2001:4830:134:3::10]:47569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOjgl-0002qI-50 for qemu-devel@nongnu.org; Fri, 20 Feb 2015 04:16:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOjgg-00086R-4K for qemu-devel@nongnu.org; Fri, 20 Feb 2015 04:15:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOjgf-00086N-St for qemu-devel@nongnu.org; Fri, 20 Feb 2015 04:15:54 -0500 From: Markus Armbruster References: <1424346029-5410-1-git-send-email-dgilbert@redhat.com> <1424346029-5410-4-git-send-email-dgilbert@redhat.com> Date: Fri, 20 Feb 2015 10:15:48 +0100 In-Reply-To: <1424346029-5410-4-git-send-email-dgilbert@redhat.com> (David Alan Gilbert's message of "Thu, 19 Feb 2015 11:40:29 +0000") Message-ID: <87bnkp9c57.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 3/3] Document -incoming options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: quintela@redhat.com, liang.z.li@intel.com, mjt@tls.msk.ru, qemu-devel@nongnu.org, amit.shah@redhat.com, pbonzini@redhat.com "Dr. David Alan Gilbert (git)" writes: > From: "Dr. David Alan Gilbert" > > Document the various URI formats for -incoming, the previous > manpage and help text was wrong (out of date?) Thanks a lot for updating the docs. > > Signed-off-by: Dr. David Alan Gilbert > Reviewed-by: Juan Quintela > --- > qemu-options.hx | 29 ++++++++++++++++++++++++++--- > 1 file changed, 26 insertions(+), 3 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 85ca3ad..6d6d2a8 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -3169,12 +3169,35 @@ Set TB size. > ETEXI >=20=20 > DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \ > - "-incoming p prepare for incoming migration, listen on port p\n", > + "-incoming uri prepare for incoming migration, specifying source:\= n" \ > + " exec:command Execute 'command' use the stdout as= \n" \ > + " the migration stream\n" \ > + " fd:num listen on the given fd\n" \ > + " defer wait for the URI to be specified by= \n" \ > + " the monitor (migrate_incoming)\n" \ > + " rdma:addr:port Listen on RDMA port on given addres= s\n" \ > + " tcp:addr:port listen on TCP port (optional addres= s)\n" \ > + " unix:path listen on the UNIX socket 'path'\n"= , \ > QEMU_ARCH_ALL) > STEXI > -@item -incoming @var{port} > +@item -incoming @var{uri} > @findex -incoming > -Prepare for incoming migration, listen on @var{port}. > +Prepare for incoming migration, specifying the source of the migration s= tream > +@table @option > +@item exec:@var{command} > +Execute 'command' and use the stdout as the migration stream. Suggest: Execute 'command' and use its standard output as migration stream source. > +@item fd:@var{num} > +listen on the given fd Well, we're not listening in usual the sense of listen(2). Suggest Use file descriptor @var{num}. > +@item defer > +wait for the URI to be specified by the monitor (migrate_incoming) "Wait", since the other items start with a capital letter. > +@item rdma:@var{addr}:@var{port} > +Listen on RDMA port on given address Let's call the thing between the colons "host" instead of "=C3=A4ddr". The address consists of host and port. rdma_start_incoming_migration() passes everything after rdma: to qemu_rdma_data_init(), which parses it with inet_parse(), then uses only host and port. The other members of InetSocketAddress are silently ignored. Wonderful. qemu_rdma_data_init() errors out if you omit host. inet_parse() accepts one of :PORT [V6ADDR]:PORT V4ADDR:PORT HOST:PORT followed by an options string. The options string isn't really parsed, instead substrings matching one of these patterns are recognized: ,to=3DPORT ,ipv4 ,ipv6 Note: you can specify ipv4,ipv6 or combine V6ADDR with ipv4, or V4ADDR with ipv6 to get both flags set in InetSocketAddress. > +@item tcp:@var{addr}:@var{port}[,ipv4][,ipv6][,to=3Dto] [@var{host}] instead of @var{addr}, and [,to=3D@var{port}] instead of [,to=3Dto], please. > +Listen on TCP port @var{port} (optional @var{addr} to specify address to= listen on). > +The options ,ipv4, ipv6 and ,to are used in the same manner as chardev T= CP options. The reference to chardev options makes sense, but the reader needs to make the connection from "chardev TCP options" to "-chardev socket" himself. Maybe "in the same manner as in -chardev socket"? > +@item unix:@var{path} > +listen on the UNIX socket @var{path} > +@end table > ETEXI >=20=20 > DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \ Don't get fooled by my many comments, this series is good stuff!