[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] qmu-img: fix qemu-img convert to generate a valid i
From: |
Akkarit Sangpetch |
Subject: |
[Qemu-devel] [PATCH] qmu-img: fix qemu-img convert to generate a valid image when the source referenced a backing file |
Date: |
Tue, 07 Jul 2009 12:57:05 -0400 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1b3pre) Gecko/20090513 Fedora/3.0-2.3.beta2.fc11 Thunderbird/3.0b2 |
Make 'qemu-img convert' copies unallocated parts of the source image
when -B option was not specified.
Signed-off-by: Akkarit Sangpetch <address@hidden>
---
qemu-img.c | 20 +++++++++++++-------
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;
}
--
1.6.2.5
- [Qemu-devel] [PATCH] qmu-img: fix qemu-img convert to generate a valid image when the source referenced a backing file,
Akkarit Sangpetch <=