[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/19] block/dirty-bitmaps: allow clear on disabled b
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL 12/19] block/dirty-bitmaps: allow clear on disabled bitmaps |
Date: |
Mon, 29 Oct 2018 17:24:54 -0400 |
Similarly to merge, it's OK to allow clear operations on disabled
bitmaps, as this condition only means that they are not recording
new writes. We are free to clear it if the user requests it.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>
---
block/dirty-bitmap.c | 1 -
blockdev.c | 8 --------
2 files changed, 9 deletions(-)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index bfccb0ea15..9b9ebd7142 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -625,7 +625,6 @@ void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap,
void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out)
{
- assert(bdrv_dirty_bitmap_enabled(bitmap));
assert(!bdrv_dirty_bitmap_readonly(bitmap));
bdrv_dirty_bitmap_lock(bitmap);
if (!out) {
diff --git a/blockdev.c b/blockdev.c
index 9da0cf1a72..8970f699b9 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2013,9 +2013,6 @@ static void
block_dirty_bitmap_clear_prepare(BlkActionState *common,
if (bdrv_dirty_bitmap_user_locked(state->bitmap)) {
error_setg(errp, "Cannot modify a bitmap in use by another operation");
return;
- } else if (!bdrv_dirty_bitmap_enabled(state->bitmap)) {
- error_setg(errp, "Cannot clear a disabled bitmap");
- return;
} else if (bdrv_dirty_bitmap_readonly(state->bitmap)) {
error_setg(errp, "Cannot clear a readonly bitmap");
return;
@@ -2918,11 +2915,6 @@ void qmp_block_dirty_bitmap_clear(const char *node,
const char *name,
"Bitmap '%s' is currently in use by another operation"
" and cannot be cleared", 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;
--
2.14.5
- [Qemu-devel] [PULL 01/19] blockdev-backup: add bitmap argument, (continued)
- [Qemu-devel] [PULL 01/19] blockdev-backup: add bitmap argument, John Snow, 2018/10/29
- [Qemu-devel] [PULL 05/19] blockdev: rename block-dirty-bitmap-clear transaction handlers, John Snow, 2018/10/29
- [Qemu-devel] [PULL 02/19] dirty-bitmap: switch assert-fails to errors in bdrv_merge_dirty_bitmap, John Snow, 2018/10/29
- [Qemu-devel] [PULL 07/19] iotests: 169: drop deprecated 'autoload' parameter, John Snow, 2018/10/29
- [Qemu-devel] [PULL 06/19] qapi: add transaction support for x-block-dirty-bitmap-merge, John Snow, 2018/10/29
- [Qemu-devel] [PULL 08/19] block/qcow2: improve error message in qcow2_inactivate, John Snow, 2018/10/29
- [Qemu-devel] [PULL 04/19] dirty-bitmap: make it possible to restore bitmap after merge, John Snow, 2018/10/29
- [Qemu-devel] [PULL 09/19] bloc/qcow2: drop dirty_bitmaps_loaded state variable, John Snow, 2018/10/29
- [Qemu-devel] [PULL 10/19] block/dirty-bitmaps: add user_locked status checker, John Snow, 2018/10/29
- [Qemu-devel] [PULL 13/19] block/dirty-bitmaps: prohibit enable/disable on locked/frozen bitmaps, John Snow, 2018/10/29
- [Qemu-devel] [PULL 12/19] block/dirty-bitmaps: allow clear on disabled bitmaps,
John Snow <=
- [Qemu-devel] [PULL 11/19] block/dirty-bitmaps: fix merge permissions, John Snow, 2018/10/29
- [Qemu-devel] [PULL 18/19] iotests: improve 169, John Snow, 2018/10/29
- [Qemu-devel] [PULL 19/19] iotests: 169: add cases for source vm resuming, John Snow, 2018/10/29
- [Qemu-devel] [PULL 15/19] nbd: forbid use of frozen bitmaps, John Snow, 2018/10/29
- [Qemu-devel] [PULL 14/19] block/backup: prohibit backup from using in use bitmaps, John Snow, 2018/10/29
- [Qemu-devel] [PULL 16/19] bitmap: Update count after a merge, John Snow, 2018/10/29
- [Qemu-devel] [PULL 17/19] dirty-bitmaps: clean-up bitmaps loading and migration logic, John Snow, 2018/10/29
- Re: [Qemu-devel] [PULL 00/19] Bitmaps patches, Peter Maydell, 2018/10/30