From patchwork Tue Aug 3 14:44:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 60755 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 9A2E0B6F10 for ; Wed, 4 Aug 2010 00:46:06 +1000 (EST) Received: from localhost ([127.0.0.1]:58312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OgIkk-0006Cf-S7 for incoming@patchwork.ozlabs.org; Tue, 03 Aug 2010 10:46:02 -0400 Received: from [140.186.70.92] (port=57918 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OgIjM-00069W-1A for qemu-devel@nongnu.org; Tue, 03 Aug 2010 10:44:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OgIjK-0004G1-9L for qemu-devel@nongnu.org; Tue, 03 Aug 2010 10:44:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14889) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OgIjJ-0004Fh-V5 for qemu-devel@nongnu.org; Tue, 03 Aug 2010 10:44:34 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o73EiWFI025971 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 3 Aug 2010 10:44:32 -0400 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o73EiPOv019437; Tue, 3 Aug 2010 10:44:31 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Tue, 3 Aug 2010 16:44:27 +0200 Message-Id: <1280846670-27063-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1280846670-27063-1-git-send-email-kwolf@redhat.com> References: <1280846670-27063-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 3/6] 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 From: Yoshiaki Tamura Signed-off-by: Yoshiaki Tamura Signed-off-by: Kevin Wolf --- 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 */