On Mon, Dec 27, 2010 at 06:11:27PM +0900, Yoshiaki Tamura wrote: > 2010/12/27 Michael S. Tsirkin <mst@xxxxxxxxxx>: > > 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 <tamura.yoshiaki@xxxxxxxxxxxxx> > >> --- > >> 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. > > Yep. It's fine for me to avoid abbreviations. > > > Not sure whether we need to mention the codename here: is it likely to > > help the users? > > Ah:-) Just didn't know what the official name should be, and > placed Kemari for convenience. Any ideas or preference here? > > Yoshi Do we need a name? Fault tolerance mode insufficient? > > > >> .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 > > -- > > To unsubscribe from this list: send the line "unsubscribe kvm" in > > the body of a message to majordomo@xxxxxxxxxxxxxxx > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html