mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: bdrv_refresh_perms(): allow external tran 

Allow passing external Transaction pointer, stop creating extra
Transaction objects.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@openvz.org>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20221107163558.618889-4-vsementsov@yandex-team.ru>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2022-11-07 19:35:57 +03:00 committed by Kevin Wolf
parent f38eaec4c3
commit f1316edbfc
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
block.c
View File

@ -2591,15 +2591,24 @@ char *bdrv_perm_names(uint64_t perm)
} }
static int bdrv_refresh_perms(BlockDriverState *bs, Error **errp) /* @tran is allowed to be NULL. In this case no rollback is possible */
static int bdrv_refresh_perms(BlockDriverState *bs, Transaction *tran,
Error **errp)
{ {
int ret; int ret;
Transaction *tran = tran_new(); Transaction *local_tran = NULL;
g_autoptr(GSList) list = bdrv_topological_dfs(NULL, NULL, bs); g_autoptr(GSList) list = bdrv_topological_dfs(NULL, NULL, bs);
GLOBAL_STATE_CODE(); GLOBAL_STATE_CODE();
if (!tran) {
tran = local_tran = tran_new();
}
ret = bdrv_list_refresh_perms(list, NULL, tran, errp); ret = bdrv_list_refresh_perms(list, NULL, tran, errp);
tran_finalize(tran, ret);
if (local_tran) {
tran_finalize(local_tran, ret);
}
return ret; return ret;
} }
@ -2615,7 +2624,7 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,
bdrv_child_set_perm(c, perm, shared, tran); bdrv_child_set_perm(c, perm, shared, tran);
ret = bdrv_refresh_perms(c->bs, &local_err); ret = bdrv_refresh_perms(c->bs, tran, &local_err);
tran_finalize(tran, ret); tran_finalize(tran, ret);
@ -3099,7 +3108,7 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
goto out; goto out;
} }
ret = bdrv_refresh_perms(child_bs, errp); ret = bdrv_refresh_perms(child_bs, tran, errp);
out: out:
tran_finalize(tran, ret); tran_finalize(tran, ret);
@ -3140,7 +3149,7 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs,
goto out; goto out;
} }
ret = bdrv_refresh_perms(parent_bs, errp); ret = bdrv_refresh_perms(parent_bs, tran, errp);
if (ret < 0) { if (ret < 0) {
goto out; goto out;
} }
@ -3168,7 +3177,7 @@ void bdrv_root_unref_child(BdrvChild *child)
* we're loosening restrictions. Errors of permission update are not * we're loosening restrictions. Errors of permission update are not
* fatal in this case, ignore them. * fatal in this case, ignore them.
*/ */
bdrv_refresh_perms(child_bs, NULL); bdrv_refresh_perms(child_bs, NULL, NULL);
/* /*
* When the parent requiring a non-default AioContext is removed, the * When the parent requiring a non-default AioContext is removed, the
@ -3410,7 +3419,7 @@ int bdrv_set_backing_hd(BlockDriverState *bs, BlockDriverState *backing_hd,
goto out; goto out;
} }
ret = bdrv_refresh_perms(bs, errp); ret = bdrv_refresh_perms(bs, tran, errp);
out: out:
tran_finalize(tran, ret); tran_finalize(tran, ret);
@ -5223,7 +5232,7 @@ int bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top,
goto out; goto out;
} }
ret = bdrv_refresh_perms(bs_new, errp); ret = bdrv_refresh_perms(bs_new, tran, errp);
out: out:
tran_finalize(tran, ret); tran_finalize(tran, ret);
@ -6523,7 +6532,7 @@ int bdrv_activate(BlockDriverState *bs, Error **errp)
*/ */
if (bs->open_flags & BDRV_O_INACTIVE) { if (bs->open_flags & BDRV_O_INACTIVE) {
bs->open_flags &= ~BDRV_O_INACTIVE; bs->open_flags &= ~BDRV_O_INACTIVE;
ret = bdrv_refresh_perms(bs, errp); ret = bdrv_refresh_perms(bs, NULL, errp);
if (ret < 0) { if (ret < 0) {
bs->open_flags |= BDRV_O_INACTIVE; bs->open_flags |= BDRV_O_INACTIVE;
return ret; return ret;
@ -6668,7 +6677,7 @@ static int bdrv_inactivate_recurse(BlockDriverState *bs)
* We only tried to loosen restrictions, so errors are not fatal, ignore * We only tried to loosen restrictions, so errors are not fatal, ignore
* them. * them.
*/ */
bdrv_refresh_perms(bs, NULL); bdrv_refresh_perms(bs, NULL, NULL);
/* Recursively inactivate children */ /* Recursively inactivate children */
QLIST_FOREACH(child, &bs->children, next) { QLIST_FOREACH(child, &bs->children, next) {