[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3 19/20] qemu-img: conditionally zero out target on
From: |
Peter Lieven |
Subject: |
[Qemu-devel] [PATCHv3 19/20] qemu-img: conditionally zero out target on convert |
Date: |
Tue, 24 Sep 2013 15:35:13 +0200 |
If the target has_zero_init = 0, but supports efficiently
writing zeroes by unmapping we call bdrv_zeroize to
avoid fully allocating the target. Ihis currently
is designed especially for iscsi.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Peter Lieven <address@hidden>
---
qemu-img.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/qemu-img.c b/qemu-img.c
index c6eff15..2a41942 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1353,7 +1353,7 @@ static int img_convert(int argc, char **argv)
}
}
- flags = BDRV_O_RDWR;
+ flags = min_sparse ? (BDRV_O_RDWR | BDRV_O_UNMAP) : BDRV_O_RDWR;
ret = bdrv_parse_cache_flags(cache, &flags);
if (ret < 0) {
error_report("Invalid cache option: %s", cache);
@@ -1469,6 +1469,14 @@ static int img_convert(int argc, char **argv)
} else {
int has_zero_init = min_sparse ? bdrv_has_zero_init(out_bs) : 0;
+ if (!has_zero_init && bdrv_has_discard_write_zeroes(out_bs)) {
+ ret = bdrv_zeroize(out_bs, BDRV_REQ_MAY_UNMAP);
+ if (ret < 0) {
+ goto out;
+ }
+ has_zero_init = 1;
+ }
+
sector_num = 0; // total number of sectors converted so far
nb_sectors = total_sectors - sector_num;
if (nb_sectors != 0) {
--
1.7.9.5
- [Qemu-devel] [PATCHv3 13/20] block: introduce bdrv_zeroize, (continued)
- [Qemu-devel] [PATCHv3 13/20] block: introduce bdrv_zeroize, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 12/20] iscsi: add bdrv_co_write_zeroes, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 10/20] iscsi: set limits in BlockDriverState, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 14/20] block/get_block_status: set *pnum = 0 on error, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 09/20] iscsi: simplify iscsi_co_discard, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 16/20] block/get_block_status: avoid redundant callouts on raw devices, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 18/20] qemu-img: add support for fully allocated images, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 20/20] block/raw: copy BlockLimits on raw_open, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 15/20] block/get_block_status: avoid segfault if there is no backing_hd, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 17/20] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks, Peter Lieven, 2013/09/24
- [Qemu-devel] [PATCHv3 19/20] qemu-img: conditionally zero out target on convert,
Peter Lieven <=