[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv5 16/17] qemu-img: conditionally zero out target on
From: |
Peter Lieven |
Subject: |
[Qemu-devel] [PATCHv5 16/17] qemu-img: conditionally zero out target on convert |
Date: |
Sun, 20 Oct 2013 17:43:10 +0200 |
If the target has_zero_init = 0, but supports efficiently
writing zeroes by unmapping we call bdrv_make_zero to
avoid fully allocating the target. This 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..fe0bdb1 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_can_write_zeroes_with_unmap(out_bs)) {
+ ret = bdrv_make_zero(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] [PATCHv5 05/17] block: add wrappers for logical block provisioning information, (continued)
- [Qemu-devel] [PATCHv5 05/17] block: add wrappers for logical block provisioning information, Peter Lieven, 2013/10/20
- [Qemu-devel] [PATCHv5 07/17] block: add BlockLimits structure to BlockDriverState, Peter Lieven, 2013/10/20
- [Qemu-devel] [PATCHv5 09/17] block: honour BlockLimits in bdrv_co_discard, Peter Lieven, 2013/10/20
- [Qemu-devel] [PATCHv5 11/17] iscsi: set limits in BlockDriverState, Peter Lieven, 2013/10/20
- [Qemu-devel] [PATCHv5 08/17] block: honour BlockLimits in bdrv_co_do_write_zeroes, Peter Lieven, 2013/10/20
- [Qemu-devel] [PATCHv5 13/17] block: introduce bdrv_make_zero, Peter Lieven, 2013/10/20
- [Qemu-devel] [PATCHv5 12/17] iscsi: add bdrv_co_write_zeroes, Peter Lieven, 2013/10/20
- [Qemu-devel] [PATCHv5 14/17] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks, Peter Lieven, 2013/10/20
- [Qemu-devel] [PATCHv5 10/17] iscsi: simplify iscsi_co_discard, Peter Lieven, 2013/10/20
- [Qemu-devel] [PATCHv5 15/17] qemu-img: add support for fully allocated images, Peter Lieven, 2013/10/20
- [Qemu-devel] [PATCHv5 16/17] qemu-img: conditionally zero out target on convert,
Peter Lieven <=
- [Qemu-devel] [PATCHv5 17/17] block/raw: copy BlockLimits on raw_open, Peter Lieven, 2013/10/20