From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44236 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PX8st-0003Z9-Ed for qemu-devel@nongnu.org; Mon, 27 Dec 2010 03:56:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PX8sr-0006oe-6s for qemu-devel@nongnu.org; Mon, 27 Dec 2010 03:56:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10463) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PX8sr-0006oN-0G for qemu-devel@nongnu.org; Mon, 27 Dec 2010 03:56:49 -0500 Date: Mon, 27 Dec 2010 10:56:17 +0200 From: "Michael S. Tsirkin" Message-ID: <20101227085617.GA22317@redhat.com> References: <1293438337-21377-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> <1293438337-21377-19-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1293438337-21377-19-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Subject: [Qemu-devel] Re: [PATCH 18/19] Introduce -k option to enable FT migration mode (Kemari). List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Yoshiaki Tamura Cc: kwolf@redhat.com, aliguori@us.ibm.com, dlaor@redhat.com, ananth@in.ibm.com, kvm@vger.kernel.org, ohmura.kei@lab.ntt.co.jp, mtosatti@redhat.com, qemu-devel@nongnu.org, vatsa@linux.vnet.ibm.com, avi@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com On Mon, Dec 27, 2010 at 05:25:36PM +0900, Yoshiaki Tamura wrote: > When -k option is set to migrate command, it will turn on ft_mode to > start FT migration mode (Kemari). > > Signed-off-by: Yoshiaki Tamura > --- > hmp-commands.hx | 7 ++++--- > migration.c | 3 +++ > qmp-commands.hx | 7 ++++--- > 3 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 4befbe2..0071409 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -735,13 +735,14 @@ ETEXI > > { > .name = "migrate", > - .args_type = "detach:-d,blk:-b,inc:-i,uri:s", > - .params = "[-d] [-b] [-i] uri", > + .args_type = "detach:-d,blk:-b,inc:-i,ft:-k,uri:s", > + .params = "[-d] [-b] [-i] [-k] uri", > .help = "migrate to URI (using -d to not wait for completion)" > "\n\t\t\t -b for migration without shared storage with" > " full copy of disk\n\t\t\t -i for migration without " > "shared storage with incremental copy of disk " > - "(base image shared between src and destination)", > + "(base image shared between src and destination)" > + "\n\t\t\t -k for FT migration mode (Kemari)", FT -> Fault tolerance? IMO it's preferrable to avoid abbreviations in the documentation. Not sure whether we need to mention the codename here: is it likely to help the users? > .user_print = monitor_user_noop, > .mhandler.cmd_new = do_migrate, > }, > diff --git a/migration.c b/migration.c > index 0db0b6d..a4a39eb 100644 > --- a/migration.c > +++ b/migration.c > @@ -92,6 +92,9 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) > return -1; > } > > + if (qdict_get_try_bool(qdict, "ft", 0)) > + ft_mode = FT_INIT; > + > if (strstart(uri, "tcp:", &p)) { > s = tcp_start_outgoing_migration(mon, p, max_throttle, detach, > blk, inc); > diff --git a/qmp-commands.hx b/qmp-commands.hx > index 3486223..b28bf70 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -431,13 +431,14 @@ EQMP > > { > .name = "migrate", > - .args_type = "detach:-d,blk:-b,inc:-i,uri:s", > - .params = "[-d] [-b] [-i] uri", > + .args_type = "detach:-d,blk:-b,inc:-i,ft:-k,uri:s", > + .params = "[-d] [-b] [-i] [-k] uri", > .help = "migrate to URI (using -d to not wait for completion)" > "\n\t\t\t -b for migration without shared storage with" > " full copy of disk\n\t\t\t -i for migration without " > "shared storage with incremental copy of disk " > - "(base image shared between src and destination)", > + "(base image shared between src and destination)" > + "\n\t\t\t -k for FT migration mode (Kemari)", > .user_print = monitor_user_noop, > .mhandler.cmd_new = do_migrate, > }, > -- > 1.7.1.2