* [Qemu-trivial] [PATCH] qemu-options: fix/document -incoming options
@ 2015-02-10 19:45 ` Michael Tokarev
0 siblings, 0 replies; 4+ messages in thread
From: Michael Tokarev @ 2015-02-10 19:45 UTC (permalink / raw)
To: qemu-trivial; +Cc: Michael Tokarev, qemu-devel, Dr . David Alan Gilbert
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
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
-@item -incoming @var{port}
+@item -incoming tcp:[@var{host}]:@var{port}[,to=@var{maxport}][,ipv4][,ipv6]
+@item -incoming rdma:[@var{host}]:@var{port}[,to=@var{maxport}][,ipv4][,ipv6]
@findex -incoming
-Prepare for incoming migration, listen on @var{port}.
+Prepare for incoming migration, listen on a given tcp port.
+
+@item -incoming unix:@var{socketpath}
+Prepare for incoming migration, listen on a given unix socket.
+
+@item -incoming fd:@var{fd}
+Accept incoming migration from a given filedescriptor.
+
+@item -incoming exec:@var{cmdline}
+Accept incoming migration as an output from specified external command.
ETEXI
DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Qemu-devel] [PATCH] qemu-options: fix/document -incoming options
@ 2015-02-10 19:45 ` Michael Tokarev
0 siblings, 0 replies; 4+ messages in thread
From: Michael Tokarev @ 2015-02-10 19:45 UTC (permalink / raw)
To: qemu-trivial; +Cc: Michael Tokarev, qemu-devel, Dr . David Alan Gilbert
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
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
-@item -incoming @var{port}
+@item -incoming tcp:[@var{host}]:@var{port}[,to=@var{maxport}][,ipv4][,ipv6]
+@item -incoming rdma:[@var{host}]:@var{port}[,to=@var{maxport}][,ipv4][,ipv6]
@findex -incoming
-Prepare for incoming migration, listen on @var{port}.
+Prepare for incoming migration, listen on a given tcp port.
+
+@item -incoming unix:@var{socketpath}
+Prepare for incoming migration, listen on a given unix socket.
+
+@item -incoming fd:@var{fd}
+Accept incoming migration from a given filedescriptor.
+
+@item -incoming exec:@var{cmdline}
+Accept incoming migration as an output from specified external command.
ETEXI
DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-trivial] [PATCH] qemu-options: fix/document -incoming options
2015-02-10 19:45 ` [Qemu-devel] " Michael Tokarev
@ 2015-02-10 19:59 ` Dr. David Alan Gilbert
-1 siblings, 0 replies; 4+ messages in thread
From: Dr. David Alan Gilbert @ 2015-02-10 19:59 UTC (permalink / raw)
To: Michael Tokarev; +Cc: qemu-trivial, qemu-devel
* Michael Tokarev (mjt@tls.msk.ru) wrote:
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
> 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
> -@item -incoming @var{port}
> +@item -incoming tcp:[@var{host}]:@var{port}[,to=@var{maxport}][,ipv4][,ipv6]
> +@item -incoming rdma:[@var{host}]:@var{port}[,to=@var{maxport}][,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
> +
> +@item -incoming unix:@var{socketpath}
> +Prepare for incoming migration, listen on a given unix socket.
> +
> +@item -incoming fd:@var{fd}
> +Accept incoming migration from a given filedescriptor.
> +
> +@item -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 / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] qemu-options: fix/document -incoming options
@ 2015-02-10 19:59 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Dr. David Alan Gilbert @ 2015-02-10 19:59 UTC (permalink / raw)
To: Michael Tokarev; +Cc: qemu-trivial, qemu-devel
* Michael Tokarev (mjt@tls.msk.ru) wrote:
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
> 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
> -@item -incoming @var{port}
> +@item -incoming tcp:[@var{host}]:@var{port}[,to=@var{maxport}][,ipv4][,ipv6]
> +@item -incoming rdma:[@var{host}]:@var{port}[,to=@var{maxport}][,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
> +
> +@item -incoming unix:@var{socketpath}
> +Prepare for incoming migration, listen on a given unix socket.
> +
> +@item -incoming fd:@var{fd}
> +Accept incoming migration from a given filedescriptor.
> +
> +@item -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 / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-02-10 19:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-10 19:45 [Qemu-trivial] [PATCH] qemu-options: fix/document -incoming options Michael Tokarev
2015-02-10 19:45 ` [Qemu-devel] " Michael Tokarev
2015-02-10 19:59 ` [Qemu-trivial] " Dr. David Alan Gilbert
2015-02-10 19:59 ` [Qemu-devel] " Dr. David Alan Gilbert
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.