From: "Dr. David Alan Gilbert" <dgilb...@redhat.com> Document the various URI formats for -incoming, the previous manpage and help text was wrong (out of date?)
Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> --- qemu-options.hx | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 85ca3ad..aae9a99 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3169,12 +3169,35 @@ Set TB size. ETEXI 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" \ + " pause wait for the URI to be specified by\n" \ + " the monitor (migrate -u)\n" \ + " rdma:addr:port Listen on RDMA port on given address\n" \ + " tcp:addr:port listen on TCP port (optional address)\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 stream +@table @option +@item exec:@var{command} +Execute 'command' and use the stdout as the migration stream. +@item fd:@var{num} +listen on the given fd +@item pause +wait for the URI to be specified by the monitor (migrate -u) +@item rdma:@var{addr}:@var{port} +Listen on RDMA port on given address +@item tcp:@var{addr}:@var{port}[,ipv4][,ipv6][,to=to] +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 TCP options. +@item unix:@var{path} +listen on the UNIX socket @var{path} +@end table ETEXI DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \ -- 2.1.0