Dario Faggioli
2012-Jun-06 09:22 UTC
[PATCH] libxl: convert malloc() to libxl__zalloc(NULL, ...)
And ditch the error handling in libxl_get_cpu_topology()
Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -3116,12 +3116,7 @@ libxl_cputopology *libxl_get_cpu_topolog
if (tinfo.max_cpu_index < max_cpus - 1)
max_cpus = tinfo.max_cpu_index + 1;
- ret = malloc(sizeof(libxl_cputopology) * max_cpus);
- if (ret == NULL) {
- LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM,
- "Unable to allocate return value");
- goto fail;
- }
+ ret = libxl__zalloc(NULL, sizeof(libxl_cputopology) * max_cpus);
for (i = 0; i < max_cpus; i++) {
#define V(map, i) (map[i] == INVALID_TOPOLOGY_ID) ? \
Ian Campbell
2012-Jun-06 11:47 UTC
Re: [PATCH] libxl: convert malloc() to libxl__zalloc(NULL, ...)
On Wed, 2012-06-06 at 10:22 +0100, Dario Faggioli wrote:> And ditch the error handling in libxl_get_cpu_topology() > > Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>Could have used libxl__calloc but I''ve applied this version. I added "#define NOGC NULL" and used it instead of NULL, this will mean that when we come to apply <20424.60793.374823.597252@mariner.uk.xensource.com> we stand less chance of missing an existing NULL introduced in the interim. Hope that''s ok. Ian.> > diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c > --- a/tools/libxl/libxl.c > +++ b/tools/libxl/libxl.c > @@ -3116,12 +3116,7 @@ libxl_cputopology *libxl_get_cpu_topolog > if (tinfo.max_cpu_index < max_cpus - 1) > max_cpus = tinfo.max_cpu_index + 1; > > - ret = malloc(sizeof(libxl_cputopology) * max_cpus); > - if (ret == NULL) { > - LIBXL__LOG_ERRNOVAL(ctx, XTL_ERROR, ENOMEM, > - "Unable to allocate return value"); > - goto fail; > - } > + ret = libxl__zalloc(NULL, sizeof(libxl_cputopology) * max_cpus); > > for (i = 0; i < max_cpus; i++) { > #define V(map, i) (map[i] == INVALID_TOPOLOGY_ID) ? \