aboutsummaryrefslogtreecommitdiff
path: root/qemu-img.c
diff options
context:
space:
mode:
authorAkkarit Sangpetch <asangpet@andrew.cmu.edu>2009-07-17 10:02:15 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-22 10:58:47 -0500
commitd032044fb97d525ae93fb4c96713a5c467044c17 (patch)
treeab9dfce18a49b6ac52b98caa02a8a99091f03503 /qemu-img.c
parentb171271a50be01f2690077970fa7e60b8e8eb9d9 (diff)
downloadqemu-d032044fb97d525ae93fb4c96713a5c467044c17.zip
qemu-d032044fb97d525ae93fb4c96713a5c467044c17.tar.gz
qemu-d032044fb97d525ae93fb4c96713a5c467044c17.tar.bz2
qmu-img: fix qemu-img convert to generate a valid image when the source referenced a backing file
Make 'qemu-img convert' copies unallocated parts of the source image when -B option was not specified. Signed-off-by: Akkarit Sangpetch <asangpet@andrew.cmu.edu> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-img.c')
-rw-r--r--qemu-img.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/qemu-img.c b/qemu-img.c
index d806cfa..070fe2e 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -747,14 +747,20 @@ static int img_convert(int argc, char **argv)
n = bs_offset + bs_sectors - sector_num;
if (strcmp(drv->format_name, "host_device")) {
- if (!bdrv_is_allocated(bs[bs_i], sector_num - bs_offset,
- n, &n1)) {
- sector_num += n1;
- continue;
+ /* If the output image is being created as a copy on write image,
+ assume that sectors which are unallocated in the input image
+ are present in both the output's and input's base images (no
+ need to copy them). */
+ if (out_baseimg) {
+ if (!bdrv_is_allocated(bs[bs_i], sector_num - bs_offset,
+ n, &n1)) {
+ sector_num += n1;
+ continue;
+ }
+ /* The next 'n1' sectors are allocated in the input image. Copy
+ only those as they may be followed by unallocated sectors. */
+ n = n1;
}
- /* The next 'n1' sectors are allocated in the input image. Copy
- only those as they may be followed by unallocated sectors. */
- n = n1;
} else {
n1 = n;
}