34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
Date: Mon, 14 Sep 2020 19:32:21 +0200
|
|
Subject: [PATCH] Revert "qemu-img convert: Don't pre-zero images"
|
|
|
|
This reverts commit edafc70c0c8510862f2f213a3acf7067113bcd08.
|
|
|
|
As it correlates with causing issues on LVM allocation
|
|
https://bugzilla.proxmox.com/show_bug.cgi?id=3002
|
|
---
|
|
qemu-img.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/qemu-img.c b/qemu-img.c
|
|
index 9635e9c001..c7884d248a 100644
|
|
--- a/qemu-img.c
|
|
+++ b/qemu-img.c
|
|
@@ -2079,6 +2079,15 @@ static int convert_do_copy(ImgConvertState *s)
|
|
s->has_zero_init = bdrv_has_zero_init(blk_bs(s->target));
|
|
}
|
|
|
|
+ if (!s->has_zero_init && !s->target_has_backing &&
|
|
+ bdrv_can_write_zeroes_with_unmap(blk_bs(s->target)))
|
|
+ {
|
|
+ ret = blk_make_zero(s->target, BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK);
|
|
+ if (ret == 0) {
|
|
+ s->has_zero_init = true;
|
|
+ }
|
|
+ }
|
|
+
|
|
/* Allocate buffer for copied data. For compressed images, only one cluster
|
|
* can be copied at a time. */
|
|
if (s->compressed) {
|