OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block: Use blk_co_pwritev() for blk_write() 

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2016-03-08 13:47:48 +01:00
parent 1bf1cbc91f
commit a8823a3bfd
3 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
block/block-backend.c
View File

@ -707,6 +707,18 @@ static int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
return bdrv_co_do_preadv(blk_bs(blk), offset, bytes, qiov, flags); return bdrv_co_do_preadv(blk_bs(blk), offset, bytes, qiov, flags);
} }
static int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
unsigned int bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags)
{
int ret = blk_check_byte_request(blk, offset, bytes);
if (ret < 0) {
return ret;
}
return bdrv_co_do_pwritev(blk_bs(blk), offset, bytes, qiov, flags);
}
typedef struct BlkRwCo { typedef struct BlkRwCo {
BlockBackend *blk; BlockBackend *blk;
int64_t offset; int64_t offset;
@ -723,8 +735,16 @@ static void blk_read_entry(void *opaque)
rwco->qiov, rwco->flags); rwco->qiov, rwco->flags);
} }
int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf, static void blk_write_entry(void *opaque)
int nb_sectors) {
BlkRwCo *rwco = opaque;
rwco->ret = blk_co_pwritev(rwco->blk, rwco->offset, rwco->qiov->size,
rwco->qiov, rwco->flags);
}
static int blk_rw(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
int nb_sectors, CoroutineEntry co_entry)
{ {
AioContext *aio_context; AioContext *aio_context;
QEMUIOVector qiov; QEMUIOVector qiov;
@ -749,7 +769,7 @@ int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
.ret = NOT_DONE, .ret = NOT_DONE,
}; };
co = qemu_coroutine_create(blk_read_entry); co = qemu_coroutine_create(co_entry);
qemu_coroutine_enter(co, &rwco); qemu_coroutine_enter(co, &rwco);
aio_context = blk_get_aio_context(blk); aio_context = blk_get_aio_context(blk);
@ -760,6 +780,12 @@ int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
return rwco.ret; return rwco.ret;
} }
int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
int nb_sectors)
{
return blk_rw(blk, sector_num, buf, nb_sectors, blk_read_entry);
}
int blk_read_unthrottled(BlockBackend *blk, int64_t sector_num, uint8_t *buf, int blk_read_unthrottled(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
int nb_sectors) int nb_sectors)
{ {
@ -774,12 +800,7 @@ int blk_read_unthrottled(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
int blk_write(BlockBackend *blk, int64_t sector_num, const uint8_t *buf, int blk_write(BlockBackend *blk, int64_t sector_num, const uint8_t *buf,
int nb_sectors) int nb_sectors)
{ {
int ret = blk_check_request(blk, sector_num, nb_sectors); return blk_rw(blk, sector_num, (uint8_t*) buf, nb_sectors, blk_write_entry);
if (ret < 0) {
return ret;
}
return bdrv_write(blk_bs(blk), sector_num, buf, nb_sectors);
} }
int blk_write_zeroes(BlockBackend *blk, int64_t sector_num, int blk_write_zeroes(BlockBackend *blk, int64_t sector_num,

5
block/io.c
View File

@ -44,9 +44,6 @@ static int coroutine_fn bdrv_co_readv_em(BlockDriverState *bs,
static int coroutine_fn bdrv_co_writev_em(BlockDriverState *bs, static int coroutine_fn bdrv_co_writev_em(BlockDriverState *bs,
int64_t sector_num, int nb_sectors, int64_t sector_num, int nb_sectors,
QEMUIOVector *iov); QEMUIOVector *iov);
static int coroutine_fn bdrv_co_do_pwritev(BlockDriverState *bs,
int64_t offset, unsigned int bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags);
static BlockAIOCB *bdrv_co_aio_rw_vector(BlockDriverState *bs, static BlockAIOCB *bdrv_co_aio_rw_vector(BlockDriverState *bs,
int64_t sector_num, int64_t sector_num,
QEMUIOVector *qiov, QEMUIOVector *qiov,
@ -1281,7 +1278,7 @@ fail:
/* /*
* Handle a write request in coroutine context * Handle a write request in coroutine context
*/ */
static int coroutine_fn bdrv_co_do_pwritev(BlockDriverState *bs, int coroutine_fn bdrv_co_do_pwritev(BlockDriverState *bs,
int64_t offset, unsigned int bytes, QEMUIOVector *qiov, int64_t offset, unsigned int bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags) BdrvRequestFlags flags)
{ {

3
include/block/block_int.h
View File

@ -511,6 +511,9 @@ void bdrv_setup_io_funcs(BlockDriver *bdrv);
int coroutine_fn bdrv_co_do_preadv(BlockDriverState *bs, int coroutine_fn bdrv_co_do_preadv(BlockDriverState *bs,
int64_t offset, unsigned int bytes, QEMUIOVector *qiov, int64_t offset, unsigned int bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags); BdrvRequestFlags flags);
int coroutine_fn bdrv_co_do_pwritev(BlockDriverState *bs,
int64_t offset, unsigned int bytes, QEMUIOVector *qiov,
BdrvRequestFlags flags);
int get_tmp_filename(char *filename, int size); int get_tmp_filename(char *filename, int size);
BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size, BlockDriver *bdrv_probe_all(const uint8_t *buf, int buf_size,