[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/38] block/parallels: switch to bdrv_read
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 03/38] block/parallels: switch to bdrv_read |
Date: |
Fri, 22 May 2015 10:01:35 +0100 |
From: Roman Kagan <address@hidden>
Switch the .bdrv_read method implementation from using bdrv_pread() to
bdrv_read() on the underlying file, since the latter is subject to i/o
throttling while the former is not.
Besides, since bdrv_read() operates in sectors rather than bytes, adjust
the helper functions to do so too.
Signed-off-by: Roman Kagan <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
Message-id: address@hidden
CC: Kevin Wolf <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/parallels.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/block/parallels.c b/block/parallels.c
index dca0df6..baefd3e 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -146,9 +146,8 @@ fail:
return ret;
}
-static int64_t seek_to_sector(BlockDriverState *bs, int64_t sector_num)
+static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num)
{
- BDRVParallelsState *s = bs->opaque;
uint32_t index, offset;
index = sector_num / s->tracks;
@@ -157,24 +156,27 @@ static int64_t seek_to_sector(BlockDriverState *bs,
int64_t sector_num)
/* not allocated */
if ((index >= s->catalog_size) || (s->catalog_bitmap[index] == 0))
return -1;
- return
- ((uint64_t)s->catalog_bitmap[index] * s->off_multiplier + offset) *
512;
+ return (uint64_t)s->catalog_bitmap[index] * s->off_multiplier + offset;
}
static int parallels_read(BlockDriverState *bs, int64_t sector_num,
uint8_t *buf, int nb_sectors)
{
+ BDRVParallelsState *s = bs->opaque;
+
while (nb_sectors > 0) {
- int64_t position = seek_to_sector(bs, sector_num);
+ int64_t position = seek_to_sector(s, sector_num);
if (position >= 0) {
- if (bdrv_pread(bs->file, position, buf, 512) != 512)
- return -1;
+ int ret = bdrv_read(bs->file, position, buf, 1);
+ if (ret < 0) {
+ return ret;
+ }
} else {
- memset(buf, 0, 512);
+ memset(buf, 0, BDRV_SECTOR_SIZE);
}
nb_sectors--;
sector_num++;
- buf += 512;
+ buf += BDRV_SECTOR_SIZE;
}
return 0;
}
--
2.1.0
- [Qemu-devel] [PULL 00/38] Block patches, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 02/38] block/parallels: rename parallels_header to ParallelsHeader, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 03/38] block/parallels: switch to bdrv_read,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 01/38] iotests, parallels: quote TEST_IMG in 076 test to be path-safe, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 05/38] block/parallels: add get_block_status, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 07/38] block/parallels: replace magic constants 4, 64 with proper sizeofs, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 08/38] block/parallels: mark parallels format driver as zero inited, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 06/38] block/parallels: provide _co_readv routine for parallels format driver, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 04/38] block/parallels: read up to cluster end in one go, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 09/38] block/parallels: _co_writev callback for Parallels format, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 11/38] block/parallels: support parallels image creation, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 10/38] iotests, parallels: test for write into Parallels image, Stefan Hajnoczi, 2015/05/22
- [Qemu-devel] [PULL 12/38] iotests, parallels: test for newly created parallels image via qemu-img, Stefan Hajnoczi, 2015/05/22