Patchwork [41/47] block: return count of dirty sectors, not chunks

login
register
mail settings
Submitter Paolo Bonzini
Date July 24, 2012, 11:04 a.m.
Message ID <1343127865-16608-42-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/172830/
State New
Headers show

Comments

Paolo Bonzini - July 24, 2012, 11:04 a.m.
This will make the API easier to use as soon as we'll let clients
customize the granularity.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block-migration.c |    2 +-
 block.c           |    2 +-
 block/mirror.c    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/block-migration.c b/block-migration.c
index b95b4e1..7ff188a 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 c56a500..f3dd2a7 100644
--- a/block.c
+++ b/block.c
@@ -3825,7 +3825,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 6f8ae62..8d242ef 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -227,7 +227,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);