aboutsummaryrefslogtreecommitdiff
path: root/block.c
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2020-11-06 15:42:40 +0300
committerMax Reitz <mreitz@redhat.com>2020-12-18 12:35:55 +0100
commit6e0c916cc8f171ec69148d8e35d4435f14a5f9b6 (patch)
treec803dc75824e99541a38b4f4dcb5f99034a885c5 /block.c
parent74ad9a3b4da3bc2475c765d1926c655e9f8a0a20 (diff)
downloadqemu-6e0c916cc8f171ec69148d8e35d4435f14a5f9b6.zip
qemu-6e0c916cc8f171ec69148d8e35d4435f14a5f9b6.tar.gz
qemu-6e0c916cc8f171ec69148d8e35d4435f14a5f9b6.tar.bz2
block: bdrv_child_set_perm() drop redundant parameters.
We must set the permission used for _check_. Assert that we have backup and drop extra arguments. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-Id: <20201106124241.16950-7-vsementsov@virtuozzo.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r--block.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/block.c b/block.c
index 66ab6ca..f66388b 100644
--- a/block.c
+++ b/block.c
@@ -1903,7 +1903,7 @@ static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,
GSList *ignore_children,
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_child_set_perm(BdrvChild *c);
typedef struct BlockReopenQueueEntry {
bool prepared;
@@ -2137,11 +2137,7 @@ static void bdrv_set_perm(BlockDriverState *bs)
/* Update all children */
QLIST_FOREACH(c, &bs->children, next) {
- uint64_t cur_perm, cur_shared;
- bdrv_child_perm(bs, c->bs, c, c->role, NULL,
- cumulative_perms, cumulative_shared_perms,
- &cur_perm, &cur_shared);
- bdrv_child_set_perm(c, cur_perm, cur_shared);
+ bdrv_child_set_perm(c);
}
}
@@ -2304,13 +2300,10 @@ static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,
return 0;
}
-static void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared)
+static void bdrv_child_set_perm(BdrvChild *c)
{
c->has_backup_perm = false;
- c->perm = perm;
- c->shared_perm = shared;
-
bdrv_set_perm(c->bs);
}
@@ -2369,7 +2362,7 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,
return ret;
}
- bdrv_child_set_perm(c, perm, shared);
+ bdrv_child_set_perm(c);
return 0;
}