Commit b97511c7 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

block: Propagate AioContext change to all children 



Instead of propagating any change of a BDS's AioContext only to its file
and backing children and letting driver-specific code do the rest, just
propagate it to all and drop the thus superfluous implementations of
bdrv_{at,de}tach_aio_context() in Quorum, blkverify and VMDK.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 1f0c461b

block.c

+6 −10
Original line number Diff line number Diff line
@@ -3609,6 +3609,7 @@ AioContext *bdrv_get_aio_context(BlockDriverState *bs) 
void bdrv_detach_aio_context(BlockDriverState *bs)

{

    BdrvAioNotifier *baf;

    BdrvChild *child;



    if (!bs->drv) {

        return;
@@ -3621,11 +3622,8 @@ void bdrv_detach_aio_context(BlockDriverState *bs) 
    if (bs->drv->bdrv_detach_aio_context) {

        bs->drv->bdrv_detach_aio_context(bs);

    }

    if (bs->file) {

        bdrv_detach_aio_context(bs->file->bs);

    }

    if (bs->backing) {

        bdrv_detach_aio_context(bs->backing->bs);

    QLIST_FOREACH(child, &bs->children, next) {

        bdrv_detach_aio_context(child->bs);

    }



    bs->aio_context = NULL;
@@ -3635,6 +3633,7 @@ void bdrv_attach_aio_context(BlockDriverState *bs, 
                             AioContext *new_context)

{

    BdrvAioNotifier *ban;

    BdrvChild *child;



    if (!bs->drv) {

        return;
@@ -3642,11 +3641,8 @@ void bdrv_attach_aio_context(BlockDriverState *bs, 


    bs->aio_context = new_context;



    if (bs->backing) {

        bdrv_attach_aio_context(bs->backing->bs, new_context);

    }

    if (bs->file) {

        bdrv_attach_aio_context(bs->file->bs, new_context);

    QLIST_FOREACH(child, &bs->children, next) {

        bdrv_attach_aio_context(child->bs, new_context);

    }

    if (bs->drv->bdrv_attach_aio_context) {

        bs->drv->bdrv_attach_aio_context(bs, new_context);

block/blkverify.c

+0 −19
Original line number Diff line number Diff line
@@ -293,22 +293,6 @@ static bool blkverify_recurse_is_first_non_filter(BlockDriverState *bs, 
    return bdrv_recurse_is_first_non_filter(s->test_file->bs, candidate);

}



/* Propagate AioContext changes to ->test_file */

static void blkverify_detach_aio_context(BlockDriverState *bs)

{

    BDRVBlkverifyState *s = bs->opaque;



    bdrv_detach_aio_context(s->test_file->bs);

}



static void blkverify_attach_aio_context(BlockDriverState *bs,

                                         AioContext *new_context)

{

    BDRVBlkverifyState *s = bs->opaque;



    bdrv_attach_aio_context(s->test_file->bs, new_context);

}



static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options)

{

    BDRVBlkverifyState *s = bs->opaque;
@@ -356,9 +340,6 @@ static BlockDriver bdrv_blkverify = { 
    .bdrv_aio_writev                  = blkverify_aio_writev,

    .bdrv_aio_flush                   = blkverify_aio_flush,



    .bdrv_attach_aio_context          = blkverify_attach_aio_context,

    .bdrv_detach_aio_context          = blkverify_detach_aio_context,



    .is_filter                        = true,

    .bdrv_recurse_is_first_non_filter = blkverify_recurse_is_first_non_filter,

};

block/quorum.c

+0 −24
Original line number Diff line number Diff line
@@ -989,27 +989,6 @@ static void quorum_close(BlockDriverState *bs) 
    g_free(s->children);

}



static void quorum_detach_aio_context(BlockDriverState *bs)

{

    BDRVQuorumState *s = bs->opaque;

    int i;



    for (i = 0; i < s->num_children; i++) {

        bdrv_detach_aio_context(s->children[i]->bs);

    }

}



static void quorum_attach_aio_context(BlockDriverState *bs,

                                      AioContext *new_context)

{

    BDRVQuorumState *s = bs->opaque;

    int i;



    for (i = 0; i < s->num_children; i++) {

        bdrv_attach_aio_context(s->children[i]->bs, new_context);

    }

}



static void quorum_add_child(BlockDriverState *bs, BlockDriverState *child_bs,

                             Error **errp)

{
@@ -1127,9 +1106,6 @@ static BlockDriver bdrv_quorum = { 
    .bdrv_aio_readv                     = quorum_aio_readv,

    .bdrv_aio_writev                    = quorum_aio_writev,



    .bdrv_detach_aio_context            = quorum_detach_aio_context,

    .bdrv_attach_aio_context            = quorum_attach_aio_context,



    .bdrv_add_child                     = quorum_add_child,

    .bdrv_del_child                     = quorum_del_child,

block/vmdk.c

+0 −23
Original line number Diff line number Diff line
@@ -2343,27 +2343,6 @@ static int vmdk_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) 
    return 0;

}



static void vmdk_detach_aio_context(BlockDriverState *bs)

{

    BDRVVmdkState *s = bs->opaque;

    int i;



    for (i = 0; i < s->num_extents; i++) {

        bdrv_detach_aio_context(s->extents[i].file->bs);

    }

}



static void vmdk_attach_aio_context(BlockDriverState *bs,

                                    AioContext *new_context)

{

    BDRVVmdkState *s = bs->opaque;

    int i;



    for (i = 0; i < s->num_extents; i++) {

        bdrv_attach_aio_context(s->extents[i].file->bs, new_context);

    }

}



static QemuOptsList vmdk_create_opts = {

    .name = "vmdk-create-opts",

    .head = QTAILQ_HEAD_INITIALIZER(vmdk_create_opts.head),
@@ -2433,8 +2412,6 @@ static BlockDriver bdrv_vmdk = { 
    .bdrv_get_specific_info       = vmdk_get_specific_info,

    .bdrv_refresh_limits          = vmdk_refresh_limits,

    .bdrv_get_info                = vmdk_get_info,

    .bdrv_detach_aio_context      = vmdk_detach_aio_context,

    .bdrv_attach_aio_context      = vmdk_attach_aio_context,



    .supports_backing             = true,

    .create_opts                  = &vmdk_create_opts,