[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 39/45] block: return count of dirty sectors, not
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 39/45] block: return count of dirty sectors, not chunks |
Date: |
Wed, 26 Sep 2012 17:56:45 +0200 |
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
- [Qemu-devel] [PATCH v2 22/45] block: introduce new dirty bitmap functionality, (continued)
- [Qemu-devel] [PATCH v2 22/45] block: introduce new dirty bitmap functionality, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 23/45] block: export dirty bitmap information in query-block, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 26/45] mirror: introduce mirror job, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 24/45] block: add block-job-complete, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 27/45] qmp: add drive-mirror command, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 32/45] qmp: add pull_event function, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 36/45] block: implement dirty bitmap using HBitmap, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 37/45] block: make round_to_clusters public, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 39/45] block: return count of dirty sectors, not chunks,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 38/45] mirror: perform COW if the cluster size is bigger than the granularity, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 41/45] mirror: allow customizing the granularity, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 43/45] mirror: add buf-size argument to drive-mirror, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 42/45] mirror: switch mirror_iteration to AIO, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 44/45] mirror: support more than one in-flight AIO operation, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 35/45] add hierarchical bitmap data type and test cases, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 34/45] host-utils: add ffsl, Paolo Bonzini, 2012/09/26