Commit 9aab945e authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

block: Drop bdrv_format_default_perms() 



Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20200513110544.176672-32-mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 87278af1

block.c

+0 −19
Original line number Diff line number Diff line
@@ -2517,25 +2517,6 @@ static void bdrv_default_perms_for_storage(BlockDriverState *bs, BdrvChild *c, 
    *nshared = shared;

}



void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,

                               const BdrvChildClass *child_class,

                               BdrvChildRole role,

                               BlockReopenQueue *reopen_queue,

                               uint64_t perm, uint64_t shared,

                               uint64_t *nperm, uint64_t *nshared)

{

    if (child_class == &child_of_bds) {

        bdrv_default_perms(bs, c, child_class, role, reopen_queue,

                           perm, shared, nperm, nshared);

        return;

    }



    assert(child_class == &child_file);



    bdrv_default_perms_for_storage(bs, c, child_class, role, reopen_queue,

                                   perm, shared, nperm, nshared);

}



void bdrv_default_perms(BlockDriverState *bs, BdrvChild *c,

                        const BdrvChildClass *child_class, BdrvChildRole role,

                        BlockReopenQueue *reopen_queue,

include/block/block_int.h

+0 −11
Original line number Diff line number Diff line
@@ -1262,17 +1262,6 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared, 
 */

int bdrv_child_refresh_perms(BlockDriverState *bs, BdrvChild *c, Error **errp);



/* Default implementation for BlockDriver.bdrv_child_perm() that can be used by

 * (non-raw) image formats: Like above for bs->backing, but for bs->file it

 * requires WRITE | RESIZE for read-write images, always requires

 * CONSISTENT_READ and doesn't share WRITE. */

void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c,

                               const BdrvChildClass *child_class,

                               BdrvChildRole child_role,

                               BlockReopenQueue *reopen_queue,

                               uint64_t perm, uint64_t shared,

                               uint64_t *nperm, uint64_t *nshared);



bool bdrv_recurse_can_replace(BlockDriverState *bs,

                              BlockDriverState *to_replace);