Re: [Qemu-devel] [PATCH 3/3] block/qapi: Give some functions internal linkage

[Benoît Canet]

The Friday 06 Jun 2014 à 14:51:00 (+0200), Markus Armbruster wrote :
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
>  block/qapi.c         | 13 ++++++-------
>  include/block/qapi.h |  7 -------
>  2 files changed, 6 insertions(+), 14 deletions(-)
> 
> diff --git a/block/qapi.c b/block/qapi.c
> index 97e1641..f420e9a 100644
> --- a/block/qapi.c
> +++ b/block/qapi.c
> @@ -89,9 +89,9 @@ BlockDeviceInfo *bdrv_block_device_info(BlockDriverState 
> *bs)
>   * information, or NULL because there are no snapshots.  Returns -errno on
>   * error, with *p_list untouched.
>   */
> -int bdrv_query_snapshot_info_list(BlockDriverState *bs,
> -                                  SnapshotInfoList **p_list,
> -                                  Error **errp)
> +static int bdrv_query_snapshot_info_list(BlockDriverState *bs,
> +                                         SnapshotInfoList **p_list,
> +                                         Error **errp)
>  {
>      int i, sn_count;
>      QEMUSnapshotInfo *sn_tab = NULL;
> @@ -236,9 +236,8 @@ void bdrv_query_image_info(BlockDriverState *bs,
>  }
>  
>  /* @p_info will be set only on success. */
> -void bdrv_query_info(BlockDriverState *bs,
> -                     BlockInfo **p_info,
> -                     Error **errp)
> +static void bdrv_query_info(BlockDriverState *bs, BlockInfo **p_info,
> +                            Error **errp)
>  {
>      BlockInfo *info = g_malloc0(sizeof(*info));
>      BlockDriverState *bs0;
> @@ -293,7 +292,7 @@ void bdrv_query_info(BlockDriverState *bs,
>      qapi_free_BlockInfo(info);
>  }
>  
> -BlockStats *bdrv_query_stats(const BlockDriverState *bs)
> +static BlockStats *bdrv_query_stats(const BlockDriverState *bs)
>  {
>      BlockStats *s;
>  
> diff --git a/include/block/qapi.h b/include/block/qapi.h
> index e92c00d..6672179 100644
> --- a/include/block/qapi.h
> +++ b/include/block/qapi.h
> @@ -30,16 +30,9 @@
>  #include "block/snapshot.h"
>  
>  BlockDeviceInfo *bdrv_block_device_info(BlockDriverState *bs);
> -int bdrv_query_snapshot_info_list(BlockDriverState *bs,
> -                                  SnapshotInfoList **p_list,
> -                                  Error **errp);
>  void bdrv_query_image_info(BlockDriverState *bs,
>                             ImageInfo **p_info,
>                             Error **errp);
> -void bdrv_query_info(BlockDriverState *bs,
> -                     BlockInfo **p_info,
> -                     Error **errp);
> -BlockStats *bdrv_query_stats(const BlockDriverState *bs);
>  
>  void bdrv_snapshot_dump(fprintf_function func_fprintf, void *f,
>                          QEMUSnapshotInfo *sn);
> -- 
> 1.9.3
> 
> 
Reviewed-by: Benoit Canet <address@hidden>