[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/48] block: Release named dirty bitmaps in bdrv_clo
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 16/48] block: Release named dirty bitmaps in bdrv_close() |
Date: |
Fri, 29 Jan 2016 18:37:22 +0100 |
From: Max Reitz <address@hidden>
bdrv_delete() is not very happy about deleting BlockDriverStates with
dirty bitmaps still attached to them. In the past, we got around that
very easily by relying on bdrv_close_all() bypassing bdrv_delete(), and
bdrv_close() simply ignoring that condition. We should fix that by
releasing all named dirty bitmaps in bdrv_close() (there should not be
any unnamed bitmaps left) and moving the assertion from bdrv_delete()
there.
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 39 +++++++++++++++++++++++++++++++--------
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/block.c b/block.c
index 5709d3d..41ab00e 100644
--- a/block.c
+++ b/block.c
@@ -88,6 +88,8 @@ static int bdrv_open_inherit(BlockDriverState **pbs, const
char *filename,
const BdrvChildRole *child_role, Error **errp);
static void bdrv_dirty_bitmap_truncate(BlockDriverState *bs);
+static void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs);
+
/* If non-zero, use only whitelisted block drivers */
static int use_bdrv_whitelist;
@@ -2157,6 +2159,9 @@ void bdrv_close(BlockDriverState *bs)
notifier_list_notify(&bs->close_notifiers, bs);
+ bdrv_release_named_dirty_bitmaps(bs);
+ assert(QLIST_EMPTY(&bs->dirty_bitmaps));
+
if (bs->blk) {
blk_dev_change_media_cb(bs->blk, false);
}
@@ -2366,7 +2371,6 @@ static void bdrv_delete(BlockDriverState *bs)
assert(!bs->job);
assert(bdrv_op_blocker_is_empty(bs));
assert(!bs->refcnt);
- assert(QLIST_EMPTY(&bs->dirty_bitmaps));
bdrv_close(bs);
@@ -3582,21 +3586,40 @@ static void bdrv_dirty_bitmap_truncate(BlockDriverState
*bs)
}
}
-void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap)
+static void bdrv_do_release_matching_dirty_bitmap(BlockDriverState *bs,
+ BdrvDirtyBitmap *bitmap,
+ bool only_named)
{
BdrvDirtyBitmap *bm, *next;
QLIST_FOREACH_SAFE(bm, &bs->dirty_bitmaps, list, next) {
- if (bm == bitmap) {
+ if ((!bitmap || bm == bitmap) && (!only_named || bm->name)) {
assert(!bdrv_dirty_bitmap_frozen(bm));
- QLIST_REMOVE(bitmap, list);
- hbitmap_free(bitmap->bitmap);
- g_free(bitmap->name);
- g_free(bitmap);
- return;
+ QLIST_REMOVE(bm, list);
+ hbitmap_free(bm->bitmap);
+ g_free(bm->name);
+ g_free(bm);
+
+ if (bitmap) {
+ return;
+ }
}
}
}
+void bdrv_release_dirty_bitmap(BlockDriverState *bs, BdrvDirtyBitmap *bitmap)
+{
+ bdrv_do_release_matching_dirty_bitmap(bs, bitmap, false);
+}
+
+/**
+ * Release all named dirty bitmaps attached to a BDS (for use in bdrv_close()).
+ * There must not be any frozen bitmaps attached.
+ */
+static void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs)
+{
+ bdrv_do_release_matching_dirty_bitmap(bs, NULL, true);
+}
+
void bdrv_disable_dirty_bitmap(BdrvDirtyBitmap *bitmap)
{
assert(!bdrv_dirty_bitmap_frozen(bitmap));
--
1.8.3.1
- [Qemu-devel] [PULL 04/48] block/qapi: Emit tray_open only if there is a tray, (continued)
- [Qemu-devel] [PULL 04/48] block/qapi: Emit tray_open only if there is a tray, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 03/48] Revert "hw/block/fdc: Implement tray status", Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 07/48] nbd: client_close on error in nbd_co_client_start, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 05/48] vmdk: Fix converting to streamOptimized, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 06/48] iotests: Limit supported formats for 118, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 09/48] iotests: Change coding style of _filter_nbd in 083, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 02/48] blockdev: Fix 'change' for slot devices, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 12/48] iotests: Make _filter_nbd support more URL types, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 13/48] iotests: Make redirecting qemu's stderr optional, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 14/48] iotests: Add test for a nonexistent NBD export, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 16/48] block: Release named dirty bitmaps in bdrv_close(),
Kevin Wolf <=
- [Qemu-devel] [PULL 10/48] iotests: Move _filter_nbd into common.filter, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 15/48] block: Remove unused struct definition BlockFinishData, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 11/48] iotests: Make _filter_nbd drop log lines, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 17/48] iotests: Add test for eject under NBD server, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 08/48] iotests: Rename filter_nbd to _filter_nbd in 083, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 21/48] nbd: Switch from close to eject notifier, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 22/48] block: Remove BDS close notifier, Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 24/48] blockdev: Use blk_remove_bs() in do_drive_del(), Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 23/48] block: Use blk_remove_bs() in blk_delete(), Kevin Wolf, 2016/01/29
- [Qemu-devel] [PULL 18/48] block: Add BB-BDS remove/insert notifiers, Kevin Wolf, 2016/01/29