[Xen-changelog] [xen-unstable] libxl: rename libxl__yajl_gen_alloc

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1330525919 0
# Node ID 2b5cf6bde62d4c5278471511cee716650a8eed5a
# Parent  93d379d11cbb191735cd318b0f4aab96e170013e
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@xxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 93d379d11cbb -r 2b5cf6bde62d tools/hotplug/Linux/init.d/xencommons
--- a/tools/hotplug/Linux/init.d/xencommons     Wed Feb 29 13:51:42 2012 +0000
+++ b/tools/hotplug/Linux/init.d/xencommons     Wed Feb 29 14:31:59 2012 +0000
@@ -58,6 +58,7 @@
        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 -r 93d379d11cbb -r 2b5cf6bde62d tools/libxl/libxl_json.c
--- a/tools/libxl/libxl_json.c  Wed Feb 29 13:51:42 2012 +0000
+++ b/tools/libxl/libxl_json.c  Wed Feb 29 14:31:59 2012 +0000
@@ -813,7 +813,7 @@
     yajl_gen_status s;
     yajl_gen hand;
 
-    hand = libxl__yajl_gen_alloc(NULL);
+    hand = libxl_yajl_gen_alloc(NULL);
     if (!hand)
         return NULL;
 
diff -r 93d379d11cbb -r 2b5cf6bde62d tools/libxl/libxl_json.h
--- a/tools/libxl/libxl_json.h  Wed Feb 29 13:51:42 2012 +0000
+++ b/tools/libxl/libxl_json.h  Wed Feb 29 14:31:59 2012 +0000
@@ -40,7 +40,7 @@
     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 @@
     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 -r 93d379d11cbb -r 2b5cf6bde62d tools/libxl/libxl_qmp.c
--- a/tools/libxl/libxl_qmp.c   Wed Feb 29 13:51:42 2012 +0000
+++ b/tools/libxl/libxl_qmp.c   Wed Feb 29 14:31:59 2012 +0000
@@ -464,7 +464,7 @@
     yajl_gen hand;
     callback_id_pair *elm = NULL;
 
-    hand = libxl__yajl_gen_alloc(NULL);
+    hand = libxl_yajl_gen_alloc(NULL);
 
     if (!hand) {
         return NULL;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog