OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: drop ctx argument from bdrv_root_attach_child 

Passing parent aio context is redundant, as child_class and parent
opaque pointer are enough to retrieve it. Drop the argument and use new
bdrv_child_get_parent_aio_context() interface.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210428151804.439460-7-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-04-28 18:17:34 +03:00 committed by Kevin Wolf
parent 3ca1f32257
commit 228ca37e12
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block.c
View File

@ -2700,13 +2700,13 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
const char *child_name, const char *child_name,
const BdrvChildClass *child_class, const BdrvChildClass *child_class,
BdrvChildRole child_role, BdrvChildRole child_role,
AioContext *ctx,
uint64_t perm, uint64_t shared_perm, uint64_t perm, uint64_t shared_perm,
void *opaque, Error **errp) void *opaque, Error **errp)
{ {
BdrvChild *child; BdrvChild *child;
Error *local_err = NULL; Error *local_err = NULL;
int ret; int ret;
AioContext *ctx;
ret = bdrv_check_update_perm(child_bs, NULL, perm, shared_perm, NULL, errp); ret = bdrv_check_update_perm(child_bs, NULL, perm, shared_perm, NULL, errp);
if (ret < 0) { if (ret < 0) {
@ -2726,6 +2726,8 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
.opaque = opaque, .opaque = opaque,
}; };
ctx = bdrv_child_get_parent_aio_context(child);
/* If the AioContexts don't match, first try to move the subtree of /* If the AioContexts don't match, first try to move the subtree of
* child_bs into the AioContext of the new parent. If this doesn't work, * child_bs into the AioContext of the new parent. If this doesn't work,
* try moving the parent into the AioContext of child_bs instead. */ * try moving the parent into the AioContext of child_bs instead. */
@ -2786,8 +2788,8 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs,
perm, shared_perm, &perm, &shared_perm); perm, shared_perm, &perm, &shared_perm);
child = bdrv_root_attach_child(child_bs, child_name, child_class, child = bdrv_root_attach_child(child_bs, child_name, child_class,
child_role, bdrv_get_aio_context(parent_bs), child_role, perm, shared_perm, parent_bs,
perm, shared_perm, parent_bs, errp); errp);
if (child == NULL) { if (child == NULL) {
return NULL; return NULL;
} }

4
block/block-backend.c
View File

@ -435,7 +435,7 @@ BlockBackend *blk_new_open(const char *filename, const char *reference,
blk->root = bdrv_root_attach_child(bs, "root", &child_root, blk->root = bdrv_root_attach_child(bs, "root", &child_root,
BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
blk->ctx, perm, BLK_PERM_ALL, blk, errp); perm, BLK_PERM_ALL, blk, errp);
if (!blk->root) { if (!blk->root) {
blk_unref(blk); blk_unref(blk);
return NULL; return NULL;
@ -849,7 +849,7 @@ int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs, Error **errp)
bdrv_ref(bs); bdrv_ref(bs);
blk->root = bdrv_root_attach_child(bs, "root", &child_root, blk->root = bdrv_root_attach_child(bs, "root", &child_root,
BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,
blk->ctx, blk->perm, blk->shared_perm, blk->perm, blk->shared_perm,
blk, errp); blk, errp);
if (blk->root == NULL) { if (blk->root == NULL) {
return -EPERM; return -EPERM;

3
blockjob.c
View File

@ -229,8 +229,7 @@ int block_job_add_bdrv(BlockJob *job, const char *name, BlockDriverState *bs,
if (need_context_ops && job->job.aio_context != qemu_get_aio_context()) { if (need_context_ops && job->job.aio_context != qemu_get_aio_context()) {
aio_context_release(job->job.aio_context); aio_context_release(job->job.aio_context);
} }
c = bdrv_root_attach_child(bs, name, &child_job, 0, c = bdrv_root_attach_child(bs, name, &child_job, 0, perm, shared_perm, job,
job->job.aio_context, perm, shared_perm, job,
errp); errp);
if (need_context_ops && job->job.aio_context != qemu_get_aio_context()) { if (need_context_ops && job->job.aio_context != qemu_get_aio_context()) {
aio_context_acquire(job->job.aio_context); aio_context_acquire(job->job.aio_context);

1
include/block/block_int.h
View File

@ -1308,7 +1308,6 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs,
const char *child_name, const char *child_name,
const BdrvChildClass *child_class, const BdrvChildClass *child_class,
BdrvChildRole child_role, BdrvChildRole child_role,
AioContext *ctx,
uint64_t perm, uint64_t shared_perm, uint64_t perm, uint64_t shared_perm,
void *opaque, Error **errp); void *opaque, Error **errp);
void bdrv_root_unref_child(BdrvChild *child); void bdrv_root_unref_child(BdrvChild *child);