From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH 18/18] Introduce "kemari:" to enable FT migration mode (Kemari). Date: Thu, 10 Feb 2011 10:52:57 +0100 Message-ID: <4D53B579.4070904@redhat.com> References: <1297330258-20494-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> <1297330258-20494-19-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, ohmura.kei@lab.ntt.co.jp To: Yoshiaki Tamura Return-path: Received: from mail-ww0-f44.google.com ([74.125.82.44]:54730 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754934Ab1BJJxC (ORCPT ); Thu, 10 Feb 2011 04:53:02 -0500 Received: by wwa36 with SMTP id 36so1183021wwa.1 for ; Thu, 10 Feb 2011 01:53:01 -0800 (PST) In-Reply-To: <1297330258-20494-19-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Sender: kvm-owner@vger.kernel.org List-ID: On 02/10/2011 10:30 AM, Yoshiaki Tamura wrote: > When "kemari:" is set in front of URI of migrate command, it will turn > on ft_mode to start FT migration mode (Kemari). On the receiver side, > the option looks like, -incoming kemari::
: > > Signed-off-by: Yoshiaki Tamura > --- > hmp-commands.hx | 4 +++- > migration.c | 12 ++++++++++++ > qmp-commands.hx | 4 +++- > 3 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 38e1eb7..ee14344 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -760,7 +760,9 @@ ETEXI > "\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 put \"kemari:\" in front of URI to enable " > + "Fault Tolerance mode (Kemari protocol)", > .user_print = monitor_user_noop, > .mhandler.cmd_new = do_migrate, > }, > diff --git a/migration.c b/migration.c > index 7837c55..a3f7722 100644 > --- a/migration.c > +++ b/migration.c > @@ -48,6 +48,12 @@ int qemu_start_incoming_migration(const char *uri) > const char *p; > int ret; > > + /* check ft_mode (Kemari protocol) */ > + if (strstart(uri, "kemari:",&p)) { > + ft_mode = FT_INIT; > + uri = p; > + } > + > if (strstart(uri, "tcp:",&p)) > ret = tcp_start_incoming_migration(p); > #if !defined(WIN32) > @@ -99,6 +105,12 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) > return -1; > } > > + /* check ft_mode (Kemari protocol) */ > + if (strstart(uri, "kemari:",&p)) { > + ft_mode = FT_INIT; > + uri = p; > + } > + > 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 df40a3d..68ca48a 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -437,7 +437,9 @@ EQMP > "\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 put \"kemari:\" in front of URI to enable " > + "Fault Tolerance mode (Kemari protocol)", > .user_print = monitor_user_noop, > .mhandler.cmd_new = do_migrate, > }, Acked-by: Paolo Bonzini Paolo