[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 03/58] block: Respect "force-share" in perm propagati
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 03/58] block: Respect "force-share" in perm propagating |
Date: |
Thu, 11 May 2017 16:32:06 +0200 |
From: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 32 ++++++++++++++++++++++++--------
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/block.c b/block.c
index 31d6d0b..1e00e31 100644
--- a/block.c
+++ b/block.c
@@ -1465,6 +1465,22 @@ static int bdrv_child_check_perm(BdrvChild *c, uint64_t
perm, uint64_t shared,
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_perm(BlockDriverState *bs, BlockDriverState *child_bs,
+ BdrvChild *c,
+ const BdrvChildRole *role,
+ uint64_t parent_perm, uint64_t parent_shared,
+ uint64_t *nperm, uint64_t *nshared)
+{
+ if (bs->drv && bs->drv->bdrv_child_perm) {
+ bs->drv->bdrv_child_perm(bs, c, role,
+ parent_perm, parent_shared,
+ nperm, nshared);
+ }
+ if (child_bs && child_bs->force_share) {
+ *nshared = BLK_PERM_ALL;
+ }
+}
+
/*
* Check whether permissions on this node can be changed in a way that
* @cumulative_perms and @cumulative_shared_perms are the new cumulative
@@ -1509,9 +1525,9 @@ static int bdrv_check_perm(BlockDriverState *bs, uint64_t
cumulative_perms,
/* Check all children */
QLIST_FOREACH(c, &bs->children, next) {
uint64_t cur_perm, cur_shared;
- drv->bdrv_child_perm(bs, c, c->role,
- cumulative_perms, cumulative_shared_perms,
- &cur_perm, &cur_shared);
+ bdrv_child_perm(bs, c->bs, c, c->role,
+ cumulative_perms, cumulative_shared_perms,
+ &cur_perm, &cur_shared);
ret = bdrv_child_check_perm(c, cur_perm, cur_shared, ignore_children,
errp);
if (ret < 0) {
@@ -1571,9 +1587,9 @@ static void bdrv_set_perm(BlockDriverState *bs, uint64_t
cumulative_perms,
/* Update all children */
QLIST_FOREACH(c, &bs->children, next) {
uint64_t cur_perm, cur_shared;
- drv->bdrv_child_perm(bs, c, c->role,
- cumulative_perms, cumulative_shared_perms,
- &cur_perm, &cur_shared);
+ bdrv_child_perm(bs, c->bs, c, c->role,
+ cumulative_perms, cumulative_shared_perms,
+ &cur_perm, &cur_shared);
bdrv_child_set_perm(c, cur_perm, cur_shared);
}
}
@@ -1908,8 +1924,8 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs,
assert(parent_bs->drv);
assert(bdrv_get_aio_context(parent_bs) == bdrv_get_aio_context(child_bs));
- parent_bs->drv->bdrv_child_perm(parent_bs, NULL, child_role,
- perm, shared_perm, &perm, &shared_perm);
+ bdrv_child_perm(parent_bs, child_bs, NULL, child_role,
+ perm, shared_perm, &perm, &shared_perm);
child = bdrv_root_attach_child(child_bs, child_name, child_role,
perm, shared_perm, parent_bs, errp);
--
1.8.3.1
- [Qemu-block] [PULL 00/58] Block layer patches, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 01/58] block: Make bdrv_perm_names public, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 03/58] block: Respect "force-share" in perm propagating,
Kevin Wolf <=
- [Qemu-block] [PULL 02/58] block: Add, parse and store "force-share" option, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 06/58] qemu-io: Add --force-share option, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 04/58] qemu-img: Add --force-share option to subcommands, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 09/58] iotests: 055: Don't attach the target image already for drive-backup, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 05/58] qemu-img: Update documentation for -U, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 08/58] iotests: 046: Prepare for image locking, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 07/58] iotests: 030: Prepare for image locking, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 10/58] iotests: 085: Avoid image locking conflict, Kevin Wolf, 2017/05/11