[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 32/33] block: Pass BdrvChildRole in remaining cases
From: |
Max Reitz |
Subject: |
[PATCH v2 32/33] block: Pass BdrvChildRole in remaining cases |
Date: |
Tue, 4 Feb 2020 18:08:47 +0100 |
These calls have no real use for the child role yet, but it will not
harm to give one.
Notably, the bdrv_root_attach_child() call in blockjob.c is left
unmodified because there is not much the generic BlockJob object wants
from its children.
Signed-off-by: Max Reitz <address@hidden>
---
block/block-backend.c | 11 +++++++----
block/vvfat.c | 2 +-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 9e0078bfb5..e655e15675 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -401,8 +401,9 @@ BlockBackend *blk_new_open(const char *filename, const char
*reference,
return NULL;
}
- blk->root = bdrv_root_attach_child(bs, "root", &child_root, 0, blk->ctx,
- perm, BLK_PERM_ALL, blk, errp);
+ blk->root = bdrv_root_attach_child(bs, "root", &child_root,
+ BDRV_CHILD_FILTERED |
BDRV_CHILD_PRIMARY,
+ blk->ctx, perm, BLK_PERM_ALL, blk,
errp);
if (!blk->root) {
blk_unref(blk);
return NULL;
@@ -812,8 +813,10 @@ int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs,
Error **errp)
{
ThrottleGroupMember *tgm = &blk->public.throttle_group_member;
bdrv_ref(bs);
- blk->root = bdrv_root_attach_child(bs, "root", &child_root, 0, blk->ctx,
- blk->perm, blk->shared_perm, blk, errp);
+ blk->root = bdrv_root_attach_child(bs, "root", &child_root,
+ BDRV_CHILD_FILTERED |
BDRV_CHILD_PRIMARY,
+ blk->ctx, blk->perm, blk->shared_perm,
+ blk, errp);
if (blk->root == NULL) {
return -EPERM;
}
diff --git a/block/vvfat.c b/block/vvfat.c
index 2bc5812dc5..96d7c6eca8 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -3193,7 +3193,7 @@ static int enable_write_target(BlockDriverState *bs,
Error **errp)
options = qdict_new();
qdict_put_str(options, "write-target.driver", "qcow");
s->qcow = bdrv_open_child(s->qcow_filename, options, "write-target", bs,
- &child_vvfat_qcow, 0, false, errp);
+ &child_vvfat_qcow, BDRV_CHILD_DATA, false, errp);
qobject_unref(options);
if (!s->qcow) {
ret = -EINVAL;
--
2.24.1
- [PATCH v2 27/33] tests: Use child_of_bds instead of child_file, (continued)
- [PATCH v2 27/33] tests: Use child_of_bds instead of child_file, Max Reitz, 2020/02/04
- [PATCH v2 29/33] block: Make bdrv_filter_default_perms() static, Max Reitz, 2020/02/04
- [PATCH v2 30/33] block: Drop bdrv_format_default_perms(), Max Reitz, 2020/02/04
- [PATCH v2 28/33] block: Use bdrv_default_perms(), Max Reitz, 2020/02/04
- [PATCH v2 31/33] block: Drop child_file, Max Reitz, 2020/02/04
- [PATCH v2 32/33] block: Pass BdrvChildRole in remaining cases,
Max Reitz <=
- [PATCH v2 33/33] block: Drop @child_class from bdrv_child_perm(), Max Reitz, 2020/02/04
- [PATCH v2 11/33] block: Unify bdrv_child_cb_attach(), Max Reitz, 2020/02/04