48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
|
From bd97bbbce54da301407d51cae35e09ba2a12b160 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Max Reitz <mreitz@redhat.com>
|
||
|
|
Date: Mon, 13 Jul 2020 14:24:48 -0400
|
||
|
|
Subject: [PATCH 1/4] qcow2: Fix alloc_cluster_abort() for pre-existing
|
||
|
|
clusters
|
||
|
|
|
||
|
|
RH-Author: Max Reitz <mreitz@redhat.com>
|
||
|
|
Message-id: <20200713142451.289703-2-mreitz@redhat.com>
|
||
|
|
Patchwork-id: 97954
|
||
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH 1/4] qcow2: Fix alloc_cluster_abort() for pre-existing clusters
|
||
|
|
Bugzilla: 1807057
|
||
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
||
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
|
||
|
|
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>
|
||
|
|
(cherry picked from commit 3ede935fdbbd5f7b24b4724bbfb8938acb5956d8)
|
||
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
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 9d04f8d77b..1970797ce5 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.27.0
|
||
|
|
|