From patchwork Tue Jun 1 15:40:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 54226 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 B9929B6EFF for ; Wed, 2 Jun 2010 01:45:08 +1000 (EST) Received: from localhost ([127.0.0.1]:42017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJTeL-0003fK-N8 for incoming@patchwork.ozlabs.org; Tue, 01 Jun 2010 11:45:05 -0400 Received: from [140.186.70.92] (port=59380 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJTax-00021F-PN for qemu-devel@nongnu.org; Tue, 01 Jun 2010 11:41:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJTav-0003S9-41 for qemu-devel@nongnu.org; Tue, 01 Jun 2010 11:41:35 -0400 Received: from sh.osrg.net ([192.16.179.4]:51199) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJTau-0003Qr-Iq for qemu-devel@nongnu.org; Tue, 01 Jun 2010 11:41:33 -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 o51FfRmg024007; Wed, 2 Jun 2010 00:41:27 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 957073E02D9; Wed, 2 Jun 2010 00:41:27 +0900 (JST) From: Yoshiaki Tamura To: qemu-devel@nongnu.org Date: Wed, 2 Jun 2010 00:40:21 +0900 Message-Id: <1275406821-30024-5-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1275406821-30024-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1275406821-30024-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 61 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 02 Jun 2010 00:41:28 +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, Yoshiaki Tamura Subject: [Qemu-devel] [PATCH 4/4] migration: add support to print migration info on incoming side. 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 Set current_migration after calling tcp_star_incoming_migration(). On incoming side, we don't have to print remaining rams, so introduce incoming flag to switch messages. Signed-off-by: Yoshiaki Tamura --- migration.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/migration.c b/migration.c index 05f6cc5..32bf9c3 100644 --- a/migration.c +++ b/migration.c @@ -36,12 +36,14 @@ static uint32_t max_throttle = (32 << 20); static MigrationState *current_migration; +static int incoming; + void qemu_start_incoming_migration(const char *uri) { const char *p; if (strstart(uri, "tcp:", &p)) - tcp_start_incoming_migration(p); + current_migration = tcp_start_incoming_migration(p); #if !defined(WIN32) else if (strstart(uri, "exec:", &p)) exec_start_incoming_migration(p); @@ -50,8 +52,12 @@ void qemu_start_incoming_migration(const char *uri) else if (strstart(uri, "fd:", &p)) fd_start_incoming_migration(p); #endif - else + else { fprintf(stderr, "unknown migration protocol: %s\n", uri); + return; + } + + incoming = 1; } int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) @@ -162,8 +168,12 @@ static void migrate_print_status(Monitor *mon, const char *name, monitor_printf(mon, "transferred %s: %" PRIu64 " kbytes\n", name, qdict_get_int(qdict, "transferred") >> 10); - monitor_printf(mon, "remaining %s: %" PRIu64 " kbytes\n", name, - qdict_get_int(qdict, "remaining") >> 10); + if (incoming) { + monitor_printf(mon, "remaining %s: n/a\n", name); + } else { + monitor_printf(mon, "remaining %s: %" PRIu64 " kbytes\n", name, + qdict_get_int(qdict, "remaining") >> 10); + } monitor_printf(mon, "total %s: %" PRIu64 " kbytes\n", name, qdict_get_int(qdict, "total") >> 10); }