qmu-img: fix qemu-img convert to generate a valid image when the source referenced a backing file
PATCH 1/1 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 <[email protected]>
--- qemu-img.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-)
qemu-img.c +13 -7
@@ -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; }
Signature · 1 line
1.6.2.5
Quoted 1 line · Akkarit Sangpetch
Make 'qemu-img convert' copies unallocated parts of the source image when -B option was not specified.
git-am thinks this patch is corrupt. I suspect your mailer munged something.
Regards,
Anthony Liguori