From: Max Reitz <mreitz@redhat.com>
Date: Wed, 22 Oct 2014 12:09:29 +0000 (+0200)
Subject: qcow2: Fix leaks in dirty images
X-Git-Tag: xen-15-06-02~352^2~23
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5b84106bd91bc67519738042c8890a09e2967513;p=people%2Fsstabellini%2Fqemu-dm.git%2F.git

qcow2: Fix leaks in dirty images

When opening dirty images, qcow2's repair function should not only
repair errors but leaks as well.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/qcow2.c b/block/qcow2.c
index 3c8b88198b..7a2c66f92b 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -910,7 +910,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags,
         (s->incompatible_features & QCOW2_INCOMPAT_DIRTY)) {
         BdrvCheckResult result = {0};
 
-        ret = qcow2_check(bs, &result, BDRV_FIX_ERRORS);
+        ret = qcow2_check(bs, &result, BDRV_FIX_ERRORS | BDRV_FIX_LEAKS);
         if (ret < 0) {
             error_setg_errno(errp, -ret, "Could not repair dirty image");
             goto fail;