[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/33] block: Distinguish paths in *_format_default_perms
From: |
Max Reitz |
Subject: |
[PATCH v2 14/33] block: Distinguish paths in *_format_default_perms |
Date: |
Tue, 4 Feb 2020 18:08:29 +0100 |
bdrv_format_default_perms() has one code path for backing files, and one
for storage files. We want to pull them out into own functions, so
make sure they are completely distinct before so the next patches will
be a bit cleaner.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index 1816e92674..39ba6aad0a 100644
--- a/block.c
+++ b/block.c
@@ -2309,6 +2309,13 @@ void bdrv_format_default_perms(BlockDriverState *bs,
BdrvChild *c,
perm |= BLK_PERM_CONSISTENT_READ;
}
shared &= ~(BLK_PERM_WRITE | BLK_PERM_RESIZE);
+
+ if (bs->open_flags & BDRV_O_INACTIVE) {
+ shared |= BLK_PERM_WRITE | BLK_PERM_RESIZE;
+ }
+
+ *nperm = perm;
+ *nshared = shared;
} else {
/* We want consistent read from backing files if the parent needs it.
* No other operations are performed on backing files. */
@@ -2325,14 +2332,14 @@ void bdrv_format_default_perms(BlockDriverState *bs,
BdrvChild *c,
shared |= BLK_PERM_CONSISTENT_READ | BLK_PERM_GRAPH_MOD |
BLK_PERM_WRITE_UNCHANGED;
- }
- if (bs->open_flags & BDRV_O_INACTIVE) {
- shared |= BLK_PERM_WRITE | BLK_PERM_RESIZE;
- }
+ if (bs->open_flags & BDRV_O_INACTIVE) {
+ shared |= BLK_PERM_WRITE | BLK_PERM_RESIZE;
+ }
- *nperm = perm;
- *nshared = shared;
+ *nperm = perm;
+ *nshared = shared;
+ }
}
uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm)
--
2.24.1
- Re: [PATCH v2 02/33] block: Rename BdrvChildRole to BdrvChildClass, (continued)
- [PATCH v2 05/33] block: Pass BdrvChildRole to bdrv_child_perm(), Max Reitz, 2020/02/04
- [PATCH v2 09/33] block: Add generic bdrv_inherited_options(), Max Reitz, 2020/02/04
- [PATCH v2 08/33] block: Rename bdrv_inherited_options(), Max Reitz, 2020/02/04
- [PATCH v2 12/33] block: Unify bdrv_child_cb_detach(), Max Reitz, 2020/02/04
- [PATCH v2 14/33] block: Distinguish paths in *_format_default_perms,
Max Reitz <=
- [PATCH v2 13/33] block: Add child_of_bds, Max Reitz, 2020/02/04
- [PATCH v2 15/33] block: Pull out bdrv_default_perms_for_backing(), Max Reitz, 2020/02/04
- [PATCH v2 10/33] block: Use bdrv_inherited_options(), Max Reitz, 2020/02/04
- [PATCH v2 04/33] block: Add BdrvChildRole to BdrvChild, Max Reitz, 2020/02/04