From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O7qnu-0007rM-Ji for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:02:54 -0400 Received: from [140.186.70.92] (port=55302 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O7qnt-0007qY-Bx for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:02:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O7qnr-0000XZ-Ts for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:02:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5064) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O7qnr-0000XQ-GH for qemu-devel@nongnu.org; Fri, 30 Apr 2010 10:02:51 -0400 From: Kevin Wolf Date: Fri, 30 Apr 2010 16:00:39 +0200 Message-Id: <1272636040-17374-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1272636040-17374-1-git-send-email-kwolf@redhat.com> References: <1272636040-17374-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 17/18] qemu-img rebase: Fix output image corruption List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@linux.vnet.ibm.com Cc: kwolf@redhat.com, qemu-devel@nongnu.org qemu-img rebase must always give clusters in the COW file priority over those in the backing file. As it failed to use number of non-allocated clusters but assumed the maximum, it was possible that allocated clusters were taken from the backing file instead, leading to a corrupted output image. Signed-off-by: Kevin Wolf --- qemu-img.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index c21d999..d3c30a7 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1136,7 +1136,7 @@ static int img_rebase(int argc, char **argv) if (!unsafe) { uint64_t num_sectors; uint64_t sector; - int n, n1; + int n; uint8_t * buf_old; uint8_t * buf_new; @@ -1155,8 +1155,8 @@ static int img_rebase(int argc, char **argv) } /* If the cluster is allocated, we don't need to take action */ - if (bdrv_is_allocated(bs, sector, n, &n1)) { - n = n1; + ret = bdrv_is_allocated(bs, sector, n, &n); + if (ret) { continue; } -- 1.6.6.1