From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=50102 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PX9SA-0002Mm-Di for qemu-devel@nongnu.org; Mon, 27 Dec 2010 04:33:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PX9S9-00043t-1H for qemu-devel@nongnu.org; Mon, 27 Dec 2010 04:33:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PX9S8-00043n-Qn for qemu-devel@nongnu.org; Mon, 27 Dec 2010 04:33:16 -0500 Date: Mon, 27 Dec 2010 11:32:37 +0200 From: "Michael S. Tsirkin" Message-ID: <20101227093237.GA23150@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> <20101227085617.GA22317@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable 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 06:11:27PM +0900, Yoshiaki Tamura wrote: > 2010/12/27 Michael S. Tsirkin : > > 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 > >> --- > >> =A0hmp-commands.hx | =A0 =A07 ++++--- > >> =A0migration.c =A0 =A0 | =A0 =A03 +++ > >> =A0qmp-commands.hx | =A0 =A07 ++++--- > >> =A03 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 > >> > >> =A0 =A0 =A0{ > >> =A0 =A0 =A0 =A0 =A0.name =A0 =A0 =A0 =3D "migrate", > >> - =A0 =A0 =A0 =A0.args_type =A0=3D "detach:-d,blk:-b,inc:-i,uri:s", > >> - =A0 =A0 =A0 =A0.params =A0 =A0 =3D "[-d] [-b] [-i] uri", > >> + =A0 =A0 =A0 =A0.args_type =A0=3D "detach:-d,blk:-b,inc:-i,ft:-k,ur= i:s", > >> + =A0 =A0 =A0 =A0.params =A0 =A0 =3D "[-d] [-b] [-i] [-k] uri", > >> =A0 =A0 =A0 =A0 =A0.help =A0 =A0 =A0 =3D "migrate to URI (using -d t= o not wait for completion)" > >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "\n\t\t\t -b for migration w= ithout shared storage with" > >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 " full copy of disk\n\t\t\t = -i for migration without " > >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "shared storage with increme= ntal copy of disk " > >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "(base image shared between sr= c and destination)", > >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "(base image shared between sr= c and destination)" > >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "\n\t\t\t -k for FT migration = mode (Kemari)", > > > > FT -> Fault tolerance? > > IMO it's preferrable to avoid abbreviations in the documentation. >=20 > Yep. It's fine for me to avoid abbreviations. >=20 > > Not sure whether we need to mention the codename here: is it likely t= o > > help the users? >=20 > Ah:-) Just didn't know what the official name should be, and > placed Kemari for convenience. Any ideas or preference here? >=20 > Yoshi Do we need a name? Fault tolerance mode insufficient? > > > >> =A0 =A0 =A0 =A0 =A0.user_print =3D monitor_user_noop, > >> =A0 =A0 =A0 .mhandler.cmd_new =3D do_migrate, > >> =A0 =A0 =A0}, > >> 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, Q= Object **ret_data) > >> =A0 =A0 =A0 =A0 =A0return -1; > >> =A0 =A0 =A0} > >> > >> + =A0 =A0if (qdict_get_try_bool(qdict, "ft", 0)) > >> + =A0 =A0 =A0 =A0ft_mode =3D FT_INIT; > >> + > >> =A0 =A0 =A0if (strstart(uri, "tcp:", &p)) { > >> =A0 =A0 =A0 =A0 =A0s =3D tcp_start_outgoing_migration(mon, p, max_th= rottle, detach, > >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 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 > >> > >> =A0 =A0 =A0{ > >> =A0 =A0 =A0 =A0 =A0.name =A0 =A0 =A0 =3D "migrate", > >> - =A0 =A0 =A0 =A0.args_type =A0=3D "detach:-d,blk:-b,inc:-i,uri:s", > >> - =A0 =A0 =A0 =A0.params =A0 =A0 =3D "[-d] [-b] [-i] uri", > >> + =A0 =A0 =A0 =A0.args_type =A0=3D "detach:-d,blk:-b,inc:-i,ft:-k,ur= i:s", > >> + =A0 =A0 =A0 =A0.params =A0 =A0 =3D "[-d] [-b] [-i] [-k] uri", > >> =A0 =A0 =A0 =A0 =A0.help =A0 =A0 =A0 =3D "migrate to URI (using -d t= o not wait for completion)" > >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "\n\t\t\t -b for migration w= ithout shared storage with" > >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 " full copy of disk\n\t\t\t = -i for migration without " > >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "shared storage with increme= ntal copy of disk " > >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "(base image shared between sr= c and destination)", > >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "(base image shared between sr= c and destination)" > >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 "\n\t\t\t -k for FT migration = mode (Kemari)", > >> =A0 =A0 =A0 =A0 =A0.user_print =3D monitor_user_noop, > >> =A0 =A0 =A0 .mhandler.cmd_new =3D do_migrate, > >> =A0 =A0 =A0}, > >> -- > >> 1.7.1.2 > > -- > > To unsubscribe from this list: send the line "unsubscribe kvm" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at =A0http://vger.kernel.org/majordomo-info.html > >