Commit fffb6e12 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

block: use aio_bh_schedule_oneshot 



This simplifies bottom half handlers by removing calls to qemu_bh_delete and
thus removing the need to stash the bottom half pointer in the opaque
datum.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 5b8bb359

block/archipelago.c

+1 −4
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ typedef enum { 


typedef struct ArchipelagoAIOCB {

    BlockAIOCB common;

    QEMUBH *bh;

    struct BDRVArchipelagoState *s;

    QEMUIOVector *qiov;

    ARCHIPCmd cmd;
@@ -154,11 +153,10 @@ static void archipelago_finish_aiocb(AIORequestData *reqdata) 
    } else if (reqdata->aio_cb->ret == reqdata->segreq->total) {

        reqdata->aio_cb->ret = 0;

    }

    reqdata->aio_cb->bh = aio_bh_new(

    aio_bh_schedule_oneshot(

                        bdrv_get_aio_context(reqdata->aio_cb->common.bs),

                        qemu_archipelago_complete_aio, reqdata

                        );

    qemu_bh_schedule(reqdata->aio_cb->bh);

}



static int wait_reply(struct xseg *xseg, xport srcport, struct xseg_port *port,
@@ -313,7 +311,6 @@ static void qemu_archipelago_complete_aio(void *opaque) 
    AIORequestData *reqdata = (AIORequestData *) opaque;

    ArchipelagoAIOCB *aio_cb = (ArchipelagoAIOCB *) reqdata->aio_cb;



    qemu_bh_delete(aio_cb->bh);

    aio_cb->common.cb(aio_cb->common.opaque, aio_cb->ret);

    aio_cb->status = 0;

block/blkdebug.c

+1 −6
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ typedef struct BDRVBlkdebugState { 


typedef struct BlkdebugAIOCB {

    BlockAIOCB common;

    QEMUBH *bh;

    int ret;

} BlkdebugAIOCB;
@@ -410,7 +409,6 @@ out: 
static void error_callback_bh(void *opaque)

{

    struct BlkdebugAIOCB *acb = opaque;

    qemu_bh_delete(acb->bh);

    acb->common.cb(acb->common.opaque, acb->ret);

    qemu_aio_unref(acb);

}
@@ -421,7 +419,6 @@ static BlockAIOCB *inject_error(BlockDriverState *bs, 
    BDRVBlkdebugState *s = bs->opaque;

    int error = rule->options.inject.error;

    struct BlkdebugAIOCB *acb;

    QEMUBH *bh;

    bool immediately = rule->options.inject.immediately;



    if (rule->options.inject.once) {
@@ -436,9 +433,7 @@ static BlockAIOCB *inject_error(BlockDriverState *bs, 
    acb = qemu_aio_get(&blkdebug_aiocb_info, bs, cb, opaque);

    acb->ret = -error;



    bh = aio_bh_new(bdrv_get_aio_context(bs), error_callback_bh, acb);

    acb->bh = bh;

    qemu_bh_schedule(bh);

    aio_bh_schedule_oneshot(bdrv_get_aio_context(bs), error_callback_bh, acb);



    return &acb->common;

}

block/blkverify.c

+2 −6
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ typedef struct { 
typedef struct BlkverifyAIOCB BlkverifyAIOCB;

struct BlkverifyAIOCB {

    BlockAIOCB common;

    QEMUBH *bh;



    /* Request metadata */

    bool is_write;
@@ -175,7 +174,6 @@ static BlkverifyAIOCB *blkverify_aio_get(BlockDriverState *bs, bool is_write, 
{

    BlkverifyAIOCB *acb = qemu_aio_get(&blkverify_aiocb_info, bs, cb, opaque);



    acb->bh = NULL;

    acb->is_write = is_write;

    acb->sector_num = sector_num;

    acb->nb_sectors = nb_sectors;
@@ -191,7 +189,6 @@ static void blkverify_aio_bh(void *opaque) 
{

    BlkverifyAIOCB *acb = opaque;



    qemu_bh_delete(acb->bh);

    if (acb->buf) {

        qemu_iovec_destroy(&acb->raw_qiov);

        qemu_vfree(acb->buf);
@@ -218,9 +215,8 @@ static void blkverify_aio_cb(void *opaque, int ret) 
            acb->verify(acb);

        }



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

        aio_bh_schedule_oneshot(bdrv_get_aio_context(acb->common.bs),

                                blkverify_aio_bh, acb);

        qemu_bh_schedule(acb->bh);

        break;

    }

}

block/block-backend.c

+7 −16
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ struct BlockBackend { 


typedef struct BlockBackendAIOCB {

    BlockAIOCB common;

    QEMUBH *bh;

    BlockBackend *blk;

    int ret;

} BlockBackendAIOCB;
@@ -898,7 +897,6 @@ int blk_make_zero(BlockBackend *blk, BdrvRequestFlags flags) 
static void error_callback_bh(void *opaque)

{

    struct BlockBackendAIOCB *acb = opaque;

    qemu_bh_delete(acb->bh);

    acb->common.cb(acb->common.opaque, acb->ret);

    qemu_aio_unref(acb);

}
@@ -908,16 +906,12 @@ BlockAIOCB *blk_abort_aio_request(BlockBackend *blk, 
                                  void *opaque, int ret)

{

    struct BlockBackendAIOCB *acb;

    QEMUBH *bh;



    acb = blk_aio_get(&block_backend_aiocb_info, blk, cb, opaque);

    acb->blk = blk;

    acb->ret = ret;



    bh = aio_bh_new(blk_get_aio_context(blk), error_callback_bh, acb);

    acb->bh = bh;

    qemu_bh_schedule(bh);



    aio_bh_schedule_oneshot(blk_get_aio_context(blk), error_callback_bh, acb);

    return &acb->common;

}
@@ -926,7 +920,6 @@ typedef struct BlkAioEmAIOCB { 
    BlkRwCo rwco;

    int bytes;

    bool has_returned;

    QEMUBH* bh;

} BlkAioEmAIOCB;



static const AIOCBInfo blk_aio_em_aiocb_info = {
@@ -935,10 +928,6 @@ static const AIOCBInfo blk_aio_em_aiocb_info = { 


static void blk_aio_complete(BlkAioEmAIOCB *acb)

{

    if (acb->bh) {

        assert(acb->has_returned);

        qemu_bh_delete(acb->bh);

    }

    if (acb->has_returned) {

        acb->common.cb(acb->common.opaque, acb->rwco.ret);

        qemu_aio_unref(acb);
@@ -947,7 +936,10 @@ static void blk_aio_complete(BlkAioEmAIOCB *acb) 


static void blk_aio_complete_bh(void *opaque)

{

    blk_aio_complete(opaque);

    BlkAioEmAIOCB *acb = opaque;



    assert(acb->has_returned);

    blk_aio_complete(acb);

}



static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, int64_t offset, int bytes,
@@ -967,7 +959,6 @@ static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, int64_t offset, int bytes, 
        .ret    = NOT_DONE,

    };

    acb->bytes = bytes;

    acb->bh = NULL;

    acb->has_returned = false;



    co = qemu_coroutine_create(co_entry, acb);
@@ -975,8 +966,8 @@ static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, int64_t offset, int bytes, 


    acb->has_returned = true;

    if (acb->rwco.ret != NOT_DONE) {

        acb->bh = aio_bh_new(blk_get_aio_context(blk), blk_aio_complete_bh, acb);

        qemu_bh_schedule(acb->bh);

        aio_bh_schedule_oneshot(blk_get_aio_context(blk),

                                blk_aio_complete_bh, acb);

    }



    return &acb->common;

block/curl.c

+1 −6
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ struct BDRVCURLState; 


typedef struct CURLAIOCB {

    BlockAIOCB common;

    QEMUBH *bh;

    QEMUIOVector *qiov;



    int64_t sector_num;
@@ -739,9 +738,6 @@ static void curl_readv_bh_cb(void *p) 
    CURLAIOCB *acb = p;

    BDRVCURLState *s = acb->common.bs->opaque;



    qemu_bh_delete(acb->bh);

    acb->bh = NULL;



    size_t start = acb->sector_num * SECTOR_SIZE;

    size_t end;
@@ -805,8 +801,7 @@ static BlockAIOCB *curl_aio_readv(BlockDriverState *bs, 
    acb->sector_num = sector_num;

    acb->nb_sectors = nb_sectors;



    acb->bh = aio_bh_new(bdrv_get_aio_context(bs), curl_readv_bh_cb, acb);

    qemu_bh_schedule(acb->bh);

    aio_bh_schedule_oneshot(bdrv_get_aio_context(bs), curl_readv_bh_cb, acb);

    return &acb->common;

}