[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] dump.c: Fix memory leak issue in cleanup proces
From: |
Luiz Capitulino |
Subject: |
Re: [Qemu-devel] [PATCH] dump.c: Fix memory leak issue in cleanup processing for dump_init() |
Date: |
Thu, 14 Aug 2014 16:49:45 -0400 |
On Sun, 03 Aug 2014 23:28:56 +0800
Chen Gang <address@hidden> wrote:
> In dump_init(), when failure occurs, need notice about 'fd' and memory
> mapping. So call dump_cleanup() for it (need let all initializations at
> front).
>
> Also simplify dump_cleanup(): remove redundant 'ret' and redundant 'fd'
> checking.
>
> Signed-off-by: Chen Gang <address@hidden>
Applied to the qmp branch, thanks.
PS: I still find it hard to track the file-descriptor's life time. IMO,
the best would be to always release it where it's allocated which is
qmp_dump_guest_memory().
> ---
> dump.c | 18 +++++-------------
> 1 file changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/dump.c b/dump.c
> index ce646bc..71d3e94 100644
> --- a/dump.c
> +++ b/dump.c
> @@ -71,18 +71,14 @@ uint64_t cpu_to_dump64(DumpState *s, uint64_t val)
>
> static int dump_cleanup(DumpState *s)
> {
> - int ret = 0;
> -
> guest_phys_blocks_free(&s->guest_phys_blocks);
> memory_mapping_list_free(&s->list);
> - if (s->fd != -1) {
> - close(s->fd);
> - }
> + close(s->fd);
> if (s->resume) {
> vm_start();
> }
>
> - return ret;
> + return 0;
> }
>
> static void dump_error(DumpState *s, const char *reason)
> @@ -1499,6 +1495,8 @@ static int dump_init(DumpState *s, int fd, bool
> has_format,
> s->begin = begin;
> s->length = length;
>
> + memory_mapping_list_init(&s->list);
> +
> guest_phys_blocks_init(&s->guest_phys_blocks);
> guest_phys_blocks_append(&s->guest_phys_blocks);
>
> @@ -1526,7 +1524,6 @@ static int dump_init(DumpState *s, int fd, bool
> has_format,
> }
>
> /* get memory mapping */
> - memory_mapping_list_init(&s->list);
> if (paging) {
> qemu_get_guest_memory_mapping(&s->list, &s->guest_phys_blocks, &err);
> if (err != NULL) {
> @@ -1622,12 +1619,7 @@ static int dump_init(DumpState *s, int fd, bool
> has_format,
> return 0;
>
> cleanup:
> - guest_phys_blocks_free(&s->guest_phys_blocks);
> -
> - if (s->resume) {
> - vm_start();
> - }
> -
> + dump_cleanup(s);
> return -1;
> }
>
- Re: [Qemu-devel] Cc'ing emails [was: [PATCH] dump.c: Fix memory leak issue in cleanup processing for dump_init()], (continued)
- Re: [Qemu-devel] Cc'ing emails [was: [PATCH] dump.c: Fix memory leak issue in cleanup processing for dump_init()], Chen Gang, 2014/08/04
- Re: [Qemu-devel] Cc'ing emails [, Markus Armbruster, 2014/08/04
- Re: [Qemu-devel] Cc'ing emails [, Chen Gang, 2014/08/05
- Re: [Qemu-devel] Cc'ing emails [, Michael Tokarev, 2014/08/05
- Re: [Qemu-devel] Cc'ing emails [, Peter Maydell, 2014/08/05
- Re: [Qemu-devel] Cc'ing emails [, Chen Gang, 2014/08/05
- Re: [Qemu-devel] Cc'ing emails [, Markus Armbruster, 2014/08/05
- Re: [Qemu-devel] Cc'ing emails [, Anthony Liguori, 2014/08/05
- Re: [Qemu-devel] [PATCH] dump.c: Fix memory leak issue in cleanup processing for dump_init(), Laszlo Ersek, 2014/08/12
- Re: [Qemu-devel] [PATCH] dump.c: Fix memory leak issue in cleanup processing for dump_init(),
Luiz Capitulino <=