[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 4/5] blockdev: rename block-dirty-bitmap-clear tr
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v3 4/5] blockdev: rename block-dirty-bitmap-clear transaction handlers |
Date: |
Fri, 14 Sep 2018 18:15:14 +0300 |
Rename block-dirty-bitmap-clear transaction handlers to reuse them for
x-block-dirty-bitmap-merge transaction in the following patch.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
blockdev.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 9cb29ca63e..5348e8ba9b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2026,7 +2026,7 @@ static void
block_dirty_bitmap_clear_prepare(BlkActionState *common,
bdrv_clear_dirty_bitmap(state->bitmap, &state->backup);
}
-static void block_dirty_bitmap_clear_abort(BlkActionState *common)
+static void block_dirty_bitmap_restore(BlkActionState *common)
{
BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,
common, common);
@@ -2036,7 +2036,7 @@ static void block_dirty_bitmap_clear_abort(BlkActionState
*common)
}
}
-static void block_dirty_bitmap_clear_commit(BlkActionState *common)
+static void block_dirty_bitmap_free_backup(BlkActionState *common)
{
BlockDirtyBitmapState *state = DO_UPCAST(BlockDirtyBitmapState,
common, common);
@@ -2170,8 +2170,8 @@ static const BlkActionOps actions[] = {
[TRANSACTION_ACTION_KIND_BLOCK_DIRTY_BITMAP_CLEAR] = {
.instance_size = sizeof(BlockDirtyBitmapState),
.prepare = block_dirty_bitmap_clear_prepare,
- .commit = block_dirty_bitmap_clear_commit,
- .abort = block_dirty_bitmap_clear_abort,
+ .commit = block_dirty_bitmap_free_backup,
+ .abort = block_dirty_bitmap_restore,
},
[TRANSACTION_ACTION_KIND_X_BLOCK_DIRTY_BITMAP_ENABLE] = {
.instance_size = sizeof(BlockDirtyBitmapState),
--
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, 2018/09/14
- [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 <=
- 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