libxl: rename libxl__yajl_gen_alloc

libxl__yajl_gen_alloc() is called by generic code,
rename it to libx_yajl_gen_alloc().

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons
index 974892d5aa82390881adf918b730bb9c1f9548bf..8720429c5c0dfb8f888e6564ca0d16a816b88825 100644 (file)
--- a/tools/hotplug/Linux/init.d/xencommons
+++ b/tools/hotplug/Linux/init.d/xencommons
@@ -58,6 +58,7 @@ do_start () {
        modprobe xen-gntdev 2>/dev/null
        modprobe evtchn 2>/dev/null
        modprobe gntdev 2>/dev/null
+       modprobe processor-passthru 2>/dev/null
 
        if ! `xenstore-read -s / >/dev/null 2>&1`
        then

diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c
index be6ad9693ef4308ec6370bff9fe456b1b57d20cf..70909fbd0f7e6fe9f389db4254e4812cd5113658 100644 (file)
--- a/tools/libxl/libxl_json.c
+++ b/tools/libxl/libxl_json.c
@@ -813,7 +813,7 @@ char *libxl__object_to_json(libxl_ctx *ctx, const char *type,
     yajl_gen_status s;
     yajl_gen hand;
 
-    hand = libxl__yajl_gen_alloc(NULL);
+    hand = libxl_yajl_gen_alloc(NULL);
     if (!hand)
         return NULL;
 

diff --git a/tools/libxl/libxl_json.h b/tools/libxl/libxl_json.h
index bb59fbe90b8f2cad5543b2873bc7957ad44996e5..1d183c5ef99471f5d78be704a08b1ba68391be4a 100644 (file)
--- a/tools/libxl/libxl_json.h
+++ b/tools/libxl/libxl_json.h
@@ -40,7 +40,7 @@ static inline yajl_handle libxl__yajl_alloc(const yajl_callbacks *callbacks,
     return yajl_alloc(callbacks, allocFuncs, ctx);
 }
 
-static inline yajl_gen libxl__yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs)
+static inline yajl_gen libxl_yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs)
 {
     return yajl_gen_alloc(allocFuncs);
 }
@@ -62,7 +62,7 @@ static inline yajl_handle libxl__yajl_alloc(const yajl_callbacks *callbacks,
     return yajl_alloc(callbacks, &cfg, allocFuncs, ctx);
 }
 
-static inline yajl_gen libxl__yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs)
+static inline yajl_gen libxl_yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs)
 {
     yajl_gen_config conf = { 1, "    " };
     return yajl_gen_alloc(&conf, allocFuncs);

diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index 43fd134d8b1f9caed8a34a1f8256130e0f9897f1..f5a3edc17b10562684c8c04865cf2dfd507bbca7 100644 (file)
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -464,7 +464,7 @@ static char *qmp_send_prepare(libxl__gc *gc, libxl__qmp_handler *qmp,
     yajl_gen hand;
     callback_id_pair *elm = NULL;
 
-    hand = libxl__yajl_gen_alloc(NULL);
+    hand = libxl_yajl_gen_alloc(NULL);
 
     if (!hand) {
         return NULL;