[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 6/7] block/dirty-bitmap: bdrv_clear_dirty_bitmap:
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v2 6/7] block/dirty-bitmap: bdrv_clear_dirty_bitmap: drop unused parameter |
Date: |
Mon, 16 Apr 2018 14:44:13 +0300 |
Drop parameter "HBitmap **out" which is unused now, all callers set
it to NULL.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
include/block/block_int.h | 2 +-
block/dirty-bitmap.c | 14 +++++---------
blockdev.c | 4 ++--
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 22059c8119..61fac62c06 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -1086,7 +1086,7 @@ bool blk_dev_is_medium_locked(BlockBackend *blk);
void bdrv_set_dirty(BlockDriverState *bs, int64_t offset, int64_t bytes);
-void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out);
+void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap);
void bdrv_inc_in_flight(BlockDriverState *bs);
void bdrv_dec_in_flight(BlockDriverState *bs);
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 3c69a8eed9..35600922f5 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -591,19 +591,15 @@ void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap,
bdrv_dirty_bitmap_unlock(bitmap);
}
-void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out)
+void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap)
{
assert(bdrv_dirty_bitmap_enabled(bitmap));
assert(!bdrv_dirty_bitmap_readonly(bitmap));
+
bdrv_dirty_bitmap_lock(bitmap);
- if (!out) {
- hbitmap_reset_all(bitmap->bitmap);
- } else {
- HBitmap *backup = bitmap->bitmap;
- bitmap->bitmap = hbitmap_alloc(bitmap->size,
- hbitmap_granularity(backup));
- *out = backup;
- }
+
+ hbitmap_reset_all(bitmap->bitmap);
+
bdrv_dirty_bitmap_unlock(bitmap);
}
diff --git a/blockdev.c b/blockdev.c
index 88eae60c1c..54e1ba8f44 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2135,7 +2135,7 @@ static void
block_dirty_bitmap_clear_commit(BlkActionState *common)
BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,
common, common);
- bdrv_clear_dirty_bitmap(state->bitmap, NULL);
+ bdrv_clear_dirty_bitmap(state->bitmap);
}
static void abort_prepare(BlkActionState *common, Error **errp)
@@ -2906,7 +2906,7 @@ void qmp_block_dirty_bitmap_clear(const char *node, const
char *name,
return;
}
- bdrv_clear_dirty_bitmap(bitmap, NULL);
+ bdrv_clear_dirty_bitmap(bitmap);
}
BlockDirtyBitmapSha256 *qmp_x_debug_block_dirty_bitmap_sha256(const char *node,
--
2.11.1
- [Qemu-block] [PATCH v2 for-2.13 0/7] Dirty bitmaps fixing and refactoring, Vladimir Sementsov-Ogievskiy, 2018/04/16
- [Qemu-block] [PATCH v2 2/7] dirty-bitmaps: fix comment about dirty_bitmap_mutex, Vladimir Sementsov-Ogievskiy, 2018/04/16
- [Qemu-block] [PATCH v2 1/7] block/dirty-bitmap: add lock to bdrv_enable/disable_dirty_bitmap, Vladimir Sementsov-Ogievskiy, 2018/04/16
- [Qemu-block] [PATCH v2 6/7] block/dirty-bitmap: bdrv_clear_dirty_bitmap: drop unused parameter,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH v2 7/7] blockdev: unify block-dirty-bitmap-clear command and transaction action, Vladimir Sementsov-Ogievskiy, 2018/04/16
- [Qemu-block] [PATCH v2 5/7] blockdev: refactor block-dirty-bitmap-clear transaction, Vladimir Sementsov-Ogievskiy, 2018/04/16
- [Qemu-block] [PATCH v2 3/7] dirty-bitmap: remove missed bdrv_dirty_bitmap_get_autoload header, Vladimir Sementsov-Ogievskiy, 2018/04/16
- [Qemu-block] [PATCH v2 4/7] dirty-bitmap: separate unused meta-bitmap related functions, Vladimir Sementsov-Ogievskiy, 2018/04/16