From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhPDo-0005ot-RT for qemu-devel@nongnu.org; Thu, 23 Oct 2014 16:43:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XhPDj-0002Kg-4T for qemu-devel@nongnu.org; Thu, 23 Oct 2014 16:43:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XhPDi-0002KJ-TG for qemu-devel@nongnu.org; Thu, 23 Oct 2014 16:42:55 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9NKgsEQ027315 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 23 Oct 2014 16:42:54 -0400 From: Kevin Wolf Date: Thu, 23 Oct 2014 22:42:15 +0200 Message-Id: <1414096959-14682-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1414096959-14682-1-git-send-email-kwolf@redhat.com> References: <1414096959-14682-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 08/32] qcow2: Fix leaks in dirty images List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com From: Max Reitz When opening dirty images, qcow2's repair function should not only repair errors but leaks as well. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Beno=C3=AEt Canet Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/qcow2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/qcow2.c b/block/qcow2.c index 3c8b881..7a2c66f 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -910,7 +910,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *op= tions, int flags, (s->incompatible_features & QCOW2_INCOMPAT_DIRTY)) { BdrvCheckResult result =3D {0}; =20 - ret =3D qcow2_check(bs, &result, BDRV_FIX_ERRORS); + ret =3D qcow2_check(bs, &result, BDRV_FIX_ERRORS | BDRV_FIX_LEAK= S); if (ret < 0) { error_setg_errno(errp, -ret, "Could not repair dirty image")= ; goto fail; --=20 1.8.3.1