[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/3] Document -incoming options
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH v2 3/3] Document -incoming options |
Date: |
Wed, 11 Feb 2015 16:46:24 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
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 <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
qemu-options.hx | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 85ca3ad..fd5fbea 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_incoming)\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
address@hidden -incoming @var{port}
address@hidden -incoming @var{uri}
@findex -incoming
-Prepare for incoming migration, listen on @var{port}.
+Prepare for incoming migration, specifying the source of the migration stream
address@hidden @option
address@hidden exec:@var{command}
+Execute 'command' and use the stdout as the migration stream.
address@hidden fd:@var{num}
+listen on the given fd
address@hidden pause
+wait for the URI to be specified by the monitor (migrate_incoming)
address@hidden rdma:@var{addr}:@var{port}
+Listen on RDMA port on given address
address@hidden 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.
address@hidden unix:@var{path}
+listen on the UNIX socket @var{path}
address@hidden table
ETEXI
DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \
--
2.1.0