From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKcxD-0007z4-OJ for qemu-devel@nongnu.org; Thu, 21 Aug 2014 20:43:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKcx7-00049R-JB for qemu-devel@nongnu.org; Thu, 21 Aug 2014 20:43:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10910) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKcx7-00049H-AP for qemu-devel@nongnu.org; Thu, 21 Aug 2014 20:43:37 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7M0hauj008668 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 21 Aug 2014 20:43:36 -0400 Date: Fri, 22 Aug 2014 08:43:49 +0800 From: Fam Zheng Message-ID: <20140822004349.GA3410@T430.redhat.com> References: <1408624579-22382-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1408624579-22382-1-git-send-email-armbru@redhat.com> Subject: Re: [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: Markus Armbruster Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com On Thu, 08/21 14:36, Markus Armbruster wrote: > 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 > > Reviewed-by: Fam Zheng