[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/22] block/dirty-bitmap: explicitly lock bitmaps wi
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL 06/22] block/dirty-bitmap: explicitly lock bitmaps with successors |
Date: |
Tue, 12 Mar 2019 16:23:21 -0400 |
Instead of implying a user_locked/busy status, make it explicit.
Now, bitmaps in use by migration, NBD or backup operations
are all treated the same way with the same code paths.
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 | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index fa411f9e87..a4951780e2 100644
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -50,7 +50,7 @@ struct BdrvDirtyBitmap {
HBitmap *meta; /* Meta dirty bitmap */
bool qmp_locked; /* Bitmap is locked, it can't be modified
through QMP */
- BdrvDirtyBitmap *successor; /* Anonymous child; implies user_locked state
*/
+ BdrvDirtyBitmap *successor; /* Anonymous child, if any. */
char *name; /* Optional non-empty unique ID */
int64_t size; /* Size of the bitmap, in bytes */
bool disabled; /* Bitmap is disabled. It ignores all writes to
@@ -188,10 +188,8 @@ bool bdrv_dirty_bitmap_has_successor(BdrvDirtyBitmap
*bitmap)
return bitmap->successor;
}
-/* Both conditions disallow user-modification via QMP. */
bool bdrv_dirty_bitmap_user_locked(BdrvDirtyBitmap *bitmap) {
- return bdrv_dirty_bitmap_has_successor(bitmap) ||
- bdrv_dirty_bitmap_qmp_locked(bitmap);
+ return bdrv_dirty_bitmap_qmp_locked(bitmap);
}
void bdrv_dirty_bitmap_set_qmp_locked(BdrvDirtyBitmap *bitmap, bool qmp_locked)
@@ -267,8 +265,9 @@ int bdrv_dirty_bitmap_create_successor(BlockDriverState *bs,
child->disabled = bitmap->disabled;
bitmap->disabled = true;
- /* Install the successor and freeze the parent */
+ /* Install the successor and lock the parent */
bitmap->successor = child;
+ bitmap->qmp_locked = true;
return 0;
}
@@ -323,6 +322,7 @@ BdrvDirtyBitmap
*bdrv_dirty_bitmap_abdicate(BlockDriverState *bs,
bitmap->successor = NULL;
successor->persistent = bitmap->persistent;
bitmap->persistent = false;
+ bitmap->qmp_locked = false;
bdrv_release_dirty_bitmap(bs, bitmap);
return successor;
@@ -352,6 +352,7 @@ BdrvDirtyBitmap
*bdrv_reclaim_dirty_bitmap_locked(BlockDriverState *bs,
}
parent->disabled = successor->disabled;
+ parent->qmp_locked = false;
bdrv_release_dirty_bitmap_locked(successor);
parent->successor = NULL;
--
2.17.2
- [Qemu-devel] [PULL 00/22] Bitmaps patches, John Snow, 2019/03/12
- [Qemu-devel] [PULL 01/22] block/dirty-bitmap: add recording and busy properties, John Snow, 2019/03/12
- [Qemu-devel] [PULL 03/22] block/dirty-bitmap: remove set/reset assertions against enabled bit, John Snow, 2019/03/12
- [Qemu-devel] [PULL 02/22] block/dirty-bitmaps: rename frozen predicate helper, John Snow, 2019/03/12
- [Qemu-devel] [PULL 04/22] block/dirty-bitmap: change semantics of enabled predicate, John Snow, 2019/03/12
- [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 <=
- [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, 2019/03/12
- [Qemu-devel] [PULL 14/22] block/dirty-bitmaps: prohibit readonly bitmaps for backups, John Snow, 2019/03/12