opw: libxl: add convenience macros to qmp_send() in libxl_qmp.c
PATCH 1/2 opw: libxl: add convenience macros to qmp_send() in libxl_qmp.c
Update qmp_send() in libxl_qmp.c to use the new convenience macros declared in libxl_internal.h. Uses GC_INIT at the top of the function, and GC_FREE at the exit. Since GC_INIT returns a libxl__gc by reference and not by value, remove the address operator from the left of the variable gc where it is passed as a parameter.
--- tools/libxl/libxl_qmp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/libxl/libxl_qmp.c +3 -3
@@ -568,9 +568,9 @@ static int qmp_send(libxl__qmp_handler *qmp, {char *buf =NULL ;int rc =-1 ; -libxl__gc gc;LIBXL_INIT_GC (gc,qmp->ctx); +GC_INIT (qmp->ctx); - buf =qmp_send_prepare (&gc, qmp, cmd, args, callback, opaque, context); + buf =qmp_send_prepare (gc, qmp, cmd, args, callback, opaque, context);if (buf ==NULL ) { goto out;
@@ -585,7 +585,7 @@ static int qmp_send(libxl__qmp_handler *qmp, rc = qmp->last_id_used; out: -libxl__free_all (&gc); +GC_FREE ;return rc; }
Signature · 1 line
1.8.1.2
PATCH 2/2 opw: libxl: use macro CTX in libxl_qmp.c
The new coding style uses the convenience macro CTX as declared in libxl_internal.h. Substitute an invocation of this macro for its body at the one place it occurs in libxl_qmp.c.
--- tools/libxl/libxl_qmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/libxl/libxl_qmp.c +1 -1
@@ -356,7 +356,7 @@ static libxl__qmp_handler *qmp_init_handler(libxl__gc *gc, uint32_t domid)LOGE (ERROR ,"Failed to allocate qmp_handler" );return NULL ; } - qmp->ctx =libxl__gc_owner (gc); + qmp->ctx =CTX ; qmp->domid = domid; qmp->timeout =5 ;
Signature · 1 line
1.8.1.2
Quoted 8 lines · Kelley Nielsen
Update
qmp_send()inlibxl_qmp.cto use the new convenience macros declared inlibxl_internal.h. UsesGC_INITat the top of the function, andGC_FREEat the exit. SinceGC_INITreturns alibxl__gcby reference and not by value, remove the address operator from the left of the variable gc where it is passed as a parameter.Signed-off-by Kelley Nielsen <[email protected]>Suggested-by Anthony PERARD <[email protected]>
I'm dubious about whether qmp_send should be creating itself a gc rather than receiving one as a parameter, but given that it does it should use the macros:
and committed.
(NB, the tag things are more normally chronological, i.e. suggested-by first, then s-o-b, hence I reordered upon commit).
(NB2, I think the OPW tag isn't so useful for the actual commit log, inside the patch prefix i.e. [PATCH OPW ...] would be better, git send-email --subject-preifx='PATCH OPW' would do the trick)
Ian