From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOPTH-0007sE-PP for qemu-devel@nongnu.org; Thu, 19 Feb 2015 06:40:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOPTG-0003FF-VJ for qemu-devel@nongnu.org; Thu, 19 Feb 2015 06:40:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOPTG-0003F8-Mb for qemu-devel@nongnu.org; Thu, 19 Feb 2015 06:40:42 -0500 From: "Dr. David Alan Gilbert (git)" Date: Thu, 19 Feb 2015 11:40:29 +0000 Message-Id: <1424346029-5410-4-git-send-email-dgilbert@redhat.com> In-Reply-To: <1424346029-5410-1-git-send-email-dgilbert@redhat.com> References: <1424346029-5410-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v3 3/3] Document -incoming options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: quintela@redhat.com, liang.z.li@intel.com, mjt@tls.msk.ru, amit.shah@redhat.com, pbonzini@redhat.com From: "Dr. David Alan Gilbert" 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 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 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 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 defer +wait for the URI to be specified by the monitor (migrate_incoming) +@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