aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libxl/libxl_qmp.c
diff options
context:
space:
mode:
authorRoger Pau Monne <roger.pau@entel.upc.edu>2012-01-31 16:48:06 +0000
committerRoger Pau Monne <roger.pau@entel.upc.edu>2012-01-31 16:48:06 +0000
commitee65792d9386e7eb538dd09674c1c275f2691abb (patch)
tree290984b181271a662155c02478b9f0ff9281f6d5 /tools/libxl/libxl_qmp.c
parent1a4af67d32b1c39b73e09346203f3e12c00b9e41 (diff)
downloadxen-ee65792d9386e7eb538dd09674c1c275f2691abb.tar.gz
xen-ee65792d9386e7eb538dd09674c1c275f2691abb.tar.bz2
xen-ee65792d9386e7eb538dd09674c1c275f2691abb.zip
libxl: add support for yajl 2.x
This patch adds support for yajl versions 2.x, while retaining 1.x compatibility. All the needed ifdefs can be found in libxl_json.h. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxl/libxl_qmp.c')
-rw-r--r--tools/libxl/libxl_qmp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index a43838d85a..e0642e31b5 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -454,15 +454,15 @@ static char *qmp_send_prepare(libxl__gc *gc, libxl__qmp_handler *qmp,
qmp_callback_t callback, void *opaque,
qmp_request_context *context)
{
- yajl_gen_config conf = { 0, NULL };
const unsigned char *buf = NULL;
char *ret = NULL;
- unsigned int len = 0;
+ libxl_yajl_length len = 0;
yajl_gen_status s;
yajl_gen hand;
callback_id_pair *elm = NULL;
- hand = yajl_gen_alloc(&conf, NULL);
+ hand = libxl__yajl_gen_alloc(NULL);
+
if (!hand) {
return NULL;
}