ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: Switch blk_read_unthrottled() to byte interface 

Sector-based blk_read() should die; convert the one-off
variant blk_read_unthrottled().

Signed-off-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Eric Blake 2016-05-06 10:26:28 -06:00 committed by Kevin Wolf
parent 8341f00dc2
commit b7d17f9fa4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/block-backend.c
View File

@ -790,19 +790,19 @@ int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
return blk_rw(blk, sector_num, buf, nb_sectors, blk_read_entry, 0); return blk_rw(blk, sector_num, buf, nb_sectors, blk_read_entry, 0);
} }
int blk_read_unthrottled(BlockBackend *blk, int64_t sector_num, uint8_t *buf, int blk_pread_unthrottled(BlockBackend *blk, int64_t offset, uint8_t *buf,
int nb_sectors) int count)
{ {
BlockDriverState *bs = blk_bs(blk); BlockDriverState *bs = blk_bs(blk);
int ret; int ret;
ret = blk_check_request(blk, sector_num, nb_sectors); ret = blk_check_byte_request(blk, offset, count);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
bdrv_no_throttling_begin(bs); bdrv_no_throttling_begin(bs);
ret = blk_read(blk, sector_num, buf, nb_sectors); ret = blk_pread(blk, offset, buf, count);
bdrv_no_throttling_end(bs); bdrv_no_throttling_end(bs);
return ret; return ret;
} }

2
hw/block/hd-geometry.c
View File

@ -66,7 +66,7 @@ static int guess_disk_lchs(BlockBackend *blk,
* but also in async I/O mode. So the I/O throttling function has to * but also in async I/O mode. So the I/O throttling function has to
* be disabled temporarily here, not permanently. * be disabled temporarily here, not permanently.
*/ */
if (blk_read_unthrottled(blk, 0, buf, 1) < 0) { if (blk_pread_unthrottled(blk, 0, buf, BDRV_SECTOR_SIZE) < 0) {
return -1; return -1;
} }
/* test msdos magic */ /* test msdos magic */

4
include/sysemu/block-backend.h
View File

@ -92,8 +92,8 @@ void *blk_get_attached_dev(BlockBackend *blk);
void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps *ops, void *opaque); void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps *ops, void *opaque);
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);
int blk_read_unthrottled(BlockBackend *blk, int64_t sector_num, uint8_t *buf, int blk_pread_unthrottled(BlockBackend *blk, int64_t offset, uint8_t *buf,
int nb_sectors); int count);
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 blk_write_zeroes(BlockBackend *blk, int64_t sector_num, int blk_write_zeroes(BlockBackend *blk, int64_t sector_num,