Commit f8ea8dac authored by Manos Pitsidianakis's avatar Manos Pitsidianakis Committed by Stefan Hajnoczi
Browse files

block: rename bdrv_co_drain to bdrv_co_drain_begin 



Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarManos Pitsidianakis <el13635@mail.ntua.gr>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 481cad48

block/io.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void coroutine_fn bdrv_drain_invoke_entry(void *opaque) 
    BlockDriverState *bs = data->bs;



    if (data->begin) {

        bs->drv->bdrv_co_drain(bs);

        bs->drv->bdrv_co_drain_begin(bs);

    } else {

        bs->drv->bdrv_co_drain_end(bs);

    }
@@ -179,7 +179,7 @@ static void bdrv_drain_invoke(BlockDriverState *bs, bool begin) 
{

    BdrvCoDrainData data = { .bs = bs, .done = false, .begin = begin};



    if (!bs->drv || (begin && !bs->drv->bdrv_co_drain) ||

    if (!bs->drv || (begin && !bs->drv->bdrv_co_drain_begin) ||

            (!begin && !bs->drv->bdrv_co_drain_end)) {

        return;

    }

block/qed.c

+3 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static bool qed_plug_allocating_write_reqs(BDRVQEDState *s) 
    assert(!s->allocating_write_reqs_plugged);

    if (s->allocating_acb != NULL) {

        /* Another allocating write came concurrently.  This cannot happen

         * from bdrv_qed_co_drain, but it can happen when the timer runs.

         * from bdrv_qed_co_drain_begin, but it can happen when the timer runs.

         */

        qemu_co_mutex_unlock(&s->table_lock);

        return false;
@@ -358,7 +358,7 @@ static void bdrv_qed_attach_aio_context(BlockDriverState *bs, 
    }

}



static void coroutine_fn bdrv_qed_co_drain(BlockDriverState *bs)

static void coroutine_fn bdrv_qed_co_drain_begin(BlockDriverState *bs)

{

    BDRVQEDState *s = bs->opaque;
@@ -1608,7 +1608,7 @@ static BlockDriver bdrv_qed = { 
    .bdrv_check               = bdrv_qed_check,

    .bdrv_detach_aio_context  = bdrv_qed_detach_aio_context,

    .bdrv_attach_aio_context  = bdrv_qed_attach_aio_context,

    .bdrv_co_drain            = bdrv_qed_co_drain,

    .bdrv_co_drain_begin      = bdrv_qed_co_drain_begin,

};



static void bdrv_qed_init(void)

include/block/block_int.h

+2 −2
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ struct BlockDriver { 
    int (*bdrv_probe_geometry)(BlockDriverState *bs, HDGeometry *geo);



    /**

     * bdrv_co_drain is called if implemented in the beginning of a

     * bdrv_co_drain_begin is called if implemented in the beginning of a

     * drain operation to drain and stop any internal sources of requests in

     * the driver.

     * bdrv_co_drain_end is called if implemented at the end of the drain.
@@ -363,7 +363,7 @@ struct BlockDriver { 
     * requests, or toggle an internal state. After the end of the drain new

     * requests will continue normally.

     */

    void coroutine_fn (*bdrv_co_drain)(BlockDriverState *bs);

    void coroutine_fn (*bdrv_co_drain_begin)(BlockDriverState *bs);

    void coroutine_fn (*bdrv_co_drain_end)(BlockDriverState *bs);



    void (*bdrv_add_child)(BlockDriverState *parent, BlockDriverState *child,