[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 31/51] block: Add bdrv_default_perms()
From: |
Kevin Wolf |
Subject: |
[PULL 31/51] block: Add bdrv_default_perms() |
Date: |
Fri, 15 May 2020 14:45:01 +0200 |
From: Max Reitz <address@hidden>
This callback can be used by BDSs that use child_of_bds with the
appropriate BdrvChildRole for their children.
Also, make bdrv_format_default_perms() use it for child_of_bds children
(just a temporary solution until we can drop bdrv_format_default_perms()
altogether).
Signed-off-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
include/block/block_int.h | 11 +++++++++++
block.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+)
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 54df821d61..3a9dda9be7 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -1288,6 +1288,17 @@ void bdrv_format_default_perms(BlockDriverState *bs,
BdrvChild *c,
bool bdrv_recurse_can_replace(BlockDriverState *bs,
BlockDriverState *to_replace);
+/*
+ * Default implementation for BlockDriver.bdrv_child_perm() that can
+ * be used by block filters and image formats, as long as they use the
+ * child_of_bds child class and set an appropriate BdrvChildRole.
+ */
+void bdrv_default_perms(BlockDriverState *bs, BdrvChild *c,
+ const BdrvChildClass *child_class, BdrvChildRole role,
+ BlockReopenQueue *reopen_queue,
+ uint64_t perm, uint64_t shared,
+ uint64_t *nperm, uint64_t *nshared);
+
/*
* Default implementation for drivers to pass bdrv_co_block_status() to
* their file.
diff --git a/block.c b/block.c
index 5ff6cbd796..088727fdbe 100644
--- a/block.c
+++ b/block.c
@@ -2596,6 +2596,13 @@ void bdrv_format_default_perms(BlockDriverState *bs,
BdrvChild *c,
uint64_t *nperm, uint64_t *nshared)
{
bool backing = (child_class == &child_backing);
+
+ if (child_class == &child_of_bds) {
+ bdrv_default_perms(bs, c, child_class, role, reopen_queue,
+ perm, shared, nperm, nshared);
+ return;
+ }
+
assert(child_class == &child_backing || child_class == &child_file);
if (!backing) {
@@ -2607,6 +2614,31 @@ void bdrv_format_default_perms(BlockDriverState *bs,
BdrvChild *c,
}
}
+void bdrv_default_perms(BlockDriverState *bs, BdrvChild *c,
+ const BdrvChildClass *child_class, BdrvChildRole role,
+ BlockReopenQueue *reopen_queue,
+ uint64_t perm, uint64_t shared,
+ uint64_t *nperm, uint64_t *nshared)
+{
+ assert(child_class == &child_of_bds);
+
+ if (role & BDRV_CHILD_FILTERED) {
+ assert(!(role & (BDRV_CHILD_DATA | BDRV_CHILD_METADATA |
+ BDRV_CHILD_COW)));
+ bdrv_filter_default_perms(bs, c, child_class, role, reopen_queue,
+ perm, shared, nperm, nshared);
+ } else if (role & BDRV_CHILD_COW) {
+ assert(!(role & (BDRV_CHILD_DATA | BDRV_CHILD_METADATA)));
+ bdrv_default_perms_for_cow(bs, c, child_class, role, reopen_queue,
+ perm, shared, nperm, nshared);
+ } else if (role & (BDRV_CHILD_METADATA | BDRV_CHILD_DATA)) {
+ bdrv_default_perms_for_storage(bs, c, child_class, role, reopen_queue,
+ perm, shared, nperm, nshared);
+ } else {
+ g_assert_not_reached();
+ }
+}
+
uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm)
{
static const uint64_t permissions[] = {
--
2.25.4
- [PULL 22/51] block: Add generic bdrv_inherited_options(), (continued)
- [PULL 22/51] block: Add generic bdrv_inherited_options(), Kevin Wolf, 2020/05/15
- [PULL 19/51] block: Pass BdrvChildRole to .inherit_options(), Kevin Wolf, 2020/05/15
- [PULL 26/51] block: Add child_of_bds, Kevin Wolf, 2020/05/15
- [PULL 24/51] block: Unify bdrv_child_cb_attach(), Kevin Wolf, 2020/05/15
- [PULL 28/51] block: Pull out bdrv_default_perms_for_cow(), Kevin Wolf, 2020/05/15
- [PULL 27/51] block: Distinguish paths in *_format_default_perms, Kevin Wolf, 2020/05/15
- [PULL 29/51] block: Pull out bdrv_default_perms_for_storage(), Kevin Wolf, 2020/05/15
- [PULL 32/51] raw-format: Split raw_read_options(), Kevin Wolf, 2020/05/15
- [PULL 25/51] block: Unify bdrv_child_cb_detach(), Kevin Wolf, 2020/05/15
- [PULL 30/51] block: Relax *perms_for_storage for data children, Kevin Wolf, 2020/05/15
- [PULL 31/51] block: Add bdrv_default_perms(),
Kevin Wolf <=
- [PULL 34/51] block: Drop child_format, Kevin Wolf, 2020/05/15
- [PULL 33/51] block: Switch child_format users to child_of_bds, Kevin Wolf, 2020/05/15
- [PULL 35/51] block: Make backing files child_of_bds children, Kevin Wolf, 2020/05/15
- [PULL 36/51] block: Drop child_backing, Kevin Wolf, 2020/05/15
- [PULL 37/51] block: Make format drivers use child_of_bds, Kevin Wolf, 2020/05/15
- [PULL 40/51] tests: Use child_of_bds instead of child_file, Kevin Wolf, 2020/05/15
- [PULL 38/51] block: Make filter drivers use child_of_bds, Kevin Wolf, 2020/05/15
- [PULL 39/51] block: Use child_of_bds in remaining places, Kevin Wolf, 2020/05/15
- [PULL 41/51] block: Use bdrv_default_perms(), Kevin Wolf, 2020/05/15
- [PULL 42/51] block: Make bdrv_filter_default_perms() static, Kevin Wolf, 2020/05/15