motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-31 14:02:05 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: Convert bdrv_prwv_co() to BdrvChild

Browse source 
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf 2016-05-30 15:00:40 +02:00
parent 720ff280e7
commit e293b7a3df
1 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

45
block/io.c
View file

@ -553,7 +553,7 @@ static int bdrv_check_request(BlockDriverState *bs, int64_t sector_num,
} }
typedef struct RwCo { typedef struct RwCo {
BlockDriverState *bs; BdrvChild *child;
int64_t offset; int64_t offset;
QEMUIOVector *qiov; QEMUIOVector *qiov;
bool is_write; bool is_write;
@ -566,11 +566,11 @@ static void coroutine_fn bdrv_rw_co_entry(void *opaque)
RwCo *rwco = opaque; RwCo *rwco = opaque;
if (!rwco->is_write) { if (!rwco->is_write) {
rwco->ret = bdrv_co_preadv(rwco->bs, rwco->offset, rwco->ret = bdrv_co_preadv(rwco->child->bs, rwco->offset,
rwco->qiov->size, rwco->qiov, rwco->qiov->size, rwco->qiov,
rwco->flags); rwco->flags);
} else { } else {
rwco->ret = bdrv_co_pwritev(rwco->bs, rwco->offset, rwco->ret = bdrv_co_pwritev(rwco->child->bs, rwco->offset,
rwco->qiov->size, rwco->qiov, rwco->qiov->size, rwco->qiov,
rwco->flags); rwco->flags);
} }
@ -579,13 +579,13 @@ static void coroutine_fn bdrv_rw_co_entry(void *opaque)
/* /*
* Process a vectored synchronous request using coroutines * Process a vectored synchronous request using coroutines
*/ */
static int bdrv_prwv_co(BlockDriverState *bs, int64_t offset, static int bdrv_prwv_co(BdrvChild *child, int64_t offset,
QEMUIOVector *qiov, bool is_write, QEMUIOVector *qiov, bool is_write,
BdrvRequestFlags flags) BdrvRequestFlags flags)
{ {
Coroutine *co; Coroutine *co;
RwCo rwco = { RwCo rwco = {
.bs = bs, .child = child,
.offset = offset, .offset = offset,
.qiov = qiov, .qiov = qiov,
.is_write = is_write, .is_write = is_write,
@ -597,7 +597,7 @@ static int bdrv_prwv_co(BlockDriverState *bs, int64_t offset,
/* Fast-path if already in coroutine context */ /* Fast-path if already in coroutine context */
bdrv_rw_co_entry(&rwco); bdrv_rw_co_entry(&rwco);
} else { } else {
AioContext *aio_context = bdrv_get_aio_context(bs); AioContext *aio_context = bdrv_get_aio_context(child->bs);
co = qemu_coroutine_create(bdrv_rw_co_entry); co = qemu_coroutine_create(bdrv_rw_co_entry);
qemu_coroutine_enter(co, &rwco); qemu_coroutine_enter(co, &rwco);
@ -611,7 +611,7 @@ static int bdrv_prwv_co(BlockDriverState *bs, int64_t offset,
/* /*
* Process a synchronous request using coroutines * Process a synchronous request using coroutines
*/ */
static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, static int bdrv_rw_co(BdrvChild *child, int64_t sector_num, uint8_t *buf,
int nb_sectors, bool is_write, BdrvRequestFlags flags) int nb_sectors, bool is_write, BdrvRequestFlags flags)
{ {
QEMUIOVector qiov; QEMUIOVector qiov;
@ -625,7 +625,7 @@ static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,
} }
qemu_iovec_init_external(&qiov, &iov, 1); qemu_iovec_init_external(&qiov, &iov, 1);
return bdrv_prwv_co(bs, sector_num << BDRV_SECTOR_BITS, return bdrv_prwv_co(child, sector_num << BDRV_SECTOR_BITS,
&qiov, is_write, flags); &qiov, is_write, flags);
} }
@ -633,7 +633,7 @@ static int bdrv_rw_co(BlockDriverState *bs, int64_t sector_num, uint8_t *buf,
int bdrv_read(BdrvChild *child, int64_t sector_num, int bdrv_read(BdrvChild *child, int64_t sector_num,
uint8_t *buf, int nb_sectors) uint8_t *buf, int nb_sectors)
{ {
return bdrv_rw_co(child->bs, sector_num, buf, nb_sectors, false, 0); return bdrv_rw_co(child, sector_num, buf, nb_sectors, false, 0);
} }
/* Return < 0 if error. Important errors are: /* Return < 0 if error. Important errors are:
@ -645,8 +645,7 @@ int bdrv_read(BdrvChild *child, int64_t sector_num,
int bdrv_write(BdrvChild *child, int64_t sector_num, int bdrv_write(BdrvChild *child, int64_t sector_num,
const uint8_t *buf, int nb_sectors) const uint8_t *buf, int nb_sectors)
{ {
return bdrv_rw_co(child->bs, sector_num, (uint8_t *)buf, nb_sectors, return bdrv_rw_co(child, sector_num, (uint8_t *)buf, nb_sectors, true, 0);
true, 0);
} }
int bdrv_pwrite_zeroes(BdrvChild *child, int64_t offset, int bdrv_pwrite_zeroes(BdrvChild *child, int64_t offset,
@ -659,7 +658,7 @@ int bdrv_pwrite_zeroes(BdrvChild *child, int64_t offset,
}; };
qemu_iovec_init_external(&qiov, &iov, 1); qemu_iovec_init_external(&qiov, &iov, 1);
return bdrv_prwv_co(child->bs, offset, &qiov, true, return bdrv_prwv_co(child, offset, &qiov, true,
BDRV_REQ_ZERO_WRITE | flags); BDRV_REQ_ZERO_WRITE | flags);
} }
@ -714,7 +713,7 @@ int bdrv_preadv(BdrvChild *child, int64_t offset, QEMUIOVector *qiov)
{ {
int ret; int ret;
ret = bdrv_prwv_co(child->bs, offset, qiov, false, 0); ret = bdrv_prwv_co(child, offset, qiov, false, 0);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -742,7 +741,7 @@ int bdrv_pwritev(BdrvChild *child, int64_t offset, QEMUIOVector *qiov)
{ {
int ret; int ret;
ret = bdrv_prwv_co(child->bs, offset, qiov, true, 0); ret = bdrv_prwv_co(child, offset, qiov, true, 0);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -2210,9 +2209,15 @@ void qemu_aio_unref(void *p)
/**************************************************************/ /**************************************************************/
/* Coroutine block device emulation */ /* Coroutine block device emulation */
typedef struct FlushCo {
BlockDriverState *bs;
int ret;
} FlushCo;
static void coroutine_fn bdrv_flush_co_entry(void *opaque) static void coroutine_fn bdrv_flush_co_entry(void *opaque)
{ {
RwCo *rwco = opaque; FlushCo *rwco = opaque;
rwco->ret = bdrv_co_flush(rwco->bs); rwco->ret = bdrv_co_flush(rwco->bs);
} }
@ -2296,25 +2301,25 @@ out:
int bdrv_flush(BlockDriverState *bs) int bdrv_flush(BlockDriverState *bs)
{ {
Coroutine *co; Coroutine *co;
RwCo rwco = { FlushCo flush_co = {
.bs = bs, .bs = bs,
.ret = NOT_DONE, .ret = NOT_DONE,
}; };
if (qemu_in_coroutine()) { if (qemu_in_coroutine()) {
/* Fast-path if already in coroutine context */ /* Fast-path if already in coroutine context */
bdrv_flush_co_entry(&rwco); bdrv_flush_co_entry(&flush_co);
} else { } else {
AioContext *aio_context = bdrv_get_aio_context(bs); AioContext *aio_context = bdrv_get_aio_context(bs);
co = qemu_coroutine_create(bdrv_flush_co_entry); co = qemu_coroutine_create(bdrv_flush_co_entry);
qemu_coroutine_enter(co, &rwco); qemu_coroutine_enter(co, &flush_co);
while (rwco.ret == NOT_DONE) { while (flush_co.ret == NOT_DONE) {
aio_poll(aio_context, true); aio_poll(aio_context, true);
} }
} }
return rwco.ret; return flush_co.ret;
} }
typedef struct DiscardCo { typedef struct DiscardCo {