Commit 9d94020b authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

blkverify: implement .bdrv_detach/attach_aio_context() 



Drop the assumption that we're using the main AioContext.  Convert
qemu_bh_new() to aio_bh_new() and qemu_aio_wait() to aio_poll() so we
use the BlockDriverState's AioContext.

Implement .bdrv_detach/attach_aio_context() interfaces to propagate
detach/attach to BDRVBlkverifyState->test_file.  The block layer takes
care of ->file and ->backing_hd but doesn't know about our ->test_file
BlockDriverState, which is also part of the graph.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 7e1efdf0

block/blkverify.c

+34 −13
Original line number Diff line number Diff line
@@ -39,12 +39,13 @@ struct BlkverifyAIOCB { 
static void blkverify_aio_cancel(BlockDriverAIOCB *blockacb)

{

    BlkverifyAIOCB *acb = (BlkverifyAIOCB *)blockacb;

    AioContext *aio_context = bdrv_get_aio_context(blockacb->bs);

    bool finished = false;



    /* Wait until request completes, invokes its callback, and frees itself */

    acb->finished = &finished;

    while (!finished) {

        qemu_aio_wait();

        aio_poll(aio_context, true);

    }

}
@@ -228,7 +229,8 @@ static void blkverify_aio_cb(void *opaque, int ret) 
            acb->verify(acb);

        }



        acb->bh = qemu_bh_new(blkverify_aio_bh, acb);

        acb->bh = aio_bh_new(bdrv_get_aio_context(acb->common.bs),

                             blkverify_aio_bh, acb);

        qemu_bh_schedule(acb->bh);

        break;

    }
@@ -302,6 +304,22 @@ static bool blkverify_recurse_is_first_non_filter(BlockDriverState *bs, 
    return bdrv_recurse_is_first_non_filter(s->test_file, 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);

}



static void blkverify_attach_aio_context(BlockDriverState *bs,

                                         AioContext *new_context)

{

    BDRVBlkverifyState *s = bs->opaque;



    bdrv_attach_aio_context(s->test_file, new_context);

}



static BlockDriver bdrv_blkverify = {

    .format_name                      = "blkverify",

    .protocol_name                    = "blkverify",
@@ -316,6 +334,9 @@ 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,

};