From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46774) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2ZXp-0008EE-TT for qemu-devel@nongnu.org; Tue, 17 May 2016 03:35:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2ZXo-0003qi-RH for qemu-devel@nongnu.org; Tue, 17 May 2016 03:35:57 -0400 From: Fam Zheng Date: Tue, 17 May 2016 15:35:15 +0800 Message-Id: <1463470536-8981-7-git-send-email-famz@redhat.com> In-Reply-To: <1463470536-8981-1-git-send-email-famz@redhat.com> References: <1463470536-8981-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v5 06/27] block: Make bdrv_reopen_{commit, abort} private functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Max Reitz , Jeff Cody , Markus Armbruster , Eric Blake , John Snow , qemu-block@nongnu.org, berrange@redhat.com, pbonzini@redhat.com, den@openvz.org, stefanha@redhat.com As parts of the transactional reopen, they are not necessary outside block.c. Make them static. Signed-off-by: Fam Zheng --- block.c | 6 ++++-- include/block/block.h | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 1b42303..ad3663c 100644 --- a/block.c +++ b/block.c @@ -1943,6 +1943,8 @@ BlockReopenQueue *bdrv_reopen_queue(BlockReopenQueue *bs_queue, * to all devices. * */ +static void bdrv_reopen_commit(BDRVReopenState *reopen_state); +static void bdrv_reopen_abort(BDRVReopenState *reopen_state); int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp) { int ret = -1; @@ -2122,7 +2124,7 @@ error: * makes them final by swapping the staging BlockDriverState contents into * the active BlockDriverState contents. */ -void bdrv_reopen_commit(BDRVReopenState *reopen_state) +static void bdrv_reopen_commit(BDRVReopenState *reopen_state) { BlockDriver *drv; @@ -2149,7 +2151,7 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state) * Abort the reopen, and delete and free the staged changes in * reopen_state */ -void bdrv_reopen_abort(BDRVReopenState *reopen_state) +static void bdrv_reopen_abort(BDRVReopenState *reopen_state) { BlockDriver *drv; diff --git a/include/block/block.h b/include/block/block.h index 7a7dfb5..7740d3f 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -228,8 +228,6 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, Error **errp); int bdrv_reopen(BlockDriverState *bs, int bdrv_flags, Error **errp); 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); int bdrv_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors); int bdrv_write(BlockDriverState *bs, int64_t sector_num, -- 2.8.2