[PATCH] opw: libxl: replace last invocation of LIBXL__LOG_ERROR with LOGE

[PATCH] opw: libxl: replace last invocation of LIBXL__LOG_ERROR with LOGE

[Kelley Nielsen]

Code cleanup -- no functional changes

One invocation of the macro LIBXL__LOG_ERROR remains in libxl_qmp.c.
It is in a function, register_serials_chardev_callback(), that does
not have a local libxl__gc gc* in the original code. Since one was
added in a previous patch, change this last invocation to an invocation
of LOGE.

Note: This patch depends on the patch "change remaining LIBXL_LOG to LOG
in libxl_qmp.c", which was submitted at 04:05, November 10, 2013.

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

diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index b3cd924..92556cf 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -144,9 +144,8 @@ static int register_serials_chardev_callback(libxl__qmp_handler *qmp,
             }
             ret = store_serial_port_info(qmp, chardev, port_number);
             if (ret) {
-                LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR,
-                                 "Failed to store serial port information"
-                                 " in xenstore");
+                LOGE(ERROR, "Failed to store serial port information"
+				" in xenstore");
                 goto out;
             }
         }
-- 
1.8.1.2

Re: [PATCH] opw: libxl: replace last invocation of LIBXL__LOG_ERROR with LOGE

[Ian Campbell]

On Sat, 2013-11-09 at 21:28 -0800, Kelley Nielsen wrote:
> Code cleanup -- no functional changes
> 
> One invocation of the macro LIBXL__LOG_ERROR remains in libxl_qmp.c.
> It is in a function, register_serials_chardev_callback(), that does
> not have a local libxl__gc gc* in the original code. Since one was
> added in a previous patch, change this last invocation to an invocation
> of LOGE.
> 
> Note: This patch depends on the patch "change remaining LIBXL_LOG to LOG
> in libxl_qmp.c", which was submitted at 04:05, November 10, 2013.
> 
> Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>


> ---
>  tools/libxl/libxl_qmp.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
> index b3cd924..92556cf 100644
> --- a/tools/libxl/libxl_qmp.c
> +++ b/tools/libxl/libxl_qmp.c
> @@ -144,9 +144,8 @@ static int register_serials_chardev_callback(libxl__qmp_handler *qmp,
>              }
>              ret = store_serial_port_info(qmp, chardev, port_number);
>              if (ret) {
> -                LIBXL__LOG_ERRNO(qmp->ctx, LIBXL__LOG_ERROR,
> -                                 "Failed to store serial port information"
> -                                 " in xenstore");
> +                LOGE(ERROR, "Failed to store serial port information"
> +				" in xenstore");

Please reindent the second line. Some folks align it just after the (,
others to the " in the first line. I don't mind, although being
consistent in a single file is best, and it looks like the existing
messages align to the (.

With that fixed:
Acked-by: Ian Campbell <ian.campbell@citrix.com>

Ian.