From 8cea5d337f061c39ec2c639f262becd49dafe361 Mon Sep 17 00:00:00 2001 From: Dario Faggioli Date: Fri, 6 Jul 2012 13:17:44 +0100 Subject: [PATCH] libxl: introduce some node map helpers To allow for allocating a node specific libxl_bitmap (as it is for cpu number and maps). Helper unctions to convert a node map it its coresponding cpu map and vice versa are also implemented. Signed-off-by: Dario Faggioli Acked-by: Ian Campbell Committed-by: Ian Campbell --- tools/libxl/libxl_utils.c | 44 +++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_utils.h | 23 ++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 1bda3cae6c..f7b44a0ee4 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -588,6 +588,50 @@ char *libxl_bitmap_to_hex_string(libxl_ctx *ctx, const libxl_bitmap *bitmap) return q; } +int libxl_nodemap_to_cpumap(libxl_ctx *ctx, + const libxl_bitmap *nodemap, + libxl_bitmap *cpumap) +{ + libxl_cputopology *tinfo = NULL; + int nr_cpus, i, rc = 0; + + tinfo = libxl_get_cpu_topology(ctx, &nr_cpus); + if (tinfo == NULL) { + rc = ERROR_FAIL; + goto out; + } + + libxl_bitmap_set_none(cpumap); + for (i = 0; i < nr_cpus; i++) { + if (libxl_bitmap_test(nodemap, tinfo[i].node)) + libxl_bitmap_set(cpumap, i); + } + out: + libxl_cputopology_list_free(tinfo, nr_cpus); + return rc; +} + +int libxl_cpumap_to_nodemap(libxl_ctx *ctx, + const libxl_bitmap *cpumap, + libxl_bitmap *nodemap) +{ + libxl_cputopology *tinfo = NULL; + int nr_cpus, i, rc = 0; + + tinfo = libxl_get_cpu_topology(ctx, &nr_cpus); + if (tinfo == NULL) { + rc = ERROR_FAIL; + goto out; + } + + libxl_bitmap_set_none(nodemap); + libxl_for_each_set_bit(i, *cpumap) + libxl_bitmap_set(nodemap, tinfo[i].node); + out: + libxl_cputopology_list_free(tinfo, nr_cpus); + return rc; +} + int libxl_get_max_cpus(libxl_ctx *ctx) { return xc_get_max_cpus(ctx->xch); diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index b2c5ec783b..8fee567611 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -104,6 +104,29 @@ static inline int libxl_cpu_bitmap_alloc(libxl_ctx *ctx, libxl_bitmap *cpumap, return libxl_bitmap_alloc(ctx, cpumap, max_cpus); } +static inline int libxl_node_bitmap_alloc(libxl_ctx *ctx, + libxl_bitmap *nodemap, + int max_nodes) +{ + if (max_nodes < 0) + return ERROR_INVAL; + if (max_nodes == 0) + max_nodes = libxl_get_max_nodes(ctx); + if (max_nodes == 0) + return ERROR_FAIL; + + return libxl_bitmap_alloc(ctx, nodemap, max_nodes); +} + +/* Populate cpumap with the cpus spanned by the nodes in nodemap */ +int libxl_nodemap_to_cpumap(libxl_ctx *ctx, + const libxl_bitmap *nodemap, + libxl_bitmap *cpumap); +/* Populate nodemap with the nodes of the cpus in cpumap */ +int libxl_cpumap_to_nodemap(libxl_ctx *ctx, + const libxl_bitmap *cpuemap, + libxl_bitmap *nodemap); + static inline uint32_t libxl__sizekb_to_mb(uint32_t s) { return (s + 1023) / 1024; } -- 2.30.2