aboutsummaryrefslogtreecommitdiff
path: root/block/qcow2-cluster.c
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2020-02-25 15:31:28 +0100
committerKevin Wolf <kwolf@redhat.com>2020-03-06 17:15:37 +0100
commit3ede935fdbbd5f7b24b4724bbfb8938acb5956d8 (patch)
tree531fa0a3f95fdc9453fb3f8bebfedf1fde0b9f41 /block/qcow2-cluster.c
parentf4c4357fbfca0fb14e477bf661ae7384b4b9b283 (diff)
downloadqemu-3ede935fdbbd5f7b24b4724bbfb8938acb5956d8.zip
qemu-3ede935fdbbd5f7b24b4724bbfb8938acb5956d8.tar.gz
qemu-3ede935fdbbd5f7b24b4724bbfb8938acb5956d8.tar.bz2
qcow2: Fix alloc_cluster_abort() for pre-existing clusters
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: qemu-stable@nongnu.org Signed-off-by: Max Reitz <mreitz@redhat.com> Message-Id: <20200225143130.111267-2-mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/qcow2-cluster.c')
-rw-r--r--block/qcow2-cluster.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 78c95df..17f1363 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1026,7 +1026,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);