From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKqCs-0001oR-H5 for qemu-devel@nongnu.org; Fri, 22 Aug 2014 10:52:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKqCn-00061L-Ci for qemu-devel@nongnu.org; Fri, 22 Aug 2014 10:52:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62209) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKqCn-000615-3Q for qemu-devel@nongnu.org; Fri, 22 Aug 2014 10:52:41 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7MEqePu027676 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 22 Aug 2014 10:52:40 -0400 From: Kevin Wolf Date: Fri, 22 Aug 2014 16:51:51 +0200 Message-Id: <1408719113-5316-28-git-send-email-kwolf@redhat.com> In-Reply-To: <1408719113-5316-1-git-send-email-kwolf@redhat.com> References: <1408719113-5316-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 27/29] 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 From: Markus Armbruster 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 Reviewed-by: Fam Zheng Reviewed-by: Beno=C3=AEt Canet Signed-off-by: Kevin Wolf --- block/vmdk.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index f000d2a..07cb62c 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -397,7 +397,7 @@ static int vmdk_add_extent(BlockDriverState *bs, { VmdkExtent *extent; BDRVVmdkState *s =3D bs->opaque; - int64_t length; + int64_t nb_sectors; =20 if (cluster_sectors > 0x200000) { /* 0x200000 * 512Bytes =3D 1GB for one cluster is unrealistic */ @@ -413,9 +413,9 @@ static int vmdk_add_extent(BlockDriverState *bs, return -EFBIG; } =20 - length =3D bdrv_getlength(file); - if (length < 0) { - return length; + nb_sectors =3D bdrv_nb_sectors(file); + if (nb_sectors < 0) { + return nb_sectors; } =20 s->extents =3D g_renew(VmdkExtent, s->extents, s->num_extents + 1); @@ -432,8 +432,7 @@ static int vmdk_add_extent(BlockDriverState *bs, extent->l1_entry_sectors =3D l2_size * cluster_sectors; extent->l2_size =3D l2_size; extent->cluster_sectors =3D flat ? sectors : cluster_sectors; - extent->next_cluster_sector =3D - ROUND_UP(DIV_ROUND_UP(length, BDRV_SECTOR_SIZE), cluster_sectors= ); + extent->next_cluster_sector =3D ROUND_UP(nb_sectors, cluster_sectors= ); =20 if (s->num_extents > 1) { extent->end_sector =3D (*(extent - 1)).end_sector + extent->sect= ors; --=20 1.8.3.1