From: Anthony PERARD <anthony.perard@citrix.com>
To: Xen Devel <xen-devel@lists.xen.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 3/6] libxl_qmp: Introduces helpers to create an argument list.
Date: Wed, 25 Jul 2012 18:04:14 +0100 [thread overview]
Message-ID: <1343235857-15870-4-git-send-email-anthony.perard@citrix.com> (raw)
In-Reply-To: <1343235857-15870-1-git-send-email-anthony.perard@citrix.com>
Those functions will be used to create a "list" of parameters that contain more
than just strings. This list is converted by qmp_send to a string to be sent to
QEMU.
Those functions will be used in the next two patches, so right now there are
not compiled.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
tools/libxl/libxl_qmp.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 insertions(+), 0 deletions(-)
diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index e33b130..edbd3b4 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -623,6 +623,92 @@ static void qmp_free_handler(libxl__qmp_handler *qmp)
free(qmp);
}
+#if 0
+/*
+ * QMP Parameters Helpers
+ * If a function fail to allocate memomy for one more parameters, then
+ * the param is free, even if it's come from a caller.
+ */
+static libxl__json_object *qmp_parameters_common(libxl__gc *gc,
+ libxl__json_object *param,
+ const char *name,
+ libxl__json_object *obj)
+{
+ // check that every caller of this free the tree !
+ libxl__json_map_node *arg = NULL;
+ if (!param) {
+ param = libxl__json_object_alloc(gc, JSON_MAP);
+ if (!param)
+ return NULL;
+ }
+ arg = calloc(1, sizeof (libxl__json_map_node));
+ if (!arg)
+ goto error_nomem;
+
+ if (flexarray_append(param->u.map, arg) == 2) {
+ free(arg);
+ goto error_nomem;
+ }
+
+ arg->map_key = strdup(name);
+ if (!arg->map_key)
+ goto error_nomem;
+
+ arg->obj = obj;
+
+ return param;
+error_nomem:
+ libxl__json_object_free(gc, param);
+ return NULL;
+}
+
+static libxl__json_object *qmp_parameters_add_string(libxl__gc *gc,
+ libxl__json_object *param,
+ const char *name,
+ const char *argument)
+{
+ libxl__json_object *obj;
+
+ obj = libxl__json_object_alloc(gc, JSON_STRING);
+ if (!obj)
+ goto error_nomem;
+ obj->u.string = strdup(argument);
+ if (!obj->u.string)
+ goto error_nomem;
+
+ param = qmp_parameters_common(gc, param, name, obj);
+ if (!param)
+ goto error_nomem;
+
+ return param;
+error_nomem:
+ libxl__json_object_free(gc, param);
+ libxl__json_object_free(gc, obj);
+ return NULL;
+}
+
+static libxl__json_object *qmp_parameters_add_bool(libxl__gc *gc,
+ libxl__json_object *param,
+ const char *name, bool b)
+{
+ libxl__json_object *obj;
+
+ obj = libxl__json_object_alloc(gc, JSON_TRUE);
+ if (!obj)
+ goto error_nomem;
+
+ param = qmp_parameters_common(gc, param, name, obj);
+ if (!param)
+ goto error_nomem;
+
+ return param;
+error_nomem:
+ libxl__json_object_free(gc, param);
+ libxl__json_object_free(gc, obj);
+ return NULL;
+}
+#endif
+
/*
* API
*/
--
Anthony PERARD
next prev parent reply other threads:[~2012-07-25 17:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-25 17:04 [PATCH 0/6] Set dirty log on qemu-xen Anthony PERARD
2012-07-25 17:04 ` [PATCH 1/6] libxl_json: Export json_object related function Anthony PERARD
2012-07-31 12:50 ` Ian Jackson
2012-07-25 17:04 ` [PATCH 2/6] libxl_json: Introduce libxl__json_object_to_yajl_gen Anthony PERARD
2012-07-31 14:19 ` Ian Jackson
2012-07-25 17:04 ` Anthony PERARD [this message]
2012-07-31 14:27 ` [PATCH 3/6] libxl_qmp: Introduces helpers to create an argument list Ian Jackson
2012-07-25 17:04 ` [PATCH 4/6] libxl_qmp: Use qmp_parameters_* functions for param list of a QMP command Anthony PERARD
2012-07-31 14:36 ` Ian Jackson
2012-07-25 17:04 ` [PATCH 5/6] libxl_qmp: Introduce libxl__qmp_set_global_dirty_log Anthony PERARD
2012-07-31 14:37 ` Ian Jackson
2012-07-25 17:04 ` [PATCH 6/6] libxl_dom: Call the right switch logdirty for the right DM Anthony PERARD
2012-07-31 14:40 ` Ian Jackson
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=1343235857-15870-4-git-send-email-anthony.perard@citrix.com \
--to=anthony.perard@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=ian.campbell@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).