diff options
author | Ian Jackson <ian.jackson@eu.citrix.com> | 2012-06-28 18:43:25 +0100 |
---|---|---|
committer | Ian Jackson <ian.jackson@eu.citrix.com> | 2012-06-28 18:43:25 +0100 |
commit | 145511d2ce456a6590f28e14e32b7c4cce1c4c69 (patch) | |
tree | 2ae8dc7a26b553b5fcd2f0d97ebb7bc77e5f87f0 /tools/libxl/libxl_utils.c | |
parent | 5e07d8709811cd22f7cebd68f00c9d0774b323c4 (diff) | |
download | xen-145511d2ce456a6590f28e14e32b7c4cce1c4c69.tar.gz xen-145511d2ce456a6590f28e14e32b7c4cce1c4c69.tar.bz2 xen-145511d2ce456a6590f28e14e32b7c4cce1c4c69.zip |
libxl: Add a gc to libxl_cpumap_alloc, ..._to_hex_string
In the next patch we are going to change the definition of NOGC to
require a local variable libxl__gc *gc. And this means that passing 0
to libxl__calloc is going to be wrong.
libxl_cpumap_alloc doesn't have a gc but passes 0 to libxl_calloc
Fix this by:
- introducing an `out' label and an rc variable
- replacing the returns with rc = ERROR_BLAH; goto out;
- adding uses of GC_INIT and GC_FREE.
- changing NULL to NOGC in the call to libxl__calloc
Likewise fix libxl_cpumap_to_hex_string by:
- adding a libxl_ctx* parameter and updating the one call site
- adding uses of GC_INIT and GC_FREE.
- changing NULL to NOGC in the call to libxl__zalloc
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Dario Faggioli <raistlin@linux.it>
Acked-by: Roger Pau Monne <roger.pau@entel.upc.edu>
Committed-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxl/libxl_utils.c')
-rw-r--r-- | tools/libxl/libxl_utils.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index d07a5a7a58..707306213c 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -491,19 +491,29 @@ int libxl_mac_to_device_nic(libxl_ctx *ctx, uint32_t domid, int libxl_cpumap_alloc(libxl_ctx *ctx, libxl_cpumap *cpumap, int max_cpus) { + GC_INIT(ctx); int sz; + int rc; - if (max_cpus < 0) - return ERROR_INVAL; + if (max_cpus < 0) { + rc = ERROR_INVAL; + goto out; + } if (max_cpus == 0) max_cpus = libxl_get_max_cpus(ctx); - if (max_cpus == 0) - return ERROR_FAIL; + if (max_cpus == 0) { + rc = ERROR_FAIL; + goto out; + } sz = (max_cpus + 7) / 8; - cpumap->map = libxl__calloc(NULL, sizeof(*cpumap->map), sz); + cpumap->map = libxl__calloc(NOGC, sizeof(*cpumap->map), sz); cpumap->size = sz; - return 0; + + rc = 0; + out: + GC_FREE; + return rc; } void libxl_cpumap_dispose(libxl_cpumap *map) @@ -542,10 +552,11 @@ int libxl_cpumap_count_set(const libxl_cpumap *cpumap) } /* NB. caller is responsible for freeing the memory */ -char *libxl_cpumap_to_hex_string(const libxl_cpumap *cpumap) +char *libxl_cpumap_to_hex_string(libxl_ctx *ctx, const libxl_cpumap *cpumap) { + GC_INIT(ctx); int i = cpumap->size; - char *p = libxl__zalloc(NULL, cpumap->size * 2 + 3); + char *p = libxl__zalloc(NOGC, cpumap->size * 2 + 3); char *q = p; strncpy(p, "0x", 2); p += 2; @@ -554,6 +565,7 @@ char *libxl_cpumap_to_hex_string(const libxl_cpumap *cpumap) p += 2; } *p = '\0'; + GC_FREE; return q; } |