diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-10-22 17:00:16 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-10-23 15:34:02 +0200 |
| commit | 4b25bbc4c22cf39350b75bd250d568a4d975f7c5 (patch) | |
| tree | 7bca2ee214178e729fc236713fdb3dfbead12ec1 /qemu-io-cmds.c | |
| parent | 59c9a95fd29cfb3296ee58e8a446df251d14a459 (diff) | |
| download | focaccia-qemu-4b25bbc4c22cf39350b75bd250d568a4d975f7c5.tar.gz focaccia-qemu-4b25bbc4c22cf39350b75bd250d568a4d975f7c5.zip | |
qemu-io: Respect early image end for map
bdrv_is_allocated() may report zero clusters which most probably means the image (file) is shorter than expected. Respect this case in order to avoid an infinite loop. Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Benoît Canet <benoit.canet@nodalink.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qemu-io-cmds.c')
| -rw-r--r-- | qemu-io-cmds.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index b224ede5fa..d94fb1e2ea 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -1900,7 +1900,7 @@ static int map_is_allocated(BlockDriverState *bs, int64_t sector_num, num_checked = MIN(nb_sectors, INT_MAX); ret = bdrv_is_allocated(bs, sector_num, num_checked, &num); - if (ret == firstret) { + if (ret == firstret && num) { *pnum += num; } else { break; @@ -1927,6 +1927,9 @@ static int map_f(BlockDriverState *bs, int argc, char **argv) if (ret < 0) { error_report("Failed to get allocation status: %s", strerror(-ret)); return 0; + } else if (!num) { + error_report("Unexpected end of image"); + return 0; } retstr = ret ? " allocated" : "not allocated"; |