[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/19] qemu-img: always probe the input image for
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 08/19] qemu-img: always probe the input image for allocated sectors |
Date: |
Thu, 25 Jul 2013 16:23:06 +0200 |
qemu-img convert is assuming "that sectors which are unallocated in the input
image are present in both the output's and input's base images", but it is
only doing this if the output image is zero initialized. And checking if
the output image is zero initialized does not make much sense if the
output image is copy-on-write. Always do the test.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-img.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index a4957eb..3faffee 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1476,21 +1476,19 @@ static int img_convert(int argc, char **argv)
n = bs_offset + bs_sectors - sector_num;
}
- if (has_zero_init) {
- /* 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;
+ /* 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;
} else {
n1 = n;
}
--
1.8.3.1
[Qemu-devel] [PATCH v3 09/19] block: make bdrv_has_zero_init return false for copy-on-write-images, Paolo Bonzini, 2013/07/25
[Qemu-devel] [PATCH v3 08/19] qemu-img: always probe the input image for allocated sectors,
Paolo Bonzini <=
[Qemu-devel] [PATCH v3 10/19] block: introduce bdrv_get_block_status API, Paolo Bonzini, 2013/07/25
[Qemu-devel] [PATCH v3 12/19] block: return get_block_status data and flags for formats, Paolo Bonzini, 2013/07/25
[Qemu-devel] [PATCH v3 11/19] block: define get_block_status return value, Paolo Bonzini, 2013/07/25
[Qemu-devel] [PATCH v3 13/19] qemu-img: add a "map" subcommand, Paolo Bonzini, 2013/07/25