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 <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index ea572a0f5797618ad7aa1191f8e94b5f1e3695a1..3e8295b9650364553f16f334e22944cbe732171f 100644 (file)
--- 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 9300980a18bbd0f4ba03a5bb69997ba3db76948e..eb697c7464ea902746762c6020bbdf7e9e627ebe 100644 (file)
--- 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 8c038933a4c1e6f5dd72d44306965bf69eddca56..5856303f7a12289b79391ff7edf915c37830c4a1 100644 (file)
--- 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)