aboutsummaryrefslogtreecommitdiff
path: root/block.c
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2021-04-28 18:17:40 +0300
committerKevin Wolf <kwolf@redhat.com>2021-04-30 12:27:48 +0200
commit3ef45e0242671745a6e9921e200d9dc3299aa222 (patch)
tree772a61ea74f4c5fd6a3df716e43308d73b1e220f /block.c
parent83928dc4968284c8c0c56c8186c5a789b794ef5a (diff)
downloadqemu-3ef45e0242671745a6e9921e200d9dc3299aa222.zip
qemu-3ef45e0242671745a6e9921e200d9dc3299aa222.tar.gz
qemu-3ef45e0242671745a6e9921e200d9dc3299aa222.tar.bz2
block: inline bdrv_child_*() permission functions calls
Each of them has only one caller. Open-coding simplifies further pemission-update system changes. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20210428151804.439460-13-vsementsov@virtuozzo.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r--block.c59
1 files changed, 17 insertions, 42 deletions
diff --git a/block.c b/block.c
index 4511766..e5af4cd 100644
--- a/block.c
+++ b/block.c
@@ -1974,11 +1974,11 @@ static int bdrv_fill_options(QDict **options, const char *filename,
return 0;
}
-static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,
- uint64_t perm, uint64_t shared,
- GSList *ignore_children, Error **errp);
-static void bdrv_child_abort_perm_update(BdrvChild *c);
-static void bdrv_child_set_perm(BdrvChild *c);
+static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *q,
+ uint64_t new_used_perm,
+ uint64_t new_shared_perm,
+ GSList *ignore_children,
+ Error **errp);
typedef struct BlockReopenQueueEntry {
bool prepared;
@@ -2226,15 +2226,21 @@ static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q,
/* Check all children */
QLIST_FOREACH(c, &bs->children, next) {
uint64_t cur_perm, cur_shared;
+ GSList *cur_ignore_children;
bdrv_child_perm(bs, c->bs, c, c->role, q,
cumulative_perms, cumulative_shared_perms,
&cur_perm, &cur_shared);
- ret = bdrv_child_check_perm(c, q, cur_perm, cur_shared, ignore_children,
- errp);
+
+ cur_ignore_children = g_slist_prepend(g_slist_copy(ignore_children), c);
+ ret = bdrv_check_update_perm(c->bs, q, cur_perm, cur_shared,
+ cur_ignore_children, errp);
+ g_slist_free(cur_ignore_children);
if (ret < 0) {
return ret;
}
+
+ bdrv_child_set_perm_safe(c, cur_perm, cur_shared, NULL);
}
return 0;
@@ -2261,7 +2267,8 @@ static void bdrv_abort_perm_update(BlockDriverState *bs)
}
QLIST_FOREACH(c, &bs->children, next) {
- bdrv_child_abort_perm_update(c);
+ bdrv_child_set_perm_abort(c);
+ bdrv_abort_perm_update(c->bs);
}
}
@@ -2290,7 +2297,8 @@ static void bdrv_set_perm(BlockDriverState *bs)
/* Update all children */
QLIST_FOREACH(c, &bs->children, next) {
- bdrv_child_set_perm(c);
+ bdrv_child_set_perm_commit(c);
+ bdrv_set_perm(c->bs);
}
}
@@ -2398,39 +2406,6 @@ static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *q,
ignore_children, errp);
}
-/* Needs to be followed by a call to either bdrv_child_set_perm() or
- * bdrv_child_abort_perm_update(). */
-static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,
- uint64_t perm, uint64_t shared,
- GSList *ignore_children, Error **errp)
-{
- int ret;
-
- ignore_children = g_slist_prepend(g_slist_copy(ignore_children), c);
- ret = bdrv_check_update_perm(c->bs, q, perm, shared, ignore_children, errp);
- g_slist_free(ignore_children);
-
- if (ret < 0) {
- return ret;
- }
-
- bdrv_child_set_perm_safe(c, perm, shared, NULL);
-
- return 0;
-}
-
-static void bdrv_child_set_perm(BdrvChild *c)
-{
- bdrv_child_set_perm_commit(c);
- bdrv_set_perm(c->bs);
-}
-
-static void bdrv_child_abort_perm_update(BdrvChild *c)
-{
- bdrv_child_set_perm_abort(c);
- bdrv_abort_perm_update(c->bs);
-}
-
static int bdrv_refresh_perms(BlockDriverState *bs, Error **errp)
{
int ret;