From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y5t5q-00036X-R8 for qemu-devel@nongnu.org; Tue, 30 Dec 2014 04:27:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y5t5p-0006cd-PR for qemu-devel@nongnu.org; Tue, 30 Dec 2014 04:27:58 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:11936 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y5t5p-0006cM-Cq for qemu-devel@nongnu.org; Tue, 30 Dec 2014 04:27:57 -0500 From: "Denis V. Lunev" Date: Tue, 30 Dec 2014 12:28:15 +0300 Message-Id: <1419931701-19362-4-git-send-email-den@openvz.org> In-Reply-To: <1419931701-19362-1-git-send-email-den@openvz.org> References: <1419931701-19362-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 03/19] block/parallels: switch to bdrv_read List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Denis V. Lunev" , qemu-devel@nongnu.org, Stefan Hajnoczi , Roman Kagan From: Roman Kagan 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 Signed-off-by: Denis V. Lunev CC: Kevin Wolf CC: Stefan Hajnoczi --- 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; } -- 1.9.1