* [Qemu-devel] [PATCH 08/12] VMDK: vmdk_close for extents
@ 2011-06-04 0:42 Fam Zheng
2011-06-18 16:48 ` Stefan Hajnoczi
0 siblings, 1 reply; 2+ messages in thread
From: Fam Zheng @ 2011-06-04 0:42 UTC (permalink / raw)
To: qemu-devel; +Cc: Kevin Wolf, Stefan Hajnoczi, Christoph Hellwig
Signed-off-by: Fam Zheng <famcool@gmail.com>
---
block/vmdk.c | 9 +++++++--
1 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:
static void vmdk_close(BlockDriverState *bs)
{
+ int i;
BDRVVmdkState *s = bs->opaque;
- qemu_free(s->extents[0].l1_table);
- qemu_free(s->extents[0].l2_cache);
+ for (i = 0; i < s->num_extents; i++) {
+ qemu_free(s->extents[i].l1_table);
+ qemu_free(s->extents[i].l2_cache);
+ qemu_free(s->extents[i].l1_backup_table);
+ }
+ qemu_free(s->extents);
}
static int vmdk_flush(BlockDriverState *bs)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH 08/12] VMDK: vmdk_close for extents
2011-06-04 0:42 [Qemu-devel] [PATCH 08/12] VMDK: vmdk_close for extents Fam Zheng
@ 2011-06-18 16:48 ` Stefan Hajnoczi
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Hajnoczi @ 2011-06-18 16:48 UTC (permalink / raw)
To: Fam Zheng; +Cc: Kevin Wolf, qemu-devel, Christoph Hellwig
On Sat, Jun 4, 2011 at 1:42 AM, Fam Zheng <famcool@gmail.com> wrote:
> Signed-off-by: Fam Zheng <famcool@gmail.com>
> ---
> block/vmdk.c | 9 +++++++--
> 1 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:
>
> static void vmdk_close(BlockDriverState *bs)
> {
> + int i;
> BDRVVmdkState *s = bs->opaque;
>
> - qemu_free(s->extents[0].l1_table);
> - qemu_free(s->extents[0].l2_cache);
> + for (i = 0; i < s->num_extents; i++) {
> + qemu_free(s->extents[i].l1_table);
> + qemu_free(s->extents[i].l2_cache);
> + qemu_free(s->extents[i].l1_backup_table);
> + }
> + qemu_free(s->extents);
> }
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-18 16:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-04 0:42 [Qemu-devel] [PATCH 08/12] VMDK: vmdk_close for extents Fam Zheng
2011-06-18 16:48 ` Stefan Hajnoczi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).