From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRlmt-0001dS-08 for qemu-devel@nongnu.org; Tue, 08 May 2012 10:53:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SRlmq-0007g7-U2 for qemu-devel@nongnu.org; Tue, 08 May 2012 10:53:14 -0400 Received: from mail-yw0-f45.google.com ([209.85.213.45]:47847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SRlmq-0007fk-Ml for qemu-devel@nongnu.org; Tue, 08 May 2012 10:53:12 -0400 Received: by yhoo21 with SMTP id o21so2671086yho.4 for ; Tue, 08 May 2012 07:53:11 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 8 May 2012 16:51:52 +0200 Message-Id: <1336488722-13120-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1336488722-13120-1-git-send-email-pbonzini@redhat.com> References: <1336488722-13120-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1.1 12/22] qemu-io: fix the alloc command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com Because sector_num is not updated, the loop would either go on forever or return garbage. Signed-off-by: Paolo Bonzini --- qemu-io.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index b48364f..5882067 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)); -- 1.7.10.1