From patchwork Thu Jun 3 07:22:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 54456 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 2EA16B7D29 for ; Thu, 3 Jun 2010 17:32:12 +1000 (EST) Received: from localhost ([127.0.0.1]:54231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OK4uO-0006gW-JU for incoming@patchwork.ozlabs.org; Thu, 03 Jun 2010 03:32:08 -0400 Received: from [140.186.70.92] (port=58333 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OK4lr-0002Kc-PL for qemu-devel@nongnu.org; Thu, 03 Jun 2010 03:23:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OK4lm-00052b-NH for qemu-devel@nongnu.org; Thu, 03 Jun 2010 03:23:19 -0400 Received: from sh.osrg.net ([192.16.179.4]:50930) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OK4lm-00051w-55 for qemu-devel@nongnu.org; Thu, 03 Jun 2010 03:23:14 -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 o537N8Bh010559; Thu, 3 Jun 2010 16:23:08 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id BA34B3E02E0; Thu, 3 Jun 2010 16:23:08 +0900 (JST) From: Yoshiaki Tamura To: qemu-devel@nongnu.org Date: Thu, 3 Jun 2010 16:22:26 +0900 Message-Id: <1275549747-18061-4-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1275549747-18061-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1275549747-18061-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 42 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Thu, 03 Jun 2010 16:23:09 +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 3/4] arch_init: calculate transferred bytes at ram_load(). 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 Currently incoming side of migration doesn't know how many bytes are transferred. To print "info migrate" on incoming side, we need to calculate transferred bytes at ram_load(). Signed-off-by: Yoshiaki Tamura --- arch_init.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch_init.c b/arch_init.c index 8e849a8..1bdfa58 100644 --- a/arch_init.c +++ b/arch_init.c @@ -246,7 +246,7 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) int ram_load(QEMUFile *f, void *opaque, int version_id) { ram_addr_t addr; - int flags; + int flags, bytes_sent; if (version_id != 3) { return -EINVAL; @@ -274,12 +274,16 @@ int ram_load(QEMUFile *f, void *opaque, int version_id) MADV_DONTNEED); } #endif + bytes_sent = 1; } else if (flags & RAM_SAVE_FLAG_PAGE) { qemu_get_buffer(f, qemu_get_ram_ptr(addr), TARGET_PAGE_SIZE); + bytes_sent = TARGET_PAGE_SIZE; } if (qemu_file_has_error(f)) { return -EIO; } + + bytes_transferred += bytes_sent; } while (!(flags & RAM_SAVE_FLAG_EOS)); return 0;