[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 for-2.7 7/8] block: Assert !bs->refcnt in bdrv_cl
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 for-2.7 7/8] block: Assert !bs->refcnt in bdrv_close() |
Date: |
Fri, 8 Apr 2016 19:10:14 +0200 |
The only caller of bdrv_close() left is bdrv_delete(). We may as well
assert that, in a way (there are some things in bdrv_close() that make
more sense under that assumption, such as the call to
bdrv_release_all_dirty_bitmaps() which in turn assumes that no frozen
bitmaps are attached to the BDS).
In addition, being called only in bdrv_delete() means that we can drop
bdrv_close()'s forward declaration at the top of block.c.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
block.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 67cee0a..6f5b84c 100644
--- a/block.c
+++ b/block.c
@@ -74,8 +74,6 @@ static BlockDriverState *bdrv_open_inherit(const char
*filename,
/* If non-zero, use only whitelisted block drivers */
static int use_bdrv_whitelist;
-static void bdrv_close(BlockDriverState *bs);
-
#ifdef _WIN32
static int is_windows_drive_prefix(const char *filename)
{
@@ -2111,6 +2109,7 @@ static void bdrv_close(BlockDriverState *bs)
BdrvAioNotifier *ban, *ban_next;
assert(!bs->job);
+ assert(!bs->refcnt);
bdrv_drained_begin(bs); /* complete I/O */
bdrv_flush(bs);
--
2.8.0
- [Qemu-devel] [PATCH v3 for-2.7 0/8] blockdev: (Nearly) free clean-up work, Max Reitz, 2016/04/08
- [Qemu-devel] [PATCH v3 for-2.7 1/8] block: Drop useless bdrv_new() call, Max Reitz, 2016/04/08
- [Qemu-devel] [PATCH v3 for-2.7 2/8] block: Let bdrv_open_inherit() return the snapshot, Max Reitz, 2016/04/08
- [Qemu-devel] [PATCH v3 for-2.7 3/8] tests: Drop BDS from test-throttle.c, Max Reitz, 2016/04/08
- [Qemu-devel] [PATCH v3 for-2.7 4/8] block: Drop blk_new_with_bs(), Max Reitz, 2016/04/08
- [Qemu-devel] [PATCH v3 for-2.7 5/8] block: Drop bdrv_new_root(), Max Reitz, 2016/04/08
- [Qemu-devel] [PATCH v3 for-2.7 7/8] block: Assert !bs->refcnt in bdrv_close(),
Max Reitz <=
- [Qemu-devel] [PATCH v3 for-2.7 8/8] block: Drop bdrv_parent_cb_...() from bdrv_close(), Max Reitz, 2016/04/08
- [Qemu-devel] [PATCH v3 for-2.7 6/8] block: Make bdrv_open() return a BDS, Max Reitz, 2016/04/08
- Re: [Qemu-devel] [PATCH v3 for-2.7 0/8] blockdev: (Nearly) free clean-up work, Kevin Wolf, 2016/04/27