[Qemu-devel] [PULL 0/1] NUMA queue, 2015-07-15

[Qemu-devel] [PULL 0/1] NUMA queue, 2015-07-15

[Eduardo Habkost]

The following changes since commit 7692401a0826803522cfde533bdcc149932ddc6a:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150715' into staging (2015-07-15 17:28:59 +0100)

are available in the git repository at:

  git://github.com/ehabkost/qemu.git tags/numa-pull-request

for you to fetch changes up to 672558d2ea8dd782d1d2adc6e16af3bc34029a36:

  numa: Fix memory leak in numa_set_mem_node_id() (2015-07-15 16:57:50 -0300)

----------------------------------------------------------------
NUMA queue, 2015-07-15

----------------------------------------------------------------

Bharata B Rao (1):
  numa: Fix memory leak in numa_set_mem_node_id()

 numa.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.1.0

[Qemu-devel] [PULL 1/1] numa: Fix memory leak in numa_set_mem_node_id()

[Eduardo Habkost]

From: Bharata B Rao <bharata@linux.vnet.ibm.com>

Fix a memory leak in numa_set_mem_node_id().

Signed-off-by: Bharata B Rao <bharata@linux.vnet.com>
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 numa.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/numa.c b/numa.c
index 3c80059..402804b 100644
--- a/numa.c
+++ b/numa.c
@@ -54,7 +54,7 @@ NodeInfo numa_info[MAX_NODES];
 
 void numa_set_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node)
 {
-    struct numa_addr_range *range = g_malloc0(sizeof(*range));
+    struct numa_addr_range *range;
 
     /*
      * Memory-less nodes can come here with 0 size in which case,
@@ -64,6 +64,7 @@ void numa_set_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node)
         return;
     }
 
+    range = g_malloc0(sizeof(*range));
     range->mem_start = addr;
     range->mem_end = addr + size - 1;
     QLIST_INSERT_HEAD(&numa_info[node].addr, range, entry);
-- 
2.1.0

Re: [Qemu-devel] [PULL 0/1] NUMA queue, 2015-07-15

[Peter Maydell]

On 15 July 2015 at 21:02, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The following changes since commit 7692401a0826803522cfde533bdcc149932ddc6a:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150715' into staging (2015-07-15 17:28:59 +0100)
>
> are available in the git repository at:
>
>   git://github.com/ehabkost/qemu.git tags/numa-pull-request
>
> for you to fetch changes up to 672558d2ea8dd782d1d2adc6e16af3bc34029a36:
>
>   numa: Fix memory leak in numa_set_mem_node_id() (2015-07-15 16:57:50 -0300)
>
> ----------------------------------------------------------------
> NUMA queue, 2015-07-15
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM