[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/22] block/dirty-bitmaps: disallow busy bitmaps as
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL 16/22] block/dirty-bitmaps: disallow busy bitmaps as merge source |
Date: |
Tue, 12 Mar 2019 16:23:31 -0400 |
We didn't do any state checking on source bitmaps at all,
so this adds inconsistent and busy checks. readonly is
allowed, so you can still copy a readonly bitmap to a new
destination to use it for operations like drive-backup.
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 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 6170f3a454..2139354230 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -825,6 +825,9 @@ void bdrv_merge_dirty_bitmap(BdrvDirtyBitmap *dest, const
BdrvDirtyBitmap *src,
goto out;
}
+ if (bdrv_dirty_bitmap_check(src, BDRV_BITMAP_ALLOW_RO, errp)) {
+ goto out;
+ }
if (!hbitmap_can_merge(dest->bitmap, src->bitmap)) {
error_setg(errp, "Bitmaps are incompatible and can't be merged");
--
2.17.2
- [Qemu-devel] [PULL 05/22] nbd: change error checking order for bitmaps, (continued)
- [Qemu-devel] [PULL 05/22] nbd: change error checking order for bitmaps, John Snow, 2019/03/12
- [Qemu-devel] [PULL 06/22] block/dirty-bitmap: explicitly lock bitmaps with successors, John Snow, 2019/03/12
- [Qemu-devel] [PULL 08/22] block/dirty-bitmaps: move comment block, John Snow, 2019/03/12
- [Qemu-devel] [PULL 09/22] blockdev: remove unused paio parameter documentation, John Snow, 2019/03/12
- [Qemu-devel] [PULL 07/22] block/dirty-bitmaps: unify qmp_locked and user_locked calls, John Snow, 2019/03/12
- [Qemu-devel] [PULL 11/22] block/dirty-bitmaps: add inconsistent bit, John Snow, 2019/03/12
- [Qemu-devel] [PULL 10/22] iotests: add busy/recording bit test to 124, John Snow, 2019/03/12
- [Qemu-devel] [PULL 12/22] block/dirty-bitmap: add inconsistent status, John Snow, 2019/03/12
- [Qemu-devel] [PULL 13/22] block/dirty-bitmaps: add block_dirty_bitmap_check function, John Snow, 2019/03/12
- [Qemu-devel] [PULL 15/22] block/dirty-bitmaps: prohibit removing readonly bitmaps, John Snow, 2019/03/12
- [Qemu-devel] [PULL 16/22] block/dirty-bitmaps: disallow busy bitmaps as merge source,
John Snow <=
- [Qemu-devel] [PULL 14/22] block/dirty-bitmaps: prohibit readonly bitmaps for backups, John Snow, 2019/03/12
- [Qemu-devel] [PULL 17/22] block/dirty-bitmaps: implement inconsistent bit, John Snow, 2019/03/12
- [Qemu-devel] [PULL 18/22] bitmaps: Fix typo in function name, John Snow, 2019/03/12
- [Qemu-devel] [PULL 19/22] docs/interop/qcow2: Improve bitmap flag in_use specification, John Snow, 2019/03/12
- [Qemu-devel] [PULL 20/22] block/qcow2-bitmap: Don't check size for IN_USE bitmap, John Snow, 2019/03/12
- [Qemu-devel] [PULL 21/22] block/qcow2-bitmap: Allow resizes with persistent bitmaps, John Snow, 2019/03/12
- [Qemu-devel] [PULL 22/22] tests/qemu-iotests: add bitmap resize test 246, John Snow, 2019/03/12
- Re: [Qemu-devel] [PULL 00/22] Bitmaps patches, Peter Maydell, 2019/03/13