- 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 <vsement...@virtuozzo.com> --- 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