From 657d30ae598bd6107699d856653be1e4ee57b6b4 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 18 Oct 2011 10:35:55 +0100 Subject: [PATCH] libxl: libxl_destroy_cpumap becomes libxl_cpumap_destroy Now that IDL type destructors are no longer libxl_*_destroy we can use the more common libxl_NOUN_VERB structure here. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/libxl/libxl.c | 4 ++-- tools/libxl/libxl.h | 2 +- tools/libxl/xl_cmdimpl.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ea572a0f57..3e8295b965 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2775,7 +2775,7 @@ int libxl_create_cpupool(libxl_ctx *ctx, const char *name, int schedid, if (rc) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Error moving cpu to cpupool"); - libxl_destroy_cpupool(ctx, *poolid); + libxl_cpupool_destroy(ctx, *poolid); libxl__free_all(&gc); return ERROR_FAIL; } @@ -2799,7 +2799,7 @@ int libxl_create_cpupool(libxl_ctx *ctx, const char *name, int schedid, } } -int libxl_destroy_cpupool(libxl_ctx *ctx, uint32_t poolid) +int libxl_cpupool_destroy(libxl_ctx *ctx, uint32_t poolid) { libxl__gc gc = LIBXL_INIT_GC(ctx); int rc, i; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 9300980a18..eb697c7464 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -503,7 +503,7 @@ int libxl_get_freecpus(libxl_ctx *ctx, libxl_cpumap *cpumap); int libxl_create_cpupool(libxl_ctx *ctx, const char *name, int schedid, libxl_cpumap cpumap, libxl_uuid *uuid, uint32_t *poolid); -int libxl_destroy_cpupool(libxl_ctx *ctx, uint32_t poolid); +int libxl_cpupool_destroy(libxl_ctx *ctx, uint32_t poolid); int libxl_cpupool_rename(libxl_ctx *ctx, const char *name, uint32_t poolid); int libxl_cpupool_cpuadd(libxl_ctx *ctx, uint32_t poolid, int cpu); int libxl_cpupool_cpuadd_node(libxl_ctx *ctx, uint32_t poolid, int node, int *cpus); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8c038933a4..5856303f7a 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4954,7 +4954,7 @@ int main_cpupooldestroy(int argc, char **argv) return -ERROR_FAIL; } - return -libxl_destroy_cpupool(ctx, poolid); + return -libxl_cpupool_destroy(ctx, poolid); } int main_cpupoolrename(int argc, char **argv) -- 2.30.2