[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/19] block/dirty-bitmaps: prohibit enable/disable o
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL 13/19] block/dirty-bitmaps: prohibit enable/disable on locked/frozen bitmaps |
Date: |
Mon, 29 Oct 2018 17:24:55 -0400 |
We're not being consistent about this. If it's in use by an operation,
the user should not be able to change the behavior of that bitmap.
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>
---
blockdev.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 8970f699b9..35097b92cc 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2059,6 +2059,13 @@ static void
block_dirty_bitmap_enable_prepare(BlkActionState *common,
return;
}
+ if (bdrv_dirty_bitmap_user_locked(state->bitmap)) {
+ error_setg(errp,
+ "Bitmap '%s' is currently in use by another operation"
+ " and cannot be enabled", action->name);
+ return;
+ }
+
state->was_enabled = bdrv_dirty_bitmap_enabled(state->bitmap);
bdrv_enable_dirty_bitmap(state->bitmap);
}
@@ -2093,6 +2100,13 @@ static void
block_dirty_bitmap_disable_prepare(BlkActionState *common,
return;
}
+ if (bdrv_dirty_bitmap_user_locked(state->bitmap)) {
+ error_setg(errp,
+ "Bitmap '%s' is currently in use by another operation"
+ " and cannot be disabled", action->name);
+ return;
+ }
+
state->was_enabled = bdrv_dirty_bitmap_enabled(state->bitmap);
bdrv_disable_dirty_bitmap(state->bitmap);
}
@@ -2934,10 +2948,10 @@ void qmp_x_block_dirty_bitmap_enable(const char *node,
const char *name,
return;
}
- if (bdrv_dirty_bitmap_frozen(bitmap)) {
+ if (bdrv_dirty_bitmap_user_locked(bitmap)) {
error_setg(errp,
- "Bitmap '%s' is currently frozen and cannot be enabled",
- name);
+ "Bitmap '%s' is currently in use by another operation"
+ " and cannot be enabled", name);
return;
}
@@ -2955,10 +2969,10 @@ void qmp_x_block_dirty_bitmap_disable(const char *node,
const char *name,
return;
}
- if (bdrv_dirty_bitmap_frozen(bitmap)) {
+ if (bdrv_dirty_bitmap_user_locked(bitmap)) {
error_setg(errp,
- "Bitmap '%s' is currently frozen and cannot be disabled",
- name);
+ "Bitmap '%s' is currently in use by another operation"
+ " and cannot be disabled", name);
return;
}
--
2.14.5
- [Qemu-devel] [PULL 03/19] dirty-bitmap: rename bdrv_undo_clear_dirty_bitmap, (continued)
- [Qemu-devel] [PULL 03/19] dirty-bitmap: rename bdrv_undo_clear_dirty_bitmap, John Snow, 2018/10/29
- [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 <=
- [Qemu-devel] [PULL 12/19] block/dirty-bitmaps: allow clear on disabled bitmaps, John Snow, 2018/10/29
- [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