Commit 64dff520 authored Jan 29, 2016 by Max Reitz

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>

parent 938abd43

block.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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;

include/block/block.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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,