From: Max Reitz <mreitz@redhat.com>
Date: Wed, 9 Oct 2013 08:44:28 +0000 (+0200)
Subject: qcow2: Free preallocated zero clusters
X-Git-Tag: qemu-xen-4.5.0-rc1~425^2~49
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8f730dd24edd2576ecbd596de7ea4361296b129c;p=qemu-upstream-4.5-testing.git

qcow2: Free preallocated zero clusters

In qcow2_free_any_clusters, preallocated zero clusters should be freed
just as normal clusters are.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 4cb9c2332..4ef689996 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -796,11 +796,13 @@ void qcow2_free_any_clusters(BlockDriverState *bs, uint64_t l2_entry,
         }
         break;
     case QCOW2_CLUSTER_NORMAL:
-        qcow2_free_clusters(bs, l2_entry & L2E_OFFSET_MASK,
-                            nb_clusters << s->cluster_bits, type);
+    case QCOW2_CLUSTER_ZERO:
+        if (l2_entry & L2E_OFFSET_MASK) {
+            qcow2_free_clusters(bs, l2_entry & L2E_OFFSET_MASK,
+                                nb_clusters << s->cluster_bits, type);
+        }
         break;
     case QCOW2_CLUSTER_UNALLOCATED:
-    case QCOW2_CLUSTER_ZERO:
         break;
     default:
         abort();