From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yviqx-00048D-Q7 for qemu-devel@nongnu.org; Fri, 22 May 2015 05:02:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yviqr-0004lL-Ji for qemu-devel@nongnu.org; Fri, 22 May 2015 05:02:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40502) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yviqr-0004kx-7o for qemu-devel@nongnu.org; Fri, 22 May 2015 05:02:45 -0400 From: Stefan Hajnoczi Date: Fri, 22 May 2015 10:01:47 +0100 Message-Id: <1432285330-13994-16-git-send-email-stefanha@redhat.com> In-Reply-To: <1432285330-13994-1-git-send-email-stefanha@redhat.com> References: <1432285330-13994-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 15/38] block/parallels: create bat2sect helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Roman Kagan , Stefan Hajnoczi , "Denis V. Lunev" From: "Denis V. Lunev" deduplicate copy/paste arithmetcs Signed-off-by: Denis V. Lunev Reviewed-by: Roman Kagan Reviewed-by: Stefan Hajnoczi Signed-off-by: Roman Kagan Message-id: 1430207220-24458-16-git-send-email-den@openvz.org CC: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- block/parallels.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index 16fbdf4..1540c21 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -161,6 +161,12 @@ fail: return ret; } + +static int64_t bat2sect(BDRVParallelsState *s, uint32_t idx) +{ + return (uint64_t)s->bat_bitmap[idx] * s->off_multiplier; +} + static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num) { uint32_t index, offset; @@ -172,7 +178,7 @@ static int64_t seek_to_sector(BDRVParallelsState *s, int64_t sector_num) if ((index >= s->bat_size) || (s->bat_bitmap[index] == 0)) { return -1; } - return (uint64_t)s->bat_bitmap[index] * s->off_multiplier + offset; + return bat2sect(s, index) + offset; } static int cluster_remainder(BDRVParallelsState *s, int64_t sector_num, @@ -196,7 +202,7 @@ static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num) return -EINVAL; } if (s->bat_bitmap[idx] != 0) { - return (uint64_t)s->bat_bitmap[idx] * s->off_multiplier + offset; + return bat2sect(s, idx) + offset; } pos = bdrv_getlength(bs->file) >> BDRV_SECTOR_BITS; @@ -219,7 +225,7 @@ static int64_t allocate_cluster(BlockDriverState *bs, int64_t sector_num) s->bat_bitmap[idx] = 0; return ret; } - return (uint64_t)s->bat_bitmap[idx] * s->off_multiplier + offset; + return bat2sect(s, idx) + offset; } static int64_t coroutine_fn parallels_co_get_block_status(BlockDriverState *bs, -- 2.1.0