From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kelley Nielsen Subject: [PATCH 1/2] opw: libxl: add convenience macros to qmp_send() in libxl_qmp.c Date: Mon, 11 Nov 2013 02:08:57 -0800 Message-ID: <1384164538-25656-1-git-send-email-kelleynnn@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: 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@lists.xensource.com Cc: anthony.perard@citrix.com List-Id: xen-devel@lists.xenproject.org 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. Signed-off-by: Kelley Nielsen Suggested-by: Anthony PERARD --- tools/libxl/libxl_qmp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index ee6d06f..b41d583 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -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; } -- 1.8.1.2