[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 7/7] blockdev: unify block-dirty-bitmap-clear comman
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH 7/7] blockdev: unify block-dirty-bitmap-clear command and transaction action |
Date: |
Mon, 26 Mar 2018 14:20:56 +0300 |
- use error messages from qmp command, as they are more descriptive
- we need not check bs, as block_dirty_bitmap_lookup never returns
bs = NULL on success (and if user set bs to be not NULL pointer),
so, let's just assert it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
blockdev.c | 53 +++++++++++++++++++++--------------------------------
1 file changed, 21 insertions(+), 32 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 54e1ba8f44..3f0979298e 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2114,18 +2114,26 @@ static void
block_dirty_bitmap_clear_prepare(BlkActionState *common,
if (!state->bitmap) {
return;
}
+ assert(state->bs != NULL);
if (bdrv_dirty_bitmap_frozen(state->bitmap)) {
- error_setg(errp, "Cannot modify a frozen bitmap");
+ error_setg(errp,
+ "Bitmap '%s' is currently frozen and cannot be modified",
+ action->name);
return;
} else if (bdrv_dirty_bitmap_qmp_locked(state->bitmap)) {
- error_setg(errp, "Cannot modify a locked bitmap");
+ error_setg(errp,
+ "Bitmap '%s' is currently locked and cannot be modified",
+ action->name);
return;
} else if (!bdrv_dirty_bitmap_enabled(state->bitmap)) {
- error_setg(errp, "Cannot clear a disabled bitmap");
+ error_setg(errp,
+ "Bitmap '%s' is currently disabled and cannot be cleared",
+ action->name);
return;
} else if (bdrv_dirty_bitmap_readonly(state->bitmap)) {
- error_setg(errp, "Cannot clear a readonly bitmap");
+ error_setg(errp, "Bitmap '%s' is readonly and cannot be cleared",
+ action->name);
return;
}
}
@@ -2878,35 +2886,16 @@ void qmp_block_dirty_bitmap_remove(const char *node,
const char *name,
void qmp_block_dirty_bitmap_clear(const char *node, const char *name,
Error **errp)
{
- BdrvDirtyBitmap *bitmap;
- BlockDriverState *bs;
-
- bitmap = block_dirty_bitmap_lookup(node, name, &bs, errp);
- if (!bitmap || !bs) {
- return;
- }
-
- if (bdrv_dirty_bitmap_frozen(bitmap)) {
- error_setg(errp,
- "Bitmap '%s' is currently frozen and cannot be modified",
- name);
- return;
- } else if (bdrv_dirty_bitmap_qmp_locked(bitmap)) {
- error_setg(errp,
- "Bitmap '%s' is currently locked and cannot be modified",
- name);
- return;
- } else if (!bdrv_dirty_bitmap_enabled(bitmap)) {
- error_setg(errp,
- "Bitmap '%s' is currently disabled and cannot be cleared",
- name);
- return;
- } else if (bdrv_dirty_bitmap_readonly(bitmap)) {
- error_setg(errp, "Bitmap '%s' is readonly and cannot be cleared",
name);
- return;
- }
+ BlockDirtyBitmap data = {
+ .node = (char *)node,
+ .name = (char *)name
+ };
+ TransactionAction action = {
+ .type = TRANSACTION_ACTION_KIND_BLOCK_DIRTY_BITMAP_CLEAR,
+ .u.block_dirty_bitmap_clear.data = &data,
+ };
- bdrv_clear_dirty_bitmap(bitmap);
+ blockdev_do_action(&action, errp);
}
BlockDirtyBitmapSha256 *qmp_x_debug_block_dirty_bitmap_sha256(const char *node,
--
2.11.1
- [Qemu-block] [PATCH 0/7] Dirty bitmaps fixing and refactoring, Vladimir Sementsov-Ogievskiy, 2018/03/26
- [Qemu-block] [PATCH 7/7] blockdev: unify block-dirty-bitmap-clear command and transaction action,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH 1/7] block/dirty-bitmap: add lock to bdrv_enable/disable_dirty_bitmap, Vladimir Sementsov-Ogievskiy, 2018/03/26
- [Qemu-block] [PATCH 3/7] dirty-bitmap: remove missed bdrv_dirty_bitmap_get_autoload header, Vladimir Sementsov-Ogievskiy, 2018/03/26
- [Qemu-block] [PATCH 4/7] dirty-bitmap: separate unused meta-bitmap related functions, Vladimir Sementsov-Ogievskiy, 2018/03/26
- [Qemu-block] [PATCH 6/7] block/dirty-bitmap: bdrv_clear_dirty_bitmap: drop unused parameter, Vladimir Sementsov-Ogievskiy, 2018/03/26
- [Qemu-block] [PATCH 2/7] dirty-bitmaps: fix comment about dirty_bitmap_mutex, Vladimir Sementsov-Ogievskiy, 2018/03/26
- Re: [Qemu-block] [Qemu-devel] [PATCH 0/7] Dirty bitmaps fixing and refactoring, Paolo Bonzini, 2018/03/26
- [Qemu-block] [PATCH 5.5/7] dirty-bitmap: drop unused bdrv_undo_clear_dirty_bitmap, Vladimir Sementsov-Ogievskiy, 2018/03/26