diff options
| author | Max Reitz <mreitz@redhat.com> | 2016-01-29 16:36:10 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-02-02 17:50:46 +0100 |
| commit | 64dff52019367194699a772e3cc31941fd9752a8 (patch) | |
| tree | 52af45aa0b9ab9921880bff5dbf3150123b980ac | |
| parent | 938abd4325951f94e87765b7daea61bf0bf71a5e (diff) | |
| download | qemu-64dff52019367194699a772e3cc31941fd9752a8.zip qemu-64dff52019367194699a772e3cc31941fd9752a8.tar.gz qemu-64dff52019367194699a772e3cc31941fd9752a8.tar.bz2 | |
block: Make bdrv_close() static
There are no users of bdrv_close() left, except for one of bdrv_open()'s
failure paths, bdrv_close_all() and bdrv_delete(), and that is good.
Make bdrv_close() static so nobody makes the mistake of directly using
bdrv_close() again.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block.c | 4 | ||||
| -rw-r--r-- | include/block/block.h | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -93,6 +93,8 @@ static void bdrv_release_named_dirty_bitmaps(BlockDriverState *bs); /* 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) { @@ -2134,7 +2136,7 @@ void bdrv_reopen_abort(BDRVReopenState *reopen_state) } -void bdrv_close(BlockDriverState *bs) +static void bdrv_close(BlockDriverState *bs) { BdrvAioNotifier *ban, *ban_next; diff --git a/include/block/block.h b/include/block/block.h index c7345de..4452b79 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -225,7 +225,6 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue, Error **errp); void bdrv_reopen_commit(BDRVReopenState *reopen_state); void bdrv_reopen_abort(BDRVReopenState *reopen_state); -void bdrv_close(BlockDriverState *bs); int bdrv_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors); int bdrv_read_unthrottled(BlockDriverState *bs, int64_t sector_num, |