From: Paolo Bonzini Date: Tue, 8 May 2012 14:51:52 +0000 (+0200) Subject: qemu-io: fix the alloc command X-Git-Tag: qemu-xen-4.3.0-rc1~1102^2~8 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cc785c349de002596a4f4d116e62846fc18d7b9e;p=qemu-upstream-4.3-testing.git qemu-io: fix the alloc command Because sector_num is not updated, the loop would either go on forever or return garbage. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- diff --git a/qemu-io.c b/qemu-io.c index b48364f1b..588206744 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -1560,7 +1560,7 @@ out: static int alloc_f(int argc, char **argv) { - int64_t offset; + int64_t offset, sector_num; int nb_sectors, remaining; char s1[64]; int num, sum_alloc; @@ -1581,12 +1581,18 @@ static int alloc_f(int argc, char **argv) remaining = nb_sectors; sum_alloc = 0; + sector_num = offset >> 9; while (remaining) { - ret = bdrv_is_allocated(bs, offset >> 9, nb_sectors, &num); + ret = bdrv_is_allocated(bs, sector_num, remaining, &num); + sector_num += num; remaining -= num; if (ret) { sum_alloc += num; } + if (num == 0) { + nb_sectors -= remaining; + remaining = 0; + } } cvtstr(offset, s1, sizeof(s1));