On Fri, Oct 09, 2015 at 02:15:31PM +0200, Kevin Wolf wrote:
> It is unused now.
>
> Signed-off-by: Kevin Wolf <kw...@redhat.com>
> Reviewed-by: Max Reitz <mre...@redhat.com>
> Reviewed-by: Alberto Garcia <be...@igalia.com>
> Reviewed-by: Fam Zheng <f...@redhat.com>
> ---
> block.c | 34 ----------------------------------
> include/block/block.h | 4 ----
> 2 files changed, 38 deletions(-)
>
> diff --git a/block.c b/block.c
> index 8fd345b..33ecd93 100644
> --- a/block.c
> +++ b/block.c
> @@ -1279,40 +1279,6 @@ done:
> return c;
> }
>
> -/*
> - * This is a version of bdrv_open_child() that returns 0/-EINVAL instead of
> - * a BdrvChild object.
> - *
> - * If allow_none is true, no image will be opened if filename is false and no
> - * BlockdevRef is given. *pbs will remain unchanged and 0 will be returned.
> - *
> - * To conform with the behavior of bdrv_open(), *pbs has to be NULL.
> - */
> -int bdrv_open_image(BlockDriverState **pbs, const char *filename,
> - QDict *options, const char *bdref_key,
> - BlockDriverState* parent, const BdrvChildRole
> *child_role,
> - bool allow_none, Error **errp)
> -{
> - Error *local_err = NULL;
> - BdrvChild *c;
> -
> - assert(pbs);
> - assert(*pbs == NULL);
> -
> - c = bdrv_open_child(filename, options, bdref_key, parent, child_role,
> - allow_none, &local_err);
> - if (local_err) {
> - error_propagate(errp, local_err);
> - return -EINVAL;
> - }
> -
> - if (c != NULL) {
> - *pbs = c->bs;
> - }
> -
> - return 0;
> -}
> -
> int bdrv_append_temp_snapshot(BlockDriverState *bs, int flags, Error **errp)
> {
> /* TODO: extra byte is a hack to ensure MAX_PATH space on Windows. */
> diff --git a/include/block/block.h b/include/block/block.h
> index 7ebb35d..c6854a6 100644
> --- a/include/block/block.h
> +++ b/include/block/block.h
> @@ -205,10 +205,6 @@ void bdrv_swap(BlockDriverState *bs_new,
> BlockDriverState *bs_old);
> void bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top);
> int bdrv_parse_cache_flags(const char *mode, int *flags);
> int bdrv_parse_discard_flags(const char *mode, int *flags);
> -int bdrv_open_image(BlockDriverState **pbs, const char *filename,
> - QDict *options, const char *bdref_key,
> - BlockDriverState* parent, const BdrvChildRole
> *child_role,
> - bool allow_none, Error **errp);
> BdrvChild *bdrv_open_child(const char *filename,
> QDict *options, const char *bdref_key,
> BlockDriverState* parent,
> --
> 1.8.3.1
>
Reviewed-by: Jeff Cody <jc...@redhat.com>
