From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH] libxl: don't print out function name in log twice Date: Fri, 1 Aug 2014 12:36:41 +0100 Message-ID: <1406893001-7551-1-git-send-email-wei.liu2@citrix.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.xen.org Cc: Ian Jackson , Wei Liu , Ian Campbell List-Id: xen-devel@lists.xenproject.org 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 --- 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 addacdb..69e4d00 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; } } -- 1.7.10.4