From patchwork Mon Jul 26 04:25:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 59888 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 604E3B6EFE for ; Mon, 26 Jul 2010 14:29:16 +1000 (EST) Received: from localhost ([127.0.0.1]:34901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdFJR-00055I-NX for incoming@patchwork.ozlabs.org; Mon, 26 Jul 2010 00:29:13 -0400 Received: from [140.186.70.92] (port=53481 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdFHT-0004Ju-Fp for qemu-devel@nongnu.org; Mon, 26 Jul 2010 00:27:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OdFHS-0006af-Cw for qemu-devel@nongnu.org; Mon, 26 Jul 2010 00:27:11 -0400 Received: from sh.osrg.net ([192.16.179.4]:57196) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdFHR-0006ZD-RK for qemu-devel@nongnu.org; Mon, 26 Jul 2010 00:27:10 -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 o6Q4R12O018023; Mon, 26 Jul 2010 13:27:01 +0900 Received: from localhost (hype-nh0.osrg.net [10.72.1.48]) by fs.osrg.net (Postfix) with ESMTP id B26643E03FE; Mon, 26 Jul 2010 13:27:01 +0900 (JST) From: Yoshiaki Tamura To: qemu-devel@nongnu.org Date: Mon, 26 Jul 2010 13:25:41 +0900 Message-Id: <1280118341-22730-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.1.1 X-Dispatcher: imput version 20070423(IM149) Lines: 40 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Mon, 26 Jul 2010 13:27:02 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.1 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: kwolf@redhat.com, Yoshiaki Tamura Subject: [Qemu-devel] [PATCH] block migration: replace tabs by spaces. 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 Signed-off-by: Yoshiaki Tamura --- block-migration.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block-migration.c b/block-migration.c index 8eda307..0bfdb73 100644 --- a/block-migration.c +++ b/block-migration.c @@ -346,7 +346,7 @@ static int mig_save_device_dirty(Monitor *mon, QEMUFile *f, blk->iov.iov_len = nr_sectors * BDRV_SECTOR_SIZE; qemu_iovec_init_external(&blk->qiov, &blk->iov, 1); - blk->time = qemu_get_clock_ns(rt_clock); + blk->time = qemu_get_clock_ns(rt_clock); blk->aiocb = bdrv_aio_readv(bmds->bs, sector, &blk->qiov, nr_sectors, blk_mig_read_cb, blk); @@ -449,13 +449,13 @@ static int is_stage2_completed(void) if (block_mig_state.bulk_completed == 1) { remaining_dirty = get_remaining_dirty(); - if (remaining_dirty == 0) { - return 1; - } + if (remaining_dirty == 0) { + return 1; + } - bwidth = compute_read_bwidth(); + bwidth = compute_read_bwidth(); - if ((remaining_dirty / bwidth) <= + if ((remaining_dirty / bwidth) <= migrate_max_downtime()) { /* finish stage2 because we think that we can finish remaing work below max_downtime */