[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/18] qemu-img rebase: Fix output image corruption
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 17/18] qemu-img rebase: Fix output image corruption |
Date: |
Fri, 30 Apr 2010 16:00:39 +0200 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 05/18] block: bdrv_has_zero_init, (continued)
- [Qemu-devel] [PATCH 05/18] block: bdrv_has_zero_init, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 06/18] vmdk: Fix COW, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 08/18] vmdk: Convert to bdrv_open, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 07/18] vmdk: Clean up backing file handling, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 04/18] block: Open the underlying image file in generic code, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 09/18] block: Set backing_hd to NULL after deleting it, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 10/18] qcow2: Avoid shadowing variable in alloc_clusters_noref(), Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 11/18] raw-posix: Use pread/pwrite instead of lseek+read/write, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 12/18] block: Cache total_sectors to reduce bdrv_getlength calls, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 14/18] qcow2: Remove abort on free_clusters failure, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 17/18] qemu-img rebase: Fix output image corruption,
Kevin Wolf <=
- [Qemu-devel] [PATCH 15/18] qcow2: Implement bdrv_truncate() for growing images, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 18/18] block: Release allocated options after bdrv_open, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 13/18] qemu-img: Add 'resize' command to grow/shrink disk images, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 16/18] block: Add wr_highest_sector blockstat, Kevin Wolf, 2010/04/30