diff options
| author | Max Reitz | 2016-05-17 16:41:32 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2016-05-25 19:04:10 +0200 |
| commit | 30f55fb81ff65473d673e79ca7175672e859fa2f (patch) | |
| tree | 3dd6a247e3f8ee2b0c52a93f67ab9e8414f77b13 /block.c | |
| parent | block: Make bdrv_open() return a BDS (diff) | |
| download | qemu-30f55fb81ff65473d673e79ca7175672e859fa2f.tar.gz qemu-30f55fb81ff65473d673e79ca7175672e859fa2f.tar.xz qemu-30f55fb81ff65473d673e79ca7175672e859fa2f.zip | |
block: Assert !bs->refcnt in bdrv_close()
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 <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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) { @@ -2110,6 +2108,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); |