[PATCH] opw: libxl: LOGE() used in place of LIBXL__LOG_ERROR in libxl_qmp.c

[PATCH] opw: libxl: LOGE() used in place of LIBXL__LOG_ERROR in libxl_qmp.c

[Kelley Nielsen]

Code cleanup -- no functional changes

Coding style has recently been changed for libxl. The convenience
macro LOGE() has been introduced, and invocations of the old macro
LIBXL__LOG_ERROR() are to be replaced with it. Change all occurences
of the old macro (in functions that have a local libxl_gc *gc) except
the one in register_serials_chardev_callback() to the new one. (This
function lacks a local libxl__gc *gc, which LOGE() requires.)

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
---
 tools/libxl/libxl_qmp.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index 395258e..1a956e9 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -345,8 +345,7 @@ static libxl__qmp_handler *qmp_init_handler(libxl__gc *gc, uint32_t domid)
 
     qmp = calloc(1, sizeof (libxl__qmp_handler));
     if (qmp == NULL) {
-        LIBXL__LOG_ERRNO(libxl__gc_owner(gc), LIBXL__LOG_ERROR,
-                         "Failed to allocate qmp_handler");
+        LOGE(ERROR, "Failed to allocate qmp_handler");
         return NULL;
     }
     qmp->ctx = libxl__gc_owner(gc);
@@ -440,7 +439,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp)
         } else if (ret < 0) {
             if (errno == EINTR)
                 continue;
-            LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Select error");
+            LOGE(ERROR, "Select error");
             return -1;
         }
 
@@ -449,7 +448,7 @@ static int qmp_next(libxl__gc *gc, libxl__qmp_handler *qmp)
             LIBXL__LOG(qmp->ctx, LIBXL__LOG_ERROR, "Unexpected end of socket");
             return -1;
         } else if (rd < 0) {
-            LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Socket read error");
+            LOGE(ERROR, "Socket read error");
             return rd;
         }
 
@@ -538,8 +537,7 @@ static char *qmp_send_prepare(libxl__gc *gc, libxl__qmp_handler *qmp,
 
     elm = malloc(sizeof (callback_id_pair));
     if (elm == NULL) {
-        LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR,
-                         "Failed to allocate a QMP callback");
+        LOGE(ERROR, "Failed to allocate a QMP callback");
         goto out;
     }
     elm->id = qmp->last_id_used;
@@ -697,7 +695,7 @@ libxl__qmp_handler *libxl__qmp_initialize(libxl__gc *gc, uint32_t domid)
     qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d",
                                 libxl__run_dir_path(), domid);
     if ((ret = qmp_open(qmp, qmp_socket, QMP_SOCKET_CONNECT_TIMEOUT)) < 0) {
-        LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR, "Connection error");
+        LOGE(ERROR, "Connection error");
         qmp_free_handler(qmp);
         return NULL;
     }
@@ -729,15 +727,13 @@ void libxl__qmp_close(libxl__qmp_handler *qmp)
 
 void libxl__qmp_cleanup(libxl__gc *gc, uint32_t domid)
 {
-    libxl_ctx *ctx = libxl__gc_owner(gc);
     char *qmp_socket;
 
     qmp_socket = libxl__sprintf(gc, "%s/qmp-libxl-%d",
                                 libxl__run_dir_path(), domid);
     if (unlink(qmp_socket) == -1) {
         if (errno != ENOENT) {
-            LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
-                             "Failed to remove QMP socket file %s",
+            LOGE(ERROR, "Failed to remove QMP socket file %s",
                              qmp_socket);
         }
     }
-- 
1.8.1.2

Re: [PATCH] opw: libxl: LOGE() used in place of LIBXL__LOG_ERROR in libxl_qmp.c

[Ian Campbell]

On Sat, 2013-11-09 at 20:56 -0800, Kelley Nielsen wrote:
> Code cleanup -- no functional changes
> 
> Coding style has recently been changed for libxl. The convenience
> macro LOGE() has been introduced, and invocations of the old macro
> LIBXL__LOG_ERROR() are to be replaced with it. Change all occurences
> of the old macro (in functions that have a local libxl_gc *gc) except
> the one in register_serials_chardev_callback() to the new one. (This
> function lacks a local libxl__gc *gc, which LOGE() requires.)
> 
> Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
>      if (unlink(qmp_socket) == -1) {
>          if (errno != ENOENT) {
> -            LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
> -                             "Failed to remove QMP socket file %s",
> +            LOGE(ERROR, "Failed to remove QMP socket file %s",
>                               qmp_socket);

When making these sorts of changes please reindent the subsequent lines
containing the parameters to align to the new location of the "(". Or in
this case it very likely makes sense to unwrap it all onto one line, if
it is less that 80 columns (I didn't count).

BTW there was a trivial conflict with your previous "opw: libxl: macro
LOG() used in place of LIBXL__LOG" change, which suggests this would
have been better done as a series of patches building on each other.

Thanks,
Ian.