On 17.05.2016 09:35, Fam Zheng wrote: > As parts of the transactional reopen, they are not necessary outside > block.c. Make them static. > > Signed-off-by: Fam Zheng <f...@redhat.com> > --- > 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);
I'd rather put these declarations above the comment describing
bdrv_reopen_multiple(); or just at the top of the file, we have two such
declarations there already.
Max
> 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,
>
signature.asc
Description: OpenPGP digital signature
