[v2,30/33] block: Drop bdrv_format_default_perms()

Commit Message

Max Reitz Feb. 4, 2020, 5:08 p.m. UTC

Signed-off-by: Max Reitz <[e-mail]>
---
 block.c                   | 19 -------------------
 include/block/block_int.h | 11 -----------
 2 files changed, 30 deletions(-)

Comments

Eric Blake Feb. 11, 2020, 3:48 p.m. UTC | #1

On 2/4/20 11:08 AM, Max Reitz wrote:
> Signed-off-by: Max Reitz <[e-mail]>
> ---
>   block.c                   | 19 -------------------
>   include/block/block_int.h | 11 -----------
>   2 files changed, 30 deletions(-)
> 

Reviewed-by: Eric Blake <[e-mail]>

Patch

diff --git a/block.c b/block.c
index 091e9cc16a..b6e35ed552 100644
--- a/block.c
+++ b/block.c
@@ -2317,25 +2317,6 @@  static void bdrv_default_perms_for_data(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_metadata(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,
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 5e3f512ae8..a20891e067 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -1254,17 +1254,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);