From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWvj-0006qD-7H for qemu-devel@nongnu.org; Wed, 16 Jan 2013 12:37:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvWvh-0002Sl-Od for qemu-devel@nongnu.org; Wed, 16 Jan 2013 12:37:39 -0500 Received: from mail-ie0-f170.google.com ([209.85.223.170]:35767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvWvh-0002Sf-IP for qemu-devel@nongnu.org; Wed, 16 Jan 2013 12:37:37 -0500 Received: by mail-ie0-f170.google.com with SMTP id k10so3087256iea.29 for ; Wed, 16 Jan 2013 09:37:37 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 16 Jan 2013 18:31:13 +0100 Message-Id: <1358357479-7912-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1358357479-7912-1-git-send-email-pbonzini@redhat.com> References: <1358357479-7912-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 06/12] 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, 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 6acf3e1..9d0b037 100644 --- a/block-migration.c +++ b/block-migration.c @@ -478,7 +478,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 void blk_mig_cleanup(void) diff --git a/block.c b/block.c index 4a4ab16..a274544 100644 --- a/block.c +++ b/block.c @@ -2832,8 +2832,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) { @@ -4347,7 +4346,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 ee45e2e..4e36045 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.7.1