| Message ID | 1294938941-9532-19-git-send-email-tamura.yoshiaki@lab.ntt.co.jp |
|---|---|
| State | New |
| Headers | show |
On Thu, Jan 13, 2011 at 5:15 PM, Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp> 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@lab.ntt.co.jp> > --- > 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 1cea572..b7f8f2f 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 Fault Tolerance mode (Kemari protocol)", > .user_print = monitor_user_noop, > .mhandler.cmd_new = do_migrate, > }, > diff --git a/migration.c b/migration.c > index 557349b..d4922ce 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; Missing braces.
diff --git a/hmp-commands.hx b/hmp-commands.hx index 1cea572..b7f8f2f 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 Fault Tolerance mode (Kemari protocol)", .user_print = monitor_user_noop, .mhandler.cmd_new = do_migrate, }, diff --git a/migration.c b/migration.c index 557349b..d4922ce 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 56c4d8b..1521931 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 Fault Tolerance mode (Kemari protocol)", .user_print = monitor_user_noop, .mhandler.cmd_new = do_migrate, },
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@lab.ntt.co.jp> --- hmp-commands.hx | 7 ++++--- migration.c | 3 +++ qmp-commands.hx | 7 ++++--- 3 files changed, 11 insertions(+), 6 deletions(-)