xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-20 04:11:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: Add reopen queue to bdrv_check_perm()

Browse Source 
In the context of bdrv_reopen(), we'll have to look at the state of the
graph as it will be after the reopen. This interface addition is in
preparation for the change.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2017-09-14 14:42:12 +02:00
parent e0995dc3da
commit 3121fb45b0
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
block.c
View File

@ -1531,7 +1531,8 @@ static int bdrv_fill_options(QDict **options, const char *filename,
return 0; return 0;
} }
static int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared, static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,
uint64_t perm, uint64_t shared,
GSList *ignore_children, Error **errp); GSList *ignore_children, Error **errp);
static void bdrv_child_abort_perm_update(BdrvChild *c); 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_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared);
@ -1562,7 +1563,8 @@ static void bdrv_child_perm(BlockDriverState *bs, BlockDriverState *child_bs,
* A call to this function must always be followed by a call to bdrv_set_perm() * A call to this function must always be followed by a call to bdrv_set_perm()
* or bdrv_abort_perm_update(). * or bdrv_abort_perm_update().
*/ */
static int bdrv_check_perm(BlockDriverState *bs, uint64_t cumulative_perms, static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q,
uint64_t cumulative_perms,
uint64_t cumulative_shared_perms, uint64_t cumulative_shared_perms,
GSList *ignore_children, Error **errp) GSList *ignore_children, Error **errp)
{ {
@ -1597,11 +1599,11 @@ static int bdrv_check_perm(BlockDriverState *bs, uint64_t cumulative_perms,
/* Check all children */ /* Check all children */
QLIST_FOREACH(c, &bs->children, next) { QLIST_FOREACH(c, &bs->children, next) {
uint64_t cur_perm, cur_shared; uint64_t cur_perm, cur_shared;
bdrv_child_perm(bs, c->bs, c, c->role, NULL, bdrv_child_perm(bs, c->bs, c, c->role, q,
cumulative_perms, cumulative_shared_perms, cumulative_perms, cumulative_shared_perms,
&cur_perm, &cur_shared); &cur_perm, &cur_shared);
ret = bdrv_child_check_perm(c, cur_perm, cur_shared, ignore_children, ret = bdrv_child_check_perm(c, q, cur_perm, cur_shared,
errp); ignore_children, errp);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -1727,7 +1729,8 @@ char *bdrv_perm_names(uint64_t perm)
* *
* Needs to be followed by a call to either bdrv_set_perm() or * Needs to be followed by a call to either bdrv_set_perm() or
* bdrv_abort_perm_update(). */ * bdrv_abort_perm_update(). */
static int bdrv_check_update_perm(BlockDriverState *bs, uint64_t new_used_perm, static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *q,
uint64_t new_used_perm,
uint64_t new_shared_perm, uint64_t new_shared_perm,
GSList *ignore_children, Error **errp) GSList *ignore_children, Error **errp)
{ {
@ -1769,19 +1772,20 @@ static int bdrv_check_update_perm(BlockDriverState *bs, uint64_t new_used_perm,
cumulative_shared_perms &= c->shared_perm; cumulative_shared_perms &= c->shared_perm;
} }
return bdrv_check_perm(bs, cumulative_perms, cumulative_shared_perms, return bdrv_check_perm(bs, q, cumulative_perms, cumulative_shared_perms,
ignore_children, errp); ignore_children, errp);
} }
/* Needs to be followed by a call to either bdrv_child_set_perm() or /* Needs to be followed by a call to either bdrv_child_set_perm() or
* bdrv_child_abort_perm_update(). */ * bdrv_child_abort_perm_update(). */
static int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared, static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,
uint64_t perm, uint64_t shared,
GSList *ignore_children, Error **errp) GSList *ignore_children, Error **errp)
{ {
int ret; int ret;
ignore_children = g_slist_prepend(g_slist_copy(ignore_children), c); ignore_children = g_slist_prepend(g_slist_copy(ignore_children), c);
ret = bdrv_check_update_perm(c->bs, perm, shared, ignore_children, errp); ret = bdrv_check_update_perm(c->bs, q, perm, shared, ignore_children, errp);
g_slist_free(ignore_children); g_slist_free(ignore_children);
return ret; return ret;
@ -1809,7 +1813,7 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,
{ {
int ret; int ret;
ret = bdrv_child_check_perm(c, perm, shared, NULL, errp); ret = bdrv_child_check_perm(c, NULL, perm, shared, NULL, errp);
if (ret < 0) { if (ret < 0) {
bdrv_child_abort_perm_update(c); bdrv_child_abort_perm_update(c);
return ret; return ret;
@ -1950,7 +1954,7 @@ static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs)
* because we're just taking a parent away, so we're loosening * because we're just taking a parent away, so we're loosening
* restrictions. */ * restrictions. */
bdrv_get_cumulative_perm(old_bs, &perm, &shared_perm); bdrv_get_cumulative_perm(old_bs, &perm, &shared_perm);
bdrv_check_perm(old_bs, perm, shared_perm, NULL, &error_abort); bdrv_check_perm(old_bs, NULL, perm, shared_perm, NULL, &error_abort);
bdrv_set_perm(old_bs, perm, shared_perm); bdrv_set_perm(old_bs, perm, shared_perm);
} }
@ -1969,7 +1973,7 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
BdrvChild *child; BdrvChild *child;
int ret; int ret;
ret = bdrv_check_update_perm(child_bs, perm, shared_perm, NULL, errp); ret = bdrv_check_update_perm(child_bs, NULL, perm, shared_perm, NULL, errp);
if (ret < 0) { if (ret < 0) {
bdrv_abort_perm_update(child_bs); bdrv_abort_perm_update(child_bs);
return NULL; return NULL;
@ -3184,7 +3188,7 @@ void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to,
/* Check whether the required permissions can be granted on @to, ignoring /* Check whether the required permissions can be granted on @to, ignoring
* all BdrvChild in @list so that they can't block themselves. */ * all BdrvChild in @list so that they can't block themselves. */
ret = bdrv_check_update_perm(to, perm, shared, list, errp); ret = bdrv_check_update_perm(to, NULL, perm, shared, list, errp);
if (ret < 0) { if (ret < 0) {
bdrv_abort_perm_update(to); bdrv_abort_perm_update(to);
goto out; goto out;
@ -4054,7 +4058,7 @@ void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp)
/* Update permissions, they may differ for inactive nodes */ /* Update permissions, they may differ for inactive nodes */
bdrv_get_cumulative_perm(bs, &perm, &shared_perm); bdrv_get_cumulative_perm(bs, &perm, &shared_perm);
ret = bdrv_check_perm(bs, perm, shared_perm, NULL, &local_err); ret = bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, &local_err);
if (ret < 0) { if (ret < 0) {
bs->open_flags |= BDRV_O_INACTIVE; bs->open_flags |= BDRV_O_INACTIVE;
error_propagate(errp, local_err); error_propagate(errp, local_err);
@ -4121,7 +4125,7 @@ static int bdrv_inactivate_recurse(BlockDriverState *bs,
/* Update permissions, they may differ for inactive nodes */ /* Update permissions, they may differ for inactive nodes */
bdrv_get_cumulative_perm(bs, &perm, &shared_perm); bdrv_get_cumulative_perm(bs, &perm, &shared_perm);
bdrv_check_perm(bs, perm, shared_perm, NULL, &error_abort); bdrv_check_perm(bs, NULL, perm, shared_perm, NULL, &error_abort);
bdrv_set_perm(bs, perm, shared_perm); bdrv_set_perm(bs, perm, shared_perm);
} }