diff options
| author | Eric Blake <eblake@redhat.com> | 2016-05-06 10:26:28 -0600 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-05-12 15:22:08 +0200 |
| commit | b7d17f9fa4df83ed060168c450889d73c441c8f6 (patch) | |
| tree | 1e3440c0129ba315811ff15d1c4d917b0551e41d | |
| parent | 8341f00dc207b80a1b2e7c7784890c9b0446d062 (diff) | |
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>
| -rw-r--r-- | block/block-backend.c | 8 | ||||
| -rw-r--r-- | hw/block/hd-geometry.c | 2 | ||||
| -rw-r--r-- | include/sysemu/block-backend.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 96c1d7c445..e5a8a0734f 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -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); } -int blk_read_unthrottled(BlockBackend *blk, int64_t sector_num, uint8_t *buf, - int nb_sectors) +int blk_pread_unthrottled(BlockBackend *blk, int64_t offset, uint8_t *buf, + int count) { BlockDriverState *bs = blk_bs(blk); int ret; - ret = blk_check_request(blk, sector_num, nb_sectors); + ret = blk_check_byte_request(blk, offset, count); if (ret < 0) { return ret; } 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); return ret; } diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c index 6d02192dbb..d388f13e9d 100644 --- a/hw/block/hd-geometry.c +++ b/hw/block/hd-geometry.c @@ -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 * 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; } /* test msdos magic */ diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 6991b2610c..662a106bd2 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -92,8 +92,8 @@ void *blk_get_attached_dev(BlockBackend *blk); 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 nb_sectors); -int blk_read_unthrottled(BlockBackend *blk, int64_t sector_num, uint8_t *buf, - int nb_sectors); +int blk_pread_unthrottled(BlockBackend *blk, int64_t offset, uint8_t *buf, + int count); int blk_write(BlockBackend *blk, int64_t sector_num, const uint8_t *buf, int nb_sectors); int blk_write_zeroes(BlockBackend *blk, int64_t sector_num, |