diff options
| author | Markus Armbruster <armbru@redhat.com> | 2014-08-21 14:36:19 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-08-22 11:10:12 +0200 |
| commit | 0a156f7c750c4e4e1c5dfb2135debcf399e4e2a7 (patch) | |
| tree | 13168ec0fb23c168b0c00e63e7de5426311e4982 | |
| parent | cbf95a0b117461473f05ab3cce4d01ba2b29e60a (diff) | |
| download | focaccia-qemu-0a156f7c750c4e4e1c5dfb2135debcf399e4e2a7.tar.gz focaccia-qemu-0a156f7c750c4e4e1c5dfb2135debcf399e4e2a7.zip | |
vmdk: Use bdrv_nb_sectors() where sectors, not bytes are wanted
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 <armbru@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Reviewed-by: Benoît Canet <benoit.canet@nodalink.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/vmdk.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index f000d2a613..07cb62ceb7 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_renew(VmdkExtent, s->extents, s->num_extents + 1); @@ -432,8 +432,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; |