[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/18] block: bdrv_has_zero_init
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 05/18] block: bdrv_has_zero_init |
Date: |
Fri, 30 Apr 2010 16:00:27 +0200 |
This fixes the problem that qemu-img's use of no_zero_init only considered the
no_zero_init flag of the format driver, but not of the underlying protocols.
Between the raw/file split and this fix, converting to host devices is broken.
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 13 +++++++++++++
block.h | 1 +
qemu-img.c | 6 ++++--
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index eb1d562..56835af 100644
--- a/block.c
+++ b/block.c
@@ -1282,6 +1282,19 @@ void bdrv_flush_all(void)
}
}
+int bdrv_has_zero_init(BlockDriverState *bs)
+{
+ assert(bs->drv);
+
+ if (bs->drv->no_zero_init) {
+ return 0;
+ } else if (bs->file) {
+ return bdrv_has_zero_init(bs->file);
+ }
+
+ return 1;
+}
+
/*
* Returns true iff the specified sector is present in the disk image. Drivers
* not implementing the functionality are assumed to not support backing files,
diff --git a/block.h b/block.h
index f58edf1..f87d24e 100644
--- a/block.h
+++ b/block.h
@@ -122,6 +122,7 @@ BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *bs,
void bdrv_flush(BlockDriverState *bs);
void bdrv_flush_all(void);
+int bdrv_has_zero_init(BlockDriverState *bs);
int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors,
int *pnum);
diff --git a/qemu-img.c b/qemu-img.c
index 7203b8b..74311a5 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -732,6 +732,8 @@ static int img_convert(int argc, char **argv)
/* signal EOF to align */
bdrv_write_compressed(out_bs, 0, NULL, 0);
} else {
+ int has_zero_init = bdrv_has_zero_init(out_bs);
+
sector_num = 0; // total number of sectors converted so far
for(;;) {
nb_sectors = total_sectors - sector_num;
@@ -755,7 +757,7 @@ static int img_convert(int argc, char **argv)
if (n > bs_offset + bs_sectors - sector_num)
n = bs_offset + bs_sectors - sector_num;
- if (!drv->no_zero_init) {
+ 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
@@ -788,7 +790,7 @@ static int img_convert(int argc, char **argv)
If the output is to a host device, we also write out
sectors that are entirely 0, since whatever data was
already there is garbage, not 0s. */
- if (drv->no_zero_init || out_baseimg ||
+ if (!has_zero_init || out_baseimg ||
is_allocated_sectors(buf1, n, &n1)) {
if (bdrv_write(out_bs, sector_num, buf1, n1) < 0)
error("error while writing");
--
1.6.6.1
- [Qemu-devel] [PULL 00/18] Block patches, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 01/18] block: separate raw images from the file protocol, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 02/18] block: Split bdrv_open, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 03/18] block: Avoid forward declaration of bdrv_open_common, Kevin Wolf, 2010/04/30
- [Qemu-devel] [PATCH 05/18] block: bdrv_has_zero_init,
Kevin Wolf <=
- [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, 2010/04/30