From patchwork Tue May 25 08:37:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 53501 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A8944B7D6C for ; Tue, 25 May 2010 18:47:22 +1000 (EST) Received: from localhost ([127.0.0.1]:36319 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGpnD-0005ky-7n for incoming@patchwork.ozlabs.org; Tue, 25 May 2010 04:47:19 -0400 Received: from [140.186.70.92] (port=48374 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGpgY-0003C3-WC for qemu-devel@nongnu.org; Tue, 25 May 2010 04:40:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGpgW-0003cC-6Q for qemu-devel@nongnu.org; Tue, 25 May 2010 04:40:26 -0400 Received: from sh.osrg.net ([192.16.179.4]:51675) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGpgV-0003as-LJ for qemu-devel@nongnu.org; Tue, 25 May 2010 04:40:24 -0400 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 o4P8eJ2S010198; Tue, 25 May 2010 17:40:19 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 038BE3E030D; Tue, 25 May 2010 17:40:18 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Tue, 25 May 2010 17:37:03 +0900 Message-Id: <1274776624-16435-24-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 48 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Tue, 25 May 2010 17:40:20 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aliguori@us.ibm.com, mtosatti@redhat.com, avi@redhat.com, Yoshiaki Tamura , ohmura.kei@lab.ntt.co.jp Subject: [Qemu-devel] [RFC PATCH 22/23] Introduce -k option to enable FT migration mode (Kemari). X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- migration.c | 3 +++ qemu-monitor.hx | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/migration.c b/migration.c index 5b90d37..3334650 100644 --- a/migration.c +++ b/migration.c @@ -71,6 +71,9 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) return -1; } + if (qdict_get_int(qdict, "ft")) + ft_mode = FT_INIT; + if (strstart(uri, "tcp:", &p)) { s = tcp_start_outgoing_migration(mon, p, max_throttle, detach, (int)qdict_get_int(qdict, "blk"), diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 16c45b7..22b72d9 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -765,13 +765,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)", .user_print = monitor_user_noop, .mhandler.cmd_new = do_migrate, },