diff options
author | Anthony PERARD <anthony.perard@citrix.com> | 2011-11-04 12:38:24 +0000 |
---|---|---|
committer | Anthony PERARD <anthony.perard@citrix.com> | 2011-11-04 12:38:24 +0000 |
commit | cec0a61c4355feb0c884fb14b851d3f3ec8df93a (patch) | |
tree | df5e4106e28a11e5d853c3a6c1dd5c6e51b9cd97 /tools/libxl/libxl_qmp.c | |
parent | 44fbf3fa3e6570ecc8c28679563aa0235ff2a60e (diff) | |
download | xen-cec0a61c4355feb0c884fb14b851d3f3ec8df93a.tar.gz xen-cec0a61c4355feb0c884fb14b851d3f3ec8df93a.tar.bz2 xen-cec0a61c4355feb0c884fb14b851d3f3ec8df93a.zip |
libxl: libxl_qmp: Always insert a command id in the callback_list.
Because the function qmp_synchronous_send rely on the presence of the id
in the callback_list.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libxl/libxl_qmp.c')
-rw-r--r-- | tools/libxl/libxl_qmp.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index 43c7d04648..47129c35ce 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -213,7 +213,9 @@ static void qmp_handle_error_response(libxl__qmp_handler *qmp, resp = libxl__json_map_get("desc", resp, JSON_STRING); if (pp) { - pp->callback(qmp, NULL, pp->opaque); + if (pp->callback) { + pp->callback(qmp, NULL, pp->opaque); + } if (pp->id == qmp->wait_for_id) { /* tell that the id have been processed */ qmp->wait_for_id = 0; @@ -245,9 +247,11 @@ static int qmp_handle_response(libxl__qmp_handler *qmp, callback_id_pair *pp = qmp_get_callback_from_id(qmp, resp); if (pp) { - pp->callback(qmp, - libxl__json_map_get("return", resp, JSON_ANY), - pp->opaque); + if (pp->callback) { + pp->callback(qmp, + libxl__json_map_get("return", resp, JSON_ANY), + pp->opaque); + } if (pp->id == qmp->wait_for_id) { /* tell that the id have been processed */ qmp->wait_for_id = 0; @@ -438,6 +442,7 @@ static int qmp_send(libxl__qmp_handler *qmp, unsigned int len = 0; yajl_gen_status s; yajl_gen hand; + callback_id_pair *elm = NULL; hand = yajl_gen_alloc(&conf, NULL); if (!hand) { @@ -463,19 +468,16 @@ static int qmp_send(libxl__qmp_handler *qmp, return -1; } - if (callback) { - callback_id_pair *elm = malloc(sizeof (callback_id_pair)); - if (elm == NULL) { - LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, - "Failed to allocate a QMP callback"); - yajl_gen_free(hand); - return -1; - } - elm->id = qmp->last_id_used; - elm->callback = callback; - elm->opaque = opaque; - SIMPLEQ_INSERT_TAIL(&qmp->callback_list, elm, next); + elm = malloc(sizeof (callback_id_pair)); + if (elm == NULL) { + LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, + "Failed to allocate a QMP callback"); + goto error; } + elm->id = qmp->last_id_used; + elm->callback = callback; + elm->opaque = opaque; + SIMPLEQ_INSERT_TAIL(&qmp->callback_list, elm, next); LIBXL__LOG(qmp->ctx, LIBXL__LOG_DEBUG, "next qmp command: '%s'", buf); |