[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 2/5] dirty-bitmap: rename bdrv_undo_clear_dirty_b
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v3 2/5] dirty-bitmap: rename bdrv_undo_clear_dirty_bitmap |
Date: |
Fri, 14 Sep 2018 18:15:12 +0300 |
Use more generic names to reuse the function for bitmap merge in the
following commit.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
include/block/block_int.h | 2 +-
block/dirty-bitmap.c | 4 ++--
blockdev.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 903b9c1034..677065ae30 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -1149,7 +1149,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_undo_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *in);
+void bdrv_restore_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *backup);
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 6c8761e027..017ee9db46 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -633,12 +633,12 @@ void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap,
HBitmap **out)
bdrv_dirty_bitmap_unlock(bitmap);
}
-void bdrv_undo_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *in)
+void bdrv_restore_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap *backup)
{
HBitmap *tmp = bitmap->bitmap;
assert(bdrv_dirty_bitmap_enabled(bitmap));
assert(!bdrv_dirty_bitmap_readonly(bitmap));
- bitmap->bitmap = in;
+ bitmap->bitmap = backup;
hbitmap_free(tmp);
}
diff --git a/blockdev.c b/blockdev.c
index 902338e815..f133e87414 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2032,7 +2032,7 @@ static void block_dirty_bitmap_clear_abort(BlkActionState
*common)
common, common);
if (state->backup) {
- bdrv_undo_clear_dirty_bitmap(state->bitmap, state->backup);
+ bdrv_restore_dirty_bitmap(state->bitmap, state->backup);
}
}
--
2.18.0
- [Qemu-block] [PATCH v3 0/4] transaction support for bitmap merge, Vladimir Sementsov-Ogievskiy, 2018/09/14
- [Qemu-block] [PATCH v3 2/5] dirty-bitmap: rename bdrv_undo_clear_dirty_bitmap,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH v3 3/5] dirty-bitmap: make it possible to restore bitmap after merge, Vladimir Sementsov-Ogievskiy, 2018/09/14
- [Qemu-block] [PATCH v3 1/5] dirty-bitmap: switch assert-fails to errors in bdrv_merge_dirty_bitmap, Vladimir Sementsov-Ogievskiy, 2018/09/14
- [Qemu-block] [PATCH v3 5/5] qapi: add transaction support for x-block-dirty-bitmap-merge, Vladimir Sementsov-Ogievskiy, 2018/09/14
- [Qemu-block] [PATCH v3 4/5] blockdev: rename block-dirty-bitmap-clear transaction handlers, Vladimir Sementsov-Ogievskiy, 2018/09/14
- Re: [Qemu-block] [Qemu-devel] [PATCH v3 0/4] transaction support for bitmap merge, John Snow, 2018/09/14
- Re: [Qemu-block] [Qemu-devel] [PATCH v3 0/4] transaction support for bitmap merge, John Snow, 2018/09/14