[Qemu-devel] [PATCH v2 39/45] block: return count of dirty sectors, not chunks

[Paolo Bonzini]

Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
 block-migration.c | 2 +-
 block.c           | 4 ++--
 block/mirror.c    | 2 +-
 3 file modificati, 4 inserzioni(+), 4 rimozioni(-)

diff --git a/block-migration.c b/block-migration.c
index 7def8ab..07eafd3 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -485,7 +485,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 16da2a9..6fe6491 100644
--- a/block.c
+++ b/block.c
@@ -2669,7 +2669,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;
+        info->dirty->count = bdrv_get_dirty_count(bs);
     }
 
     if (bs->drv) {
@@ -4056,7 +4056,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 49f9bde..179406b 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -242,7 +242,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.12