diff options
| author | Vladimir Sementsov-Ogievskiy | 2019-01-16 00:26:50 +0100 |
|---|---|---|
| committer | John Snow | 2019-01-16 00:26:50 +0100 |
| commit | 19c021e1948a81c4ba19b3ff735432b45b6aebee (patch) | |
| tree | ae8e1fb0b4d5d053de932f48d9958261913b1a81 /block | |
| parent | Revert "test-hbitmap: Add non-advancing iter_next tests" (diff) | |
| download | qemu-19c021e1948a81c4ba19b3ff735432b45b6aebee.tar.gz qemu-19c021e1948a81c4ba19b3ff735432b45b6aebee.tar.xz qemu-19c021e1948a81c4ba19b3ff735432b45b6aebee.zip | |
Revert "hbitmap: Add @advance param to hbitmap_iter_next()"
This reverts commit a33fbb4f8b64226becf502a123733776ce319b24.
The functionality is unused.
Note: in addition to automatic revert, drop second parameter in
hbitmap_iter_next() call from hbitmap_next_dirty_area() too.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/backup.c | 2 | ||||
| -rw-r--r-- | block/dirty-bitmap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/backup.c b/block/backup.c index 9ffce5c183..435414e964 100644 --- a/block/backup.c +++ b/block/backup.c @@ -385,7 +385,7 @@ static int coroutine_fn backup_run_incremental(BackupBlockJob *job) HBitmapIter hbi; hbitmap_iter_init(&hbi, job->copy_bitmap, 0); - while ((cluster = hbitmap_iter_next(&hbi, true)) != -1) { + while ((cluster = hbitmap_iter_next(&hbi)) != -1) { do { if (yield_and_check(job)) { return 0; diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c index 4d9a8af17d..00ea36f554 100644 --- a/block/dirty-bitmap.c +++ b/block/dirty-bitmap.c @@ -515,7 +515,7 @@ void bdrv_dirty_iter_free(BdrvDirtyBitmapIter *iter) int64_t bdrv_dirty_iter_next(BdrvDirtyBitmapIter *iter) { - return hbitmap_iter_next(&iter->hbi, true); + return hbitmap_iter_next(&iter->hbi); } /* Called within bdrv_dirty_bitmap_lock..unlock */ |