From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony PERARD Subject: [PATCH 3/6] libxl_qmp: Introduces helpers to create an argument list. Date: Wed, 25 Jul 2012 18:04:14 +0100 Message-ID: <1343235857-15870-4-git-send-email-anthony.perard@citrix.com> References: <1343235857-15870-1-git-send-email-anthony.perard@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1343235857-15870-1-git-send-email-anthony.perard@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen Devel Cc: Anthony PERARD , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org 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 --- 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