From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [PATCH 3/3] libxl: cleanup some misuse of 'cpumap' as parameter Date: Tue, 24 Mar 2015 14:42:27 +0100 Message-ID: <20150324134223.10874.43009.stgit@Solace.station> References: <20150324132630.10874.78040.stgit@Solace.station> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20150324132630.10874.78040.stgit@Solace.station> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Wei Liu , Ian Jackson , Ian Campbell , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org in favour of the more generic 'bitmap', which is better since these are generic libxl_bitmap_* functions. Also fix a typo, and remove a stale (and wrong) comment. No functional change intended. Signed-off-by: Dario Faggioli Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu --- tools/libxl/libxl_dom.c | 2 +- tools/libxl/libxl_utils.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 554ea68..26a0382 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -376,7 +376,7 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, } if (info->nodemap.size) libxl_domain_set_nodeaffinity(ctx, domid, &info->nodemap); - /* As mentioned in libxl.h, vcpu_hard_array takes precedence */ + if (info->num_vcpu_hard_affinity || info->num_vcpu_soft_affinity) { libxl_bitmap *hard_affinity, *soft_affinity; int i, n_vcpus; diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index acacdd9..68b5580 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -89,8 +89,8 @@ int libxl_bitmap_is_empty(const libxl_bitmap *bitmap); int libxl_bitmap_test(const libxl_bitmap *bitmap, int bit); void libxl_bitmap_set(libxl_bitmap *bitmap, int bit); void libxl_bitmap_reset(libxl_bitmap *bitmap, int bit); -int libxl_bitmap_count_set(const libxl_bitmap *cpumap); -char *libxl_bitmap_to_hex_string(libxl_ctx *ctx, const libxl_bitmap *cpumap); +int libxl_bitmap_count_set(const libxl_bitmap *bitmap); +char *libxl_bitmap_to_hex_string(libxl_ctx *ctx, const libxl_bitmap *bitmap); static inline void libxl_bitmap_set_any(libxl_bitmap *bitmap) { memset(bitmap->map, -1, bitmap->size); @@ -145,7 +145,7 @@ int libxl_node_to_cpumap(libxl_ctx *ctx, int node, 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, + const libxl_bitmap *cpumap, libxl_bitmap *nodemap); static inline uint32_t libxl__sizekb_to_mb(uint32_t s) {