Re: [PATCH] allow xendomains to work for xl list -l

[M A Young <m.a.young@durham.ac.uk>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1207 bytes --]

On Wed, 10 Apr 2013, Ian Campbell wrote:

> On Tue, 2013-04-09 at 21:05 +0100, M A Young wrote:
>> From xen 4.2 onwards xl list -l gives a JSON format output containing no
>> spaces or line feeds, but the xendomains script expects the older format
>> (of xl in xen 4.1 and xm) of one key-value pair per line.
>
> Hrm, I'm not sure this change was intentional and I don't recall a patch
> which did this on purpose. Ideally xl list would remain somewhat human
> readable even if it is also machine readable.
>
> I wonder if this is yajl v1 vs v2 specific? For v1 libxl_yajl_gen_alloc
> creates a yajl_gen_config with beautify = 1 and passes it to
> yajl_gen_alloc.
>
> For v2 however yajl_gen_alloc doesn't take such an option. It looks like
> we are instead supposed to call yajl_gen_config with yajl_gen_beautify.
> We probably also want to set yajl_gen_indent_string to "    " (although
> that might be the default from my reading).
>
> I don't have a yajl2 test system handy -- could you try that though?

Yes, setting yajl_gen_beautify (as in the attached patch) gets the 
xendomains script working again. I didn't try setting the spaces though 
that does indeed seem to be the default.

 	Michael Young

[-- Attachment #2: Type: TEXT/PLAIN, Size: 462 bytes --]

--- xen-4.2.2/tools/libxl/libxl_json.h.orig	2013-03-21 17:55:42.000000000 +0000
+++ xen-4.2.2/tools/libxl/libxl_json.h	2013-04-10 22:14:15.938459238 +0100
@@ -54,7 +54,10 @@
 
 static inline yajl_gen libxl_yajl_gen_alloc(const yajl_alloc_funcs *allocFuncs)
 {
-    return yajl_gen_alloc(allocFuncs);
+    yajl_gen g;
+    g = yajl_gen_alloc(allocFuncs);
+    yajl_gen_config(g, yajl_gen_beautify, 1);
+    return g;
 }
 
 #else /* !HAVE_YAJL_V2 */

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel