[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.7 1/9] numa: do not leak NumaOptions
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PULL for-2.7 1/9] numa: do not leak NumaOptions |
Date: |
Mon, 8 Aug 2016 00:05:53 +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 7286171..6289f46 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] [PULL for-2.7 0/9] Leak fixes for 2.7, marcandre . lureau, 2016/08/07
- [Qemu-devel] [PULL for-2.7 1/9] numa: do not leak NumaOptions,
marcandre . lureau <=
- [Qemu-devel] [PULL for-2.7 2/9] char: free the tcp connection data when closing, marcandre . lureau, 2016/08/07
- [Qemu-devel] [PULL for-2.7 3/9] char: free MuxDriver when closing, marcandre . lureau, 2016/08/07
- [Qemu-devel] [PULL for-2.7 4/9] ahci: free irqs array, marcandre . lureau, 2016/08/07
- [Qemu-devel] [PULL for-2.7 5/9] qjson: free str, marcandre . lureau, 2016/08/07
- [Qemu-devel] [PULL for-2.7 6/9] virtio-input: free config list, marcandre . lureau, 2016/08/07
- [Qemu-devel] [PULL for-2.7 7/9] usb: free USBDevice.strings, marcandre . lureau, 2016/08/07
- [Qemu-devel] [PULL for-2.7 8/9] usb: free leaking path, marcandre . lureau, 2016/08/07
- [Qemu-devel] [PULL for-2.7 9/9] ahci: fix sglist leak on retry, marcandre . lureau, 2016/08/07
- Re: [Qemu-devel] [PULL for-2.7 0/9] Leak fixes for 2.7, Peter Maydell, 2016/08/08