commit 57322b7811a9136507742bb7ebc2215dd8c2e911
author Markus Armbruster <armbru@redhat.com> Thu Jun 26 13:23:22 2014 +0200
committer Kevin Wolf <kwolf@redhat.com> Fri Aug 15 15:07:13 2014 +0200
tree f21998bdcfbab129909170f2ba3df7f740cd3798
parent 43716fa8058a9095b9c1f9be4397dbaf7c521ee0

block: Use bdrv_nb_sectors() where sectors, not bytes are wanted

Instead of bdrv_getlength().

Aside: a few of these callers don't handle errors.  I didn't
investigate whether they should.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

block.c

diff --git a/block.c b/block.c
index c8ef425..2fcc2f7 100644
--- a/block.c
+++ b/block.c
@@ -5283,13 +5283,12 @@
 
     granularity >>= BDRV_SECTOR_BITS;
     assert(granularity);
-    bitmap_size = bdrv_getlength(bs);
+    bitmap_size = bdrv_nb_sectors(bs);
     if (bitmap_size < 0) {
         error_setg_errno(errp, -bitmap_size, "could not get length of device");
         errno = -bitmap_size;
         return NULL;
     }
-    bitmap_size >>= BDRV_SECTOR_BITS;
     bitmap = g_malloc0(sizeof(BdrvDirtyBitmap));
     bitmap->bitmap = hbitmap_alloc(bitmap_size, ffs(granularity) - 1);
     QLIST_INSERT_HEAD(&bs->dirty_bitmaps, bitmap, list);