[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v7 02/19] block: Switch blk_read_unthrottled() to by
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v7 02/19] block: Switch blk_read_unthrottled() to byte interface |
Date: |
Fri, 6 May 2016 10:26:28 -0600 |
Sector-based blk_read() should die; convert the one-off
variant blk_read_unthrottled().
Signed-off-by: Eric Blake <address@hidden>
---
include/sysemu/block-backend.h | 4 ++--
block/block-backend.c | 8 ++++----
hw/block/hd-geometry.c | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 6991b26..662a106 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,
diff --git a/block/block-backend.c b/block/block-backend.c
index 96c1d7c..e5a8a07 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 6d02192..d388f13 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 */
--
2.5.5
- Re: [Qemu-block] [PATCH v7 06/19] scsi-disk: Switch to byte-based aio block access, (continued)
- [Qemu-block] [PATCH v7 07/19] virtio: Switch to byte-based aio block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 09/19] fdc: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 11/19] onenand: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 15/19] atapi: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 16/19] nbd: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 17/19] qemu-img: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 18/19] qemu-io: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 19/19] block: Kill unused sector-based blk_* functions, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 02/19] block: Switch blk_read_unthrottled() to byte interface,
Eric Blake <=
- [Qemu-block] [PATCH v7 05/19] ide: Switch to byte-based aio block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 08/19] xen_disk: Switch to byte-based aio block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 13/19] sd: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 12/19] pflash: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 14/19] m25p80: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 01/19] block: Allow BDRV_REQ_FUA through blk_pwrite(), Eric Blake, 2016/05/06
- [Qemu-block] [PATCH v7 10/19] nand: Switch to byte-based block access, Eric Blake, 2016/05/06
- Re: [Qemu-block] [PATCH v7 00/19] block: kill sector-based blk_write/read, Kevin Wolf, 2016/05/10
- Re: [Qemu-block] [PATCH v7 00/19] block: kill sector-based blk_write/read, Kevin Wolf, 2016/05/10