From 5e07d8709811cd22f7cebd68f00c9d0774b323c4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 28 Jun 2012 18:43:25 +0100 Subject: [PATCH] libxl: Add a gc to libxl_get_cpu_topology In the next-but-one patch we are going to change the definition of NOGC to require a local variable libxl__gc *gc. libxl_get_cpu_topology doesn't have one but does use NOGC. Fix this by: - introducing an `out' label - replacing the only call to `return' with a suitable assignment to ret and a `goto out'. - adding uses of GC_INIT and GC_FREE. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Committed-by: Ian Jackson --- tools/libxl/libxl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4d09b953bf..4e831427e8 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3202,6 +3202,7 @@ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo) libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) { + GC_INIT(ctx); xc_topologyinfo_t tinfo; DECLARE_HYPERCALL_BUFFER(xc_cpu_to_core_t, coremap); DECLARE_HYPERCALL_BUFFER(xc_cpu_to_socket_t, socketmap); @@ -3214,7 +3215,8 @@ libxl_cputopology *libxl_get_cpu_topology(libxl_ctx *ctx, int *nb_cpu_out) if (max_cpus == 0) { LIBXL__LOG(ctx, XTL_ERROR, "Unable to determine number of CPUS"); - return NULL; + ret = NULL; + goto out; } coremap = xc_hypercall_buffer_alloc @@ -3259,6 +3261,8 @@ fail: if (ret) *nb_cpu_out = max_cpus; + out: + GC_FREE; return ret; } -- 2.30.2