From patchwork Wed Feb 11 16:46:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 438897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2EE5A140129 for ; Thu, 12 Feb 2015 03:47:11 +1100 (AEDT) Received: from localhost ([::1]:45932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLaRR-0005oA-7F for incoming@patchwork.ozlabs.org; Wed, 11 Feb 2015 11:47:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLaQw-00050t-Ev for qemu-devel@nongnu.org; Wed, 11 Feb 2015 11:46:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLaQv-00023f-3C for qemu-devel@nongnu.org; Wed, 11 Feb 2015 11:46:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLaQu-00023L-RJ for qemu-devel@nongnu.org; Wed, 11 Feb 2015 11:46:37 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1BGkYlr014920 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 11 Feb 2015 11:46:35 -0500 Received: from dgilbert-t530.redhat.com (ovpn-116-115.ams2.redhat.com [10.36.116.115]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1BGkOQm013626; Wed, 11 Feb 2015 11:46:32 -0500 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Wed, 11 Feb 2015 16:46:24 +0000 Message-Id: <1423673184-5903-4-git-send-email-dgilbert@redhat.com> In-Reply-To: <1423673184-5903-1-git-send-email-dgilbert@redhat.com> References: <1423673184-5903-1-git-send-email-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: quintela@redhat.com, liang.z.li@intel.com, mjt@tls.msk.ru, amit.shah@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v2 3/3] Document -incoming options X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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..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 -@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_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, \