From: Markus Armbruster <armbru@redhat.com>
Date: Thu, 26 Jun 2014 11:23:21 +0000 (+0200)
Subject: block: Use bdrv_nb_sectors() in img_convert()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=43716fa8058a9095b9c1f9be4397dbaf7c521ee0;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

block: Use bdrv_nb_sectors() in img_convert()

Instead of bdrv_getlength().  Replace variable output_length by
output_sectors.

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>
---

diff --git a/qemu-img.c b/qemu-img.c
index d4518e724..9832a7ee1 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1469,13 +1469,13 @@ static int img_convert(int argc, char **argv)
     buf = qemu_blockalign(out_bs, bufsectors * BDRV_SECTOR_SIZE);
 
     if (skip_create) {
-        int64_t output_length = bdrv_getlength(out_bs);
-        if (output_length < 0) {
+        int64_t output_sectors = bdrv_nb_sectors(out_bs);
+        if (output_sectors < 0) {
             error_report("unable to get output image length: %s\n",
-                         strerror(-output_length));
+                         strerror(-output_sectors));
             ret = -1;
             goto out;
-        } else if (output_length < total_sectors << BDRV_SECTOR_BITS) {
+        } else if (output_sectors < total_sectors) {
             error_report("output file is smaller than input file");
             ret = -1;
             goto out;