From 294ab4c4963295556d12ac15150b48c8536175a7 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 13 Mar 2020 12:34:33 +0000 Subject: [PATCH 13/20] block: Make bdrv_get_cumulative_perm() public RH-Author: Kevin Wolf Message-id: <20200313123439.10548-8-kwolf@redhat.com> Patchwork-id: 94287 O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH v2 07/13] block: Make bdrv_get_cumulative_perm() public Bugzilla: 1790482 1805143 RH-Acked-by: John Snow RH-Acked-by: Daniel P. Berrange RH-Acked-by: Peter Krempa Signed-off-by: Kevin Wolf Message-Id: <20200310113831.27293-2-kwolf@redhat.com> Reviewed-by: Peter Krempa Signed-off-by: Kevin Wolf (cherry picked from commit c7a0f2be8f95b220cdadbba9a9236eaf115951dc) Signed-off-by: Kevin Wolf Signed-off-by: Danilo C. L. de Paula --- block.c | 6 ++---- include/block/block_int.h | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 39e4647..354d388 100644 --- a/block.c +++ b/block.c @@ -1850,8 +1850,6 @@ static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q, bool *tighten_restrictions, Error **errp); static void bdrv_child_abort_perm_update(BdrvChild *c); static void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared); -static void bdrv_get_cumulative_perm(BlockDriverState *bs, uint64_t *perm, - uint64_t *shared_perm); typedef struct BlockReopenQueueEntry { bool prepared; @@ -2075,8 +2073,8 @@ static void bdrv_set_perm(BlockDriverState *bs, uint64_t cumulative_perms, } } -static void bdrv_get_cumulative_perm(BlockDriverState *bs, uint64_t *perm, - uint64_t *shared_perm) +void bdrv_get_cumulative_perm(BlockDriverState *bs, uint64_t *perm, + uint64_t *shared_perm) { BdrvChild *c; uint64_t cumulative_perms = 0; diff --git a/include/block/block_int.h b/include/block/block_int.h index c168690..96e327b 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -1228,6 +1228,9 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs, void *opaque, Error **errp); void bdrv_root_unref_child(BdrvChild *child); +void bdrv_get_cumulative_perm(BlockDriverState *bs, uint64_t *perm, + uint64_t *shared_perm); + /** * Sets a BdrvChild's permissions. Avoid if the parent is a BDS; use * bdrv_child_refresh_perms() instead and make the parent's -- 1.8.3.1