[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V3 07/13] libxl_qmp: Always insert a command id in t
From: |
Anthony PERARD |
Subject: |
[Qemu-devel] [PATCH V3 07/13] libxl_qmp: Always insert a command id in the callback_list. |
Date: |
Tue, 1 Nov 2011 16:07:20 +0000 |
Because the function qmp_synchronous_send rely on the presence of the id
in the callback_list.
Signed-off-by: Anthony PERARD <address@hidden>
Acked-by: Ian Campbell <address@hidden>
---
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 43c7d04..47129c3 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);
--
Anthony PERARD
- [Qemu-devel] [PATCH V3 10/13] libxl_qmp: Introduce libxl__qmp_pci_add., (continued)
- [Qemu-devel] [PATCH V3 10/13] libxl_qmp: Introduce libxl__qmp_pci_add., Anthony PERARD, 2011/11/01
- [Qemu-devel] [PATCH V3 02/13] libxl_json: Check the parser status before to call parse_complete, Anthony PERARD, 2011/11/01
- [Qemu-devel] [PATCH V3 11/13] libxl: Use QMP to insert a passthrough device when using upstream QEMU, Anthony PERARD, 2011/11/01
- [Qemu-devel] [PATCH V3 13/13] libxl: Remove a passthrough device through QMP., Anthony PERARD, 2011/11/01
- [Qemu-devel] [PATCH V3 06/13] libxl_qmp: Introduce list of arguments to qmp_send, Anthony PERARD, 2011/11/01
- [Qemu-devel] [PATCH V3 09/13] libxl_json: Handle number abrove LONG_MAX., Anthony PERARD, 2011/11/01
- [Qemu-devel] [PATCH V3 12/13] libxl_qmp: Introduce libxl__qmp_pci_del, Anthony PERARD, 2011/11/01
- [Qemu-devel] [PATCH V3 04/13] libxl: Introduce dm-version xenstore key., Anthony PERARD, 2011/11/01
- [Qemu-devel] [PATCH V3 07/13] libxl_qmp: Always insert a command id in the callback_list.,
Anthony PERARD <=
- Re: [Qemu-devel] [PATCH V3 00/13] libxl: QMP client improvement + pci passthrougth insert through QMP, Anthony PERARD, 2011/11/01