From cad883eff9247944f3bcc339aaba6ec8a2180329 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Fri, 1 Aug 2014 12:36:41 +0100 Subject: [PATCH] libxl: don't print out function name in log twice The LOG macro already prints out function names. No need to explictly use "__func__" in log message. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index addacdb2cc..69e4d009e5 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -230,8 +230,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, || b_info->u.hvm.usbdevice_list) { if ( b_info->u.hvm.usbdevice && b_info->u.hvm.usbdevice_list ) { - LOG(ERROR, "%s: Both usbdevice and usbdevice_list set", - __func__); + LOG(ERROR, "Both usbdevice and usbdevice_list set"); return NULL; } flexarray_append(dm_args, "-usb"); @@ -527,8 +526,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, || b_info->u.hvm.usbdevice_list) { if ( b_info->u.hvm.usbdevice && b_info->u.hvm.usbdevice_list ) { - LOG(ERROR, "%s: Both usbdevice and usbdevice_list set", - __func__); + LOG(ERROR, "Both usbdevice and usbdevice_list set"); return NULL; } flexarray_append(dm_args, "-usb"); @@ -565,8 +563,8 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, "-device", "nec-usb-xhci,id=usb", NULL); break; default: - LOG(ERROR, "%s: usbversion parameter is invalid, " - "must be between 1 and 3", __func__); + LOG(ERROR, "usbversion parameter is invalid, " + "must be between 1 and 3"); return NULL; } if (b_info->u.hvm.spice.usbredirection >= 0 && @@ -577,8 +575,8 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, libxl__sprintf(gc, "usb-redir,chardev=usbrc%d," "id=usbrc%d", i, i), NULL); } else { - LOG(ERROR, "%s: usbredirection parameter is invalid, " - "it must be between 1 and 4", __func__); + LOG(ERROR, "usbredirection parameter is invalid, " + "it must be between 1 and 4"); return NULL; } } -- 2.30.2