david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: Use bdrv_nb_sectors() in img_convert()

Browse Source 
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>
This commit is contained in:
Markus Armbruster 2014-06-26 13:23:21 +02:00 committed by Kevin Wolf
parent 30a7f2fc91
commit 43716fa805
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qemu-img.c
View File

@ -1469,13 +1469,13 @@ static int img_convert(int argc, char **argv)
buf = qemu_blockalign(out_bs, bufsectors * BDRV_SECTOR_SIZE); buf = qemu_blockalign(out_bs, bufsectors * BDRV_SECTOR_SIZE);
if (skip_create) { if (skip_create) {
int64_t output_length = bdrv_getlength(out_bs); int64_t output_sectors = bdrv_nb_sectors(out_bs);
if (output_length < 0) { if (output_sectors < 0) {
error_report("unable to get output image length: %s\n", error_report("unable to get output image length: %s\n",
strerror(-output_length)); strerror(-output_sectors));
ret = -1; ret = -1;
goto out; 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"); error_report("output file is smaller than input file");
ret = -1; ret = -1;
goto out; goto out;