From: Wei Liu <wei.liu2@citrix.com>
To: xen-devel@lists.xen.org
Cc: Wei Liu <wei.liu2@citrix.com>,
ian.jackson@eu.citrix.com, ian.campbell@citrix.com
Subject: [PATCH V2 3/4] libxl/gentypes.py: generate empty map for None field in keyed-union
Date: Thu, 10 Apr 2014 16:26:33 +0100 [thread overview]
Message-ID: <1397143594-15308-4-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1397143594-15308-1-git-send-email-wei.liu2@citrix.com>
Without this the generated JSON is malformed.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/gentypes.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/libxl/gentypes.py b/tools/libxl/gentypes.py
index 1a3b91c..bfb95e2 100644
--- a/tools/libxl/gentypes.py
+++ b/tools/libxl/gentypes.py
@@ -220,6 +220,13 @@ def libxl_C_type_gen_json(ty, v, indent = " ", parent = None):
s += "case %s:\n" % f.enumname
if f.type is not None:
s += libxl_C_type_gen_json(f.type, fexpr, indent + " ", nparent)
+ else:
+ s += " yajl_gen_map_open(hand);\n"
+ s += " if (s != yajl_gen_status_ok)\n"
+ s += " goto out;\n"
+ s += " yajl_gen_map_close(hand);\n"
+ s += " if (s != yajl_gen_status_ok)\n"
+ s += " goto out;\n"
s += " break;\n"
s += "}\n"
elif isinstance(ty, idl.Struct) and (parent is None or ty.json_fn is None):
--
1.7.10.4
next prev parent reply other threads:[~2014-04-10 15:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-10 15:26 [PATCH V2 0/4] libxl: fixes for JSON infrastructure Wei Liu
2014-04-10 15:26 ` [PATCH V2 1/4] libxl/gentypes.py: don't generate JSON for private type(s) Wei Liu
2014-04-14 16:46 ` Ian Campbell
2014-04-10 15:26 ` [PATCH V2 2/4] libxl_json: fix JSON parser debug code Wei Liu
2014-04-14 16:47 ` Ian Campbell
2014-04-10 15:26 ` Wei Liu [this message]
2014-04-14 16:47 ` [PATCH V2 3/4] libxl/gentypes.py: generate empty map for None field in keyed-union Ian Campbell
2014-04-14 16:53 ` Ian Campbell
2014-04-14 16:59 ` Wei Liu
2014-04-14 17:08 ` Ian Campbell
2014-04-14 17:11 ` Wei Liu
2014-04-16 16:30 ` Ian Campbell
2014-04-16 16:36 ` Wei Liu
2014-04-15 10:29 ` Ian Jackson
2014-04-15 10:32 ` Ian Campbell
2014-04-15 11:29 ` Ian Jackson
2014-04-10 15:26 ` [PATCH V2 4/4] libxl_types.idl: replace empty Struct with None for libxl_event Wei Liu
2014-04-14 16:49 ` Ian Campbell
2014-04-14 16:54 ` Wei Liu
2014-04-14 17:09 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397143594-15308-4-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).