diff options
| author | Olaf Hering <olaf@aepfle.de> | 2012-02-29 14:31:59 +0000 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2012-02-29 14:31:59 +0000 |
| commit | 244ae51879d70291e725766cbb777611b17cf297 (patch) | |
| tree | 98e9b59a4754e191b374fae399e2175710831596 | |
| parent | 9e459f88d10b7a81c9153542dc267c4560dcbcf1 (diff) | |
| download | xen-244ae51879d70291e725766cbb777611b17cf297.tar.gz xen-244ae51879d70291e725766cbb777611b17cf297.tar.bz2 xen-244ae51879d70291e725766cbb777611b17cf297.zip | |
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>
| -rw-r--r-- | tools/hotplug/Linux/init.d/xencommons | 1 | ||||
| -rw-r--r-- | tools/libxl/libxl_json.c | 2 | ||||
| -rw-r--r-- | tools/libxl/libxl_json.h | 4 | ||||
| -rw-r--r-- | tools/libxl/libxl_qmp.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons index 974892d5aa..8720429c5c 100644 --- 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 be6ad9693e..70909fbd0f 100644 --- 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 bb59fbe90b..1d183c5ef9 100644 --- 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 43fd134d8b..f5a3edc17b 100644 --- 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; |