From patchwork Tue Jan 11 10:59:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 470671 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0BB5dIE030873 for ; Tue, 11 Jan 2011 11:05:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755760Ab1AKLFy (ORCPT ); Tue, 11 Jan 2011 06:05:54 -0500 Received: from sh.osrg.net ([192.16.179.4]:39415 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755754Ab1AKLFx (ORCPT ); Tue, 11 Jan 2011 06:05:53 -0500 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id p0BB5Shq027567; Tue, 11 Jan 2011 20:05:30 +0900 Received: from localhost (hype-nh0.osrg.net [10.72.1.48]) by fs.osrg.net (Postfix) with ESMTP id 9E3861B8012; Tue, 11 Jan 2011 20:05:25 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: avi@redhat.com, anthony@codemonkey.ws, aliguori@us.ibm.com, mtosatti@redhat.com, dlaor@redhat.com, mst@redhat.com, kwolf@redhat.com, ananth@in.ibm.com, psuriset@linux.vnet.ibm.com, vatsa@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura Subject: [PATCH 18/19] Introduce -k option to enable FT migration mode (Kemari). Date: Tue, 11 Jan 2011 19:59:53 +0900 Message-Id: <1294743594-19193-19-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.1.2 In-Reply-To: <1294743594-19193-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1294743594-19193-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 71 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 11 Jan 2011 11:05:56 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Tue, 11 Jan 2011 20:05:31 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.5 at sh X-Virus-Status: Clean Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 03c997e..6e22d2a 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, },