From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Timel-0007SX-B3 for qemu-devel@nongnu.org; Wed, 12 Dec 2012 08:47:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Timeb-0003jy-R8 for qemu-devel@nongnu.org; Wed, 12 Dec 2012 08:47:27 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:53324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Timeb-0003jq-Lv for qemu-devel@nongnu.org; Wed, 12 Dec 2012 08:47:17 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so1942825iej.18 for ; Wed, 12 Dec 2012 05:47:17 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 12 Dec 2012 14:46:25 +0100 Message-Id: <1355319999-30627-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1355319999-30627-1-git-send-email-pbonzini@redhat.com> References: <1355319999-30627-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 06/20] block: return count of dirty sectors, not chunks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com, stefanha@redhat.com Reviewed-by: Laszlo Ersek Signed-off-by: Paolo Bonzini --- block-migration.c | 2 +- block.c | 5 ++--- block/mirror.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/block-migration.c b/block-migration.c index 71b9601..06967d8 100644 --- a/block-migration.c +++ b/block-migration.c @@ -490,7 +490,7 @@ static int64_t get_remaining_dirty(void) dirty += bdrv_get_dirty_count(bmds->bs); } - return dirty * BLOCK_SIZE; + return dirty << BDRV_SECTOR_BITS; } static int is_stage2_completed(void) diff --git a/block.c b/block.c index d93c386..ece2ad5 100644 --- a/block.c +++ b/block.c @@ -2819,8 +2819,7 @@ BlockInfo *bdrv_query_info(BlockDriverState *bs) if (bs->dirty_bitmap) { info->has_dirty = true; info->dirty = g_malloc0(sizeof(*info->dirty)); - info->dirty->count = bdrv_get_dirty_count(bs) * - BDRV_SECTORS_PER_DIRTY_CHUNK * BDRV_SECTOR_SIZE; + info->dirty->count = bdrv_get_dirty_count(bs) * BDRV_SECTOR_SIZE; } if (bs->drv) { @@ -4266,7 +4265,7 @@ void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector, int64_t bdrv_get_dirty_count(BlockDriverState *bs) { if (bs->dirty_bitmap) { - return hbitmap_count(bs->dirty_bitmap) >> BDRV_LOG_SECTORS_PER_DIRTY_CHUNK; + return hbitmap_count(bs->dirty_bitmap); } else { return 0; } diff --git a/block/mirror.c b/block/mirror.c index 14ce1a7..48c37a7 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -243,7 +243,7 @@ static void coroutine_fn mirror_run(void *opaque) trace_mirror_before_sleep(s, cnt, s->synced); if (!s->synced) { /* Publish progress */ - s->common.offset = end * BDRV_SECTOR_SIZE - cnt * BLOCK_SIZE; + s->common.offset = (end - cnt) * BDRV_SECTOR_SIZE; if (s->common.speed) { delay_ns = ratelimit_calculate_delay(&s->limit, BDRV_SECTORS_PER_DIRTY_CHUNK); -- 1.8.0.1