From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:45935)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1QXyh1-0004Gu-J0
	for qemu-devel@nongnu.org; Sat, 18 Jun 2011 12:48:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1QXyh0-0007pe-Bo
	for qemu-devel@nongnu.org; Sat, 18 Jun 2011 12:48:19 -0400
Received: from mail-yw0-f45.google.com ([209.85.213.45]:50599)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1QXyh0-0007pS-1M
	for qemu-devel@nongnu.org; Sat, 18 Jun 2011 12:48:18 -0400
Received: by ywb3 with SMTP id 3so1277266ywb.4
	for <qemu-devel@nongnu.org>; Sat, 18 Jun 2011 09:48:17 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <BANLkTi=hHBP8UPyPDN=oCf8bE9Pp2gyrZA@mail.gmail.com>
References: <BANLkTi=hHBP8UPyPDN=oCf8bE9Pp2gyrZA@mail.gmail.com>
Date: Sat, 18 Jun 2011 17:48:17 +0100
Message-ID: <BANLkTik7F3CCpnnfZ1tJrqS24GhB1-0bYA@mail.gmail.com>
From: Stefan Hajnoczi <stefanha@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 08/12] VMDK: vmdk_close for extents
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Fam Zheng <famcool@gmail.com>
Cc: Kevin Wolf <kwolf@redhat.com>, qemu-devel@nongnu.org, Christoph Hellwig <hch@lst.de>

On Sat, Jun 4, 2011 at 1:42 AM, Fam Zheng <famcool@gmail.com> wrote:
> Signed-off-by: Fam Zheng <famcool@gmail.com>
> ---
> =A0block/vmdk.c | =A0 =A09 +++++++--
> =A01 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/block/vmdk.c b/block/vmdk.c
> index 1d74b62..bbab68a 100644
> --- a/block/vmdk.c
> +++ b/block/vmdk.c
> @@ -1086,10 +1086,15 @@ exit:
>
> =A0static void vmdk_close(BlockDriverState *bs)
> =A0{
> + =A0 =A0int i;
> =A0 =A0 BDRVVmdkState *s =3D bs->opaque;
>
> - =A0 =A0qemu_free(s->extents[0].l1_table);
> - =A0 =A0qemu_free(s->extents[0].l2_cache);
> + =A0 =A0for (i =3D 0; i < s->num_extents; i++) {
> + =A0 =A0 =A0 =A0qemu_free(s->extents[i].l1_table);
> + =A0 =A0 =A0 =A0qemu_free(s->extents[i].l2_cache);
> + =A0 =A0 =A0 =A0qemu_free(s->extents[i].l1_backup_table);
> + =A0 =A0}
> + =A0 =A0qemu_free(s->extents);
> =A0}

Should this patch be moved/merged earlier in the series to prevent
leaks?  (Each commit in the series should build and execute correctly.
 There should be no intermediate leaks, crashes, or other problems.)

Stefan