[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 14/37] numa: do not leak NumaOptions
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v2 14/37] numa: do not leak NumaOptions |
Date: |
Thu, 28 Jul 2016 18:37:45 +0400 |
From: Marc-André Lureau <address@hidden>
In all cases, call qapi_free_NumaOptions(), by using a common ending
block.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
numa.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/numa.c b/numa.c
index cbae430..3be3b26 100644
--- a/numa.c
+++ b/numa.c
@@ -223,14 +223,14 @@ static int parse_numa(void *opaque, QemuOpts *opts, Error
**errp)
}
if (err) {
- goto error;
+ goto end;
}
switch (object->type) {
case NUMA_OPTIONS_KIND_NODE:
numa_node_parse(object->u.node.data, opts, &err);
if (err) {
- goto error;
+ goto end;
}
nb_numa_nodes++;
break;
@@ -238,13 +238,14 @@ static int parse_numa(void *opaque, QemuOpts *opts, Error
**errp)
abort();
}
- return 0;
-
-error:
- error_report_err(err);
+end:
qapi_free_NumaOptions(object);
+ if (err) {
+ error_report_err(err);
+ return -1;
+ }
- return -1;
+ return 0;
}
static char *enumerate_cpus(unsigned long *cpus, int max_cpus)
--
2.9.0
- [Qemu-devel] [PATCH v2 05/37] tests: fix test-cutils leaks, (continued)
- [Qemu-devel] [PATCH v2 05/37] tests: fix test-cutils leaks, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 07/37] tests: fix test-iov leaks, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 08/37] qdist: fix entries memory leak, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 09/37] tests: fix check-qom-interface leaks, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 10/37] tests: fix check-qom-proplist leaks, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 11/37] tests: fix small leak in test-io-channel-command, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 12/37] tests: fix leak in test-string-input-visitor, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 13/37] portio: keep references on portio, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 15/37] pc: simplify passing qemu_irq, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 14/37] numa: do not leak NumaOptions,
marcandre . lureau <=
- [Qemu-devel] [PATCH v2 16/37] pc: don't leak a20_line, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 17/37] machine: use class base init generated name, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 18/37] acpi-build: fix array leak, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 19/37] char: disconnect peer when qemu_chr_free(), marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 20/37] char: free MuxDriver when closing, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 21/37] tests: fix qom-test leaks, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 22/37] pc: free i8259, marcandre . lureau, 2016/07/28
- [Qemu-devel] [PATCH v2 23/37] pc: keep gsi reference, marcandre . lureau, 2016/07/28