haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

block: Use blk_prw() in blk_pread()/blk_pwrite()

Browse source 
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2016-03-08 13:47:51 +01:00
parent fc1453cdfc
commit a55d3fba99
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
block/block-backend.c
View file

@ -743,9 +743,9 @@ static void blk_write_entry(void *opaque)
rwco->qiov, rwco->flags); rwco->qiov, rwco->flags);
} }
static int blk_rw(BlockBackend *blk, int64_t sector_num, uint8_t *buf, static int blk_prw(BlockBackend *blk, int64_t offset, uint8_t *buf,
int nb_sectors, CoroutineEntry co_entry, int64_t bytes, CoroutineEntry co_entry,
BdrvRequestFlags flags) BdrvRequestFlags flags)
{ {
AioContext *aio_context; AioContext *aio_context;
QEMUIOVector qiov; QEMUIOVector qiov;
@ -753,19 +753,15 @@ static int blk_rw(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
Coroutine *co; Coroutine *co;
BlkRwCo rwco; BlkRwCo rwco;
if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {
return -EINVAL;
}
iov = (struct iovec) { iov = (struct iovec) {
.iov_base = buf, .iov_base = buf,
.iov_len = nb_sectors * BDRV_SECTOR_SIZE, .iov_len = bytes,
}; };
qemu_iovec_init_external(&qiov, &iov, 1); qemu_iovec_init_external(&qiov, &iov, 1);
rwco = (BlkRwCo) { rwco = (BlkRwCo) {
.blk = blk, .blk = blk,
.offset = sector_num << BDRV_SECTOR_BITS, .offset = offset,
.qiov = &qiov, .qiov = &qiov,
.flags = flags, .flags = flags,
.ret = NOT_DONE, .ret = NOT_DONE,
@ -782,6 +778,18 @@ static int blk_rw(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
return rwco.ret; return rwco.ret;
} }
static int blk_rw(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
int nb_sectors, CoroutineEntry co_entry,
BdrvRequestFlags flags)
{
if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {
return -EINVAL;
}
return blk_prw(blk, sector_num << BDRV_SECTOR_BITS, buf,
nb_sectors << BDRV_SECTOR_BITS, co_entry, flags);
}
int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf, int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
int nb_sectors) int nb_sectors)
{ {
@ -862,22 +870,20 @@ BlockAIOCB *blk_aio_write_zeroes(BlockBackend *blk, int64_t sector_num,
int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int count) int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int count)
{ {
int ret = blk_check_byte_request(blk, offset, count); int ret = blk_prw(blk, offset, buf, count, blk_read_entry, 0);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
return count;
return bdrv_pread(blk_bs(blk), offset, buf, count);
} }
int blk_pwrite(BlockBackend *blk, int64_t offset, const void *buf, int count) int blk_pwrite(BlockBackend *blk, int64_t offset, const void *buf, int count)
{ {
int ret = blk_check_byte_request(blk, offset, count); int ret = blk_prw(blk, offset, (void*) buf, count, blk_write_entry, 0);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
return count;
return bdrv_pwrite(blk_bs(blk), offset, buf, count);
} }
int64_t blk_getlength(BlockBackend *blk) int64_t blk_getlength(BlockBackend *blk)