Commit 43716fa8 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

block: Use bdrv_nb_sectors() in img_convert() 



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

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarBenoit Canet <benoit@irqsave.net>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 30a7f2fc

qemu-img.c

+4 −4
Original line number Diff line number Diff line
@@ -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;