From: Max Reitz <[email protected]> handle_alloc() reuses preallocated zero clusters. If anything goes wrong during the data write, we do not change their L2 entry, so we must not let qcow2_alloc_cluster_abort() free them.
Fixes: 8b24cd141549b5b264baeddd4e72902cfb5de23b Cc: [email protected] Signed-off-by: Max Reitz <[email protected]> Message-Id: <[email protected]> Signed-off-by: Kevin Wolf <[email protected]> (cherry picked from commit 3ede935fdbbd5f7b24b4724bbfb8938acb5956d8) Signed-off-by: Michael Roth <[email protected]> --- block/qcow2-cluster.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index dc3c270226..f1a6d42df0 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1015,7 +1015,7 @@ err: void qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m) { BDRVQcow2State *s = bs->opaque; - if (!has_data_file(bs)) { + if (!has_data_file(bs) && !m->keep_old_clusters) { qcow2_free_clusters(bs, m->alloc_offset, m->nb_clusters << s->cluster_bits, QCOW2_DISCARD_NEVER); -- 2.17.1
