From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avloo-0000EP-Ix for qemu-devel@nongnu.org; Thu, 28 Apr 2016 09:17:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avlon-0005kg-Gy for qemu-devel@nongnu.org; Thu, 28 Apr 2016 09:17:22 -0400 From: Kevin Wolf Date: Thu, 28 Apr 2016 15:16:40 +0200 Message-Id: <1461849406-29743-12-git-send-email-kwolf@redhat.com> In-Reply-To: <1461849406-29743-1-git-send-email-kwolf@redhat.com> References: <1461849406-29743-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH v2 11/17] vmdk: Add vmdk_find_offset_in_cluster() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, stefanha@redhat.com, famz@redhat.com, sw@weilnetz.de, qemu-devel@nongnu.org This is a byte granularity version of vmdk_find_index_in_cluster(). Signed-off-by: Kevin Wolf --- block/vmdk.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 45f9d3c..f1e01f9 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1259,15 +1259,26 @@ static VmdkExtent *find_extent(BDRVVmdkState *s, return NULL; } +static inline uint64_t vmdk_find_offset_in_cluster(VmdkExtent *extent, + int64_t offset) +{ + uint64_t offset_in_cluster, extent_begin_offset, extent_relative_offset; + uint64_t cluster_size = extent->cluster_sectors * BDRV_SECTOR_SIZE; + + extent_begin_offset = + (extent->end_sector - extent->sectors) * BDRV_SECTOR_SIZE; + extent_relative_offset = offset - extent_begin_offset; + offset_in_cluster = extent_relative_offset % cluster_size; + + return offset_in_cluster; +} + static inline uint64_t vmdk_find_index_in_cluster(VmdkExtent *extent, int64_t sector_num) { - uint64_t index_in_cluster, extent_begin_sector, extent_relative_sector_num; - - extent_begin_sector = extent->end_sector - extent->sectors; - extent_relative_sector_num = sector_num - extent_begin_sector; - index_in_cluster = extent_relative_sector_num % extent->cluster_sectors; - return index_in_cluster; + uint64_t offset; + offset = vmdk_find_offset_in_cluster(extent, sector_num * BDRV_SECTOR_SIZE); + return offset / BDRV_SECTOR_SIZE; } static int64_t coroutine_fn vmdk_co_get_block_status(BlockDriverState *bs, -- 1.8.3.1