From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKRbQ-0004wP-TA for qemu-devel@nongnu.org; Thu, 21 Aug 2014 08:36:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKRbK-0003Ch-OA for qemu-devel@nongnu.org; Thu, 21 Aug 2014 08:36:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43149) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKRbK-0003Cd-Fu for qemu-devel@nongnu.org; Thu, 21 Aug 2014 08:36:22 -0400 From: Markus Armbruster Date: Thu, 21 Aug 2014 14:36:19 +0200 Message-Id: <1408624579-22382-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2] vmdk: Use bdrv_nb_sectors() where sectors, not bytes are wanted List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com.com, stefanha@redhat.com Instead of bdrv_getlength(). Commit 57322b7 did this all over block, but one more bdrv_getlength() has crept in since. Signed-off-by: Markus Armbruster --- v2: Actually use bdrv_nb_sectors() as advertized [Fam] Passes ./check -T -vmdk -g quick block/vmdk.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 01412a8..6ca8684 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -397,7 +397,7 @@ static int vmdk_add_extent(BlockDriverState *bs, { VmdkExtent *extent; BDRVVmdkState *s = bs->opaque; - int64_t length; + int64_t nb_sectors; if (cluster_sectors > 0x200000) { /* 0x200000 * 512Bytes = 1GB for one cluster is unrealistic */ @@ -413,9 +413,9 @@ static int vmdk_add_extent(BlockDriverState *bs, return -EFBIG; } - length = bdrv_getlength(file); - if (length < 0) { - return length; + nb_sectors = bdrv_nb_sectors(file); + if (nb_sectors < 0) { + return nb_sectors; } s->extents = g_realloc(s->extents, @@ -433,8 +433,7 @@ static int vmdk_add_extent(BlockDriverState *bs, extent->l1_entry_sectors = l2_size * cluster_sectors; extent->l2_size = l2_size; extent->cluster_sectors = flat ? sectors : cluster_sectors; - extent->next_cluster_sector = - ROUND_UP(DIV_ROUND_UP(length, BDRV_SECTOR_SIZE), cluster_sectors); + extent->next_cluster_sector = ROUND_UP(nb_sectors, cluster_sectors); if (s->num_extents > 1) { extent->end_sector = (*(extent - 1)).end_sector + extent->sectors; -- 1.9.3