From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn0Ea-000538-KH for qemu-devel@nongnu.org; Tue, 28 Apr 2015 03:47:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yn0EU-0004A1-Tk for qemu-devel@nongnu.org; Tue, 28 Apr 2015 03:47:12 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:1740 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn0EU-00049J-HI for qemu-devel@nongnu.org; Tue, 28 Apr 2015 03:47:06 -0400 From: "Denis V. Lunev" Date: Tue, 28 Apr 2015 10:46:37 +0300 Message-Id: <1430207220-24458-5-git-send-email-den@openvz.org> In-Reply-To: <1430207220-24458-1-git-send-email-den@openvz.org> References: <1430207220-24458-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 04/27] block/parallels: read up to cluster end in one go List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "Denis V. Lunev" , qemu-devel@nongnu.org, Roman Kagan From: Roman Kagan Teach parallels_read() to do reads in coarser granularity than just a single sector: if requested, read up to the cluster end in one go. Signed-off-by: Roman Kagan Reviewed-by: Denis V. Lunev Signed-off-by: Denis V. Lunev Reviewed-by: Stefan Hajnoczi CC: Kevin Wolf --- block/parallels.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index baefd3e..8770c82 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -159,6 +159,13 @@ static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num) return (uint64_t)s->catalog_bitmap[index] * s->off_multiplier + offset; } +static int cluster_remainder(BDRVParallelsState *s, int64_t sector_num, + int nb_sectors) +{ + int ret = s->tracks - sector_num % s->tracks; + return MIN(nb_sectors, ret); +} + static int parallels_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors) { @@ -166,17 +173,18 @@ static int parallels_read(BlockDriverState *bs, int64_t sector_num, while (nb_sectors > 0) { int64_t position = seek_to_sector(s, sector_num); + int n = cluster_remainder(s, sector_num, nb_sectors); if (position >= 0) { - int ret = bdrv_read(bs->file, position, buf, 1); + int ret = bdrv_read(bs->file, position, buf, n); if (ret < 0) { return ret; } } else { - memset(buf, 0, BDRV_SECTOR_SIZE); + memset(buf, 0, n << BDRV_SECTOR_BITS); } - nb_sectors--; - sector_num++; - buf += BDRV_SECTOR_SIZE; + nb_sectors -= n; + sector_num += n; + buf += n << BDRV_SECTOR_BITS; } return 0; } -- 1.9.1