falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: rename bdrv_co_drain to bdrv_co_drain_begin 

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Manos Pitsidianakis <el13635@mail.ntua.gr>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Manos Pitsidianakis 2017-09-23 14:14:10 +03:00 committed by Stefan Hajnoczi
parent 481cad48e5
commit f8ea8dacf0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/io.c
View File

@ -165,7 +165,7 @@ static void coroutine_fn bdrv_drain_invoke_entry(void *opaque)
BlockDriverState *bs = data->bs; BlockDriverState *bs = data->bs;
if (data->begin) { if (data->begin) {
bs->drv->bdrv_co_drain(bs); bs->drv->bdrv_co_drain_begin(bs);
} else { } else {
bs->drv->bdrv_co_drain_end(bs); 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}; 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)) { (!begin && !bs->drv->bdrv_co_drain_end)) {
return; return;
} }

6
block/qed.c
View File

@ -265,7 +265,7 @@ static bool qed_plug_allocating_write_reqs(BDRVQEDState *s)
assert(!s->allocating_write_reqs_plugged); assert(!s->allocating_write_reqs_plugged);
if (s->allocating_acb != NULL) { if (s->allocating_acb != NULL) {
/* Another allocating write came concurrently. This cannot happen /* 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); qemu_co_mutex_unlock(&s->table_lock);
return false; 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; BDRVQEDState *s = bs->opaque;
@ -1608,7 +1608,7 @@ static BlockDriver bdrv_qed = {
.bdrv_check = bdrv_qed_check, .bdrv_check = bdrv_qed_check,
.bdrv_detach_aio_context = bdrv_qed_detach_aio_context, .bdrv_detach_aio_context = bdrv_qed_detach_aio_context,
.bdrv_attach_aio_context = bdrv_qed_attach_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) static void bdrv_qed_init(void)

4
include/block/block_int.h
View File

@ -354,7 +354,7 @@ struct BlockDriver {
int (*bdrv_probe_geometry)(BlockDriverState *bs, HDGeometry *geo); 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 * drain operation to drain and stop any internal sources of requests in
* the driver. * the driver.
* bdrv_co_drain_end is called if implemented at the end of the drain. * 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, or toggle an internal state. After the end of the drain new
* requests will continue normally. * 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 coroutine_fn (*bdrv_co_drain_end)(BlockDriverState *bs);
void (*bdrv_add_child)(BlockDriverState *parent, BlockDriverState *child, void (*bdrv_add_child)(BlockDriverState *parent, BlockDriverState *child,