Re: [Qemu-devel] [PATCH] qemu-options: fix/document -incoming options

[Dr. David Alan Gilbert]

* Michael Tokarev (address@hidden) wrote:
> Signed-off-by: Michael Tokarev <address@hidden>
> ---
>  qemu-options.hx | 24 +++++++++++++++++++++---
>  1 file changed, 21 insertions(+), 3 deletions(-)
> 
> diff --git a/qemu-options.hx b/qemu-options.hx
> index ee4b223..a2c071a 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -3195,12 +3195,30 @@ Set TB size.
>  ETEXI
>  
>  DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \
> -    "-incoming p     prepare for incoming migration, listen on port p\n",
> +    "-incoming tcp:[host]:port[,to=maxport][,ipv4][,ipv6]\n" \
> +    "-incoming rdma:[host]:port[,to=maxport][,ipv4][,ipv6]\n" \
> +    "-incoming unix:socketpath\n" \
> +    "                prepare for incoming migration, listen on\n" \
> +    "                specified protocol and socket address\n" \
> +    "-incoming fd:fd\n" \
> +    "-incoming exec:cmdline\n" \
> +    "                accept incoming migration on given file descriptor\n" \
> +    "                or from given external command\n",
>      QEMU_ARCH_ALL)
>  STEXI
> address@hidden -incoming @var{port}
> address@hidden -incoming 
> tcp:address@hidden:@var{port}[,address@hidden,ipv4][,ipv6]
> address@hidden -incoming 
> rdma:address@hidden:@var{port}[,address@hidden,ipv4][,ipv6]
>  @findex -incoming
> -Prepare for incoming migration, listen on @var{port}.
> +Prepare for incoming migration, listen on a given tcp port.

I'm not convinced the RDMA code can handle the to= option, it parses it
but if you try and start two things on the same port it errors.
I also think that the bind address is a required for the RDMA code.

Dave

> +
> address@hidden -incoming unix:@var{socketpath}
> +Prepare for incoming migration, listen on a given unix socket.
> +
> address@hidden -incoming fd:@var{fd}
> +Accept incoming migration from a given filedescriptor.
> +
> address@hidden -incoming exec:@var{cmdline}
> +Accept incoming migration as an output from specified external command.
>  ETEXI
>  
>  DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \
> -- 
> 2.1.4
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK