[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 09/18] dirty-bitmap: Change bdrv_dirty_iter_next(
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v5 09/18] dirty-bitmap: Change bdrv_dirty_iter_next() to report byte offset |
Date: |
Wed, 12 Jul 2017 20:05:46 -0500 |
Thanks to recent cleanups, most callers were scaling a return value
of sectors into bytes (the exception, in qcow2-bitmap, will be
converted to byte-based iteration later - in particular, there will
be a few commits where we are temporarily relying on not-strict-C
right-shift of -1 still resulting in a -1). Update the interface to
do the scaling internally instead.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-By: John Snow <address@hidden>
---
v5: no code change, tweak commit message
v4: rebase to persistent bitmap
v3: no change
v2: no change
---
block/backup.c | 2 +-
block/dirty-bitmap.c | 2 +-
block/mirror.c | 8 ++++----
block/qcow2-bitmap.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index af0314f..9e41eb2 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -375,7 +375,7 @@ static int coroutine_fn
backup_run_incremental(BackupBlockJob *job)
dbi = bdrv_dirty_iter_new(job->sync_bitmap);
/* Find the next dirty sector(s) */
- while ((offset = bdrv_dirty_iter_next(dbi) * BDRV_SECTOR_SIZE) >= 0) {
+ while ((offset = bdrv_dirty_iter_next(dbi)) >= 0) {
cluster = offset / job->cluster_size;
/* Fake progress updates for any clusters we skipped */
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index c091f0c..20f2308 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -505,7 +505,7 @@ void bdrv_dirty_iter_free(BdrvDirtyBitmapIter *iter)
int64_t bdrv_dirty_iter_next(BdrvDirtyBitmapIter *iter)
{
- return hbitmap_iter_next(&iter->hbi);
+ return hbitmap_iter_next(&iter->hbi) * BDRV_SECTOR_SIZE;
}
/* Called within bdrv_dirty_bitmap_lock..unlock */
diff --git a/block/mirror.c b/block/mirror.c
index 70586bb..4bae86a 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -336,10 +336,10 @@ static uint64_t coroutine_fn
mirror_iteration(MirrorBlockJob *s)
int max_io_bytes = MAX(s->buf_size / MAX_IN_FLIGHT, MAX_IO_BYTES);
bdrv_dirty_bitmap_lock(s->dirty_bitmap);
- offset = bdrv_dirty_iter_next(s->dbi) * BDRV_SECTOR_SIZE;
+ offset = bdrv_dirty_iter_next(s->dbi);
if (offset < 0) {
bdrv_set_dirty_iter(s->dbi, 0);
- offset = bdrv_dirty_iter_next(s->dbi) * BDRV_SECTOR_SIZE;
+ offset = bdrv_dirty_iter_next(s->dbi);
trace_mirror_restart_iter(s, bdrv_get_dirty_count(s->dirty_bitmap) *
BDRV_SECTOR_SIZE);
assert(offset >= 0);
@@ -370,11 +370,11 @@ static uint64_t coroutine_fn
mirror_iteration(MirrorBlockJob *s)
break;
}
- next_dirty = bdrv_dirty_iter_next(s->dbi) * BDRV_SECTOR_SIZE;
+ next_dirty = bdrv_dirty_iter_next(s->dbi);
if (next_dirty > next_offset || next_dirty < 0) {
/* The bitmap iterator's cache is stale, refresh it */
bdrv_set_dirty_iter(s->dbi, next_offset);
- next_dirty = bdrv_dirty_iter_next(s->dbi) * BDRV_SECTOR_SIZE;
+ next_dirty = bdrv_dirty_iter_next(s->dbi);
}
assert(next_dirty == next_offset);
nb_chunks++;
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index 0ae8d01..5540fba 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -1105,7 +1105,7 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,
sbc = limit >> BDRV_SECTOR_BITS;
assert(DIV_ROUND_UP(bm_size, limit) == tb_size);
- while ((sector = bdrv_dirty_iter_next(dbi)) != -1) {
+ while ((sector = bdrv_dirty_iter_next(dbi) >> BDRV_SECTOR_BITS) != -1) {
uint64_t cluster = sector / sbc;
uint64_t end, write_size;
int64_t off;
--
2.9.4
- [Qemu-block] [PATCH v5 00/18] make dirty-bitmap byte-based, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 01/18] dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 02/18] hbitmap: Rename serialization_granularity to serialization_align, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 03/18] qcow2: Ensure bitmap serialization is aligned, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 04/18] dirty-bitmap: Drop unused functions, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 05/18] dirty-bitmap: Change bdrv_dirty_bitmap_size() to report bytes, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 06/18] dirty-bitmap: Change bdrv_dirty_bitmap_*serialize*() to take bytes, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 07/18] qcow2: Switch sectors_covered_by_bitmap_cluster() to byte-based, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 08/18] dirty-bitmap: Set iterator start by offset, not sector, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 09/18] dirty-bitmap: Change bdrv_dirty_iter_next() to report byte offset,
Eric Blake <=
- [Qemu-block] [PATCH v5 10/18] dirty-bitmap: Change bdrv_get_dirty_count() to report bytes, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 11/18] dirty-bitmap: Change bdrv_get_dirty_locked() to take bytes, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 12/18] dirty-bitmap: Change bdrv_[re]set_dirty_bitmap() to use bytes, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 13/18] mirror: Switch mirror_dirty_init() to byte-based iteration, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 14/18] qcow2: Switch qcow2_measure() to byte-based iteration, Eric Blake, 2017/07/12
- [Qemu-block] [PATCH v5 15/18] qcow2: Switch load_bitmap_data() to byte-based iteration, Eric Blake, 2017/07/12