From patchwork Thu Nov 17 17:36:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cedric Bosdonnat X-Patchwork-Id: 9434853 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A30C66047D for ; Thu, 17 Nov 2016 17:39:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95AC920499 for ; Thu, 17 Nov 2016 17:39:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AA0D29687; Thu, 17 Nov 2016 17:39:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ECB8B20499 for ; Thu, 17 Nov 2016 17:39:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c7QcP-0000VX-Jn; Thu, 17 Nov 2016 17:37:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c7QcO-0000Sc-Rb for xen-devel@lists.xen.org; Thu, 17 Nov 2016 17:37:00 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 2F/47-26755-CBAED285; Thu, 17 Nov 2016 17:37:00 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42I53H6XVXf3K90 Ig5aXvBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bPNbdYCu66VtzuncfewPjGoIuRi0NIYAmj xI72c0xdjJwcbAL2El1/joLZIgLSEtc+X2YEsZkFSiT2Pu0As4UFnCXuvfvBAmKzCKhKLF3Xz g5i8wpYSPzsuwQWlxCQl7hw9RSYzQkUP3D4HDOILSRgLvHmzQImiHpBiZMznwDVcADNV5dYP0 8IYpW8RPPW2cwTGHlnIamahVA1C0nVAkbmVYzqxalFZalFuhZ6SUWZ6RkluYmZObqGBsZ6uan FxYnpqTmJScV6yfm5mxiBAcUABDsYL7Q7H2KU5GBSEuVlfqkbIcSXlJ9SmZFYnBFfVJqTWnyI UYaDQ0mCtwAkJ1iUmp5akZaZAwxtmLQEB4+SCK8kSJq3uCAxtzgzHSJ1ilFRSpw3DCQhAJLIK M2Da4PF0yVGWSlhXkagQ4R4ClKLcjNLUOVfMYpzMCoJ8z4AmcKTmVcCN/0V0GImoMV7BHRAFp ckIqSkGhiD3TeXVwYs/5ipfCe2Mvpz9MSLd+Krvqrpyc3kjZua+cDAz6HJw1LhzrdVIos2BUt EJgbPa6tc5CB1Z/UV1pncd128ej/9Dk99oCwTd9HCtlW+++z2kBuxM26tXReocP/32mstYYtt G7fxhC1QXuPmVVh7Yea03NdGwrmefV43maNOuEhu41BiKc5INNRiLipOBADn0grxogIAAA== X-Env-Sender: cbosdonnat@suse.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1479404218!45193084!1 X-Originating-IP: [195.135.221.5] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25881 invoked from network); 17 Nov 2016 17:36:58 -0000 Received: from smtp.nue.novell.com (HELO smtp.nue.novell.com) (195.135.221.5) by server-6.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 17 Nov 2016 17:36:58 -0000 Received: from laptop.vms (mhy71-2-88-167-63-197.fbx.proxad.net [88.167.63.197]) by smtp.nue.novell.com with ESMTP (TLS encrypted); Thu, 17 Nov 2016 18:36:57 +0100 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= To: xen-devel@lists.xen.org Date: Thu, 17 Nov 2016 18:36:09 +0100 Message-Id: <20161117173617.6697-28-cbosdonnat@suse.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161117173617.6697-1-cbosdonnat@suse.com> References: <20161117173617.6697-1-cbosdonnat@suse.com> MIME-Version: 1.0 Cc: Wei Liu , Ian Jackson , Cedric Bosdonnat Subject: [Xen-devel] [PATCH v2 27/35] libxl/libxl_pvusb.c: used LOG*D functions X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Cedric Bosdonnat Use LOG*D logging functions where possible instead of the LOG* ones. Signed-off-by: Cédric Bosdonnat --- tools/libxl/libxl_usb.c | 57 ++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c index 76260b1..ea7a2ab 100644 --- a/tools/libxl/libxl_usb.c +++ b/tools/libxl/libxl_usb.c @@ -254,7 +254,7 @@ static int libxl__device_usbctrl_add_xenstore(libxl__gc *gc, uint32_t domid, if (usbctrl->type == LIBXL_USBCTRL_TYPE_QUSB) { if (!libxl__query_qemu_backend(gc, domid, usbctrl->backend_domid, "qusb", false)) { - LOG(ERROR, "backend type not supported by device model"); + LOGD(ERROR, domid, "backend type not supported by device model"); rc = ERROR_FAIL; goto out; } @@ -269,7 +269,7 @@ static int libxl__device_usbctrl_add_xenstore(libxl__gc *gc, uint32_t domid, if (rc < 0) goto out; if (rc == 1) { /* already exists in xenstore */ - LOG(ERROR, "device already exists in xenstore"); + LOGD(ERROR, domid, "device already exists in xenstore"); rc = ERROR_DEVICE_EXISTS; goto out; } @@ -536,7 +536,7 @@ void libxl__initiate_device_usbctrl_remove(libxl__egc *egc, for (i = 0; i < num_usbdev; i++) { rc = libxl__device_usbdev_remove(gc, domid, &usbdevs[i]); if (rc) { - LOG(ERROR, "libxl__device_usbdev_remove failed: controller %d, " + LOGD(ERROR, domid, "libxl__device_usbdev_remove failed: controller %d, " "port %d", usbdevs[i].ctrl, usbdevs[i].port); goto out; } @@ -633,7 +633,7 @@ libxl_device_usbctrl_list(libxl_ctx *ctx, uint32_t domid, int *num) return usbctrls; out: - LOG(ERROR, "Unable to list USB Controllers"); + LOGD(ERROR, domid, "Unable to list USB Controllers"); libxl_device_usbctrl_list_free(usbctrls, *num); GC_FREE; *num = 0; @@ -1067,7 +1067,8 @@ static int libxl__device_usbdev_setdefault(libxl__gc *gc, if (usbdev->ctrl == -1) { if (usbdev->port) { - LOG(ERROR, "USB controller must be specified if you specify port"); + LOGD(ERROR, domid, + "USB controller must be specified if you specify port"); return ERROR_INVAL; } @@ -1119,7 +1120,7 @@ static int libxl__device_usbdev_setdefault(libxl__gc *gc, if (rc) goto out; if (tmp && strcmp(tmp, "")) { - LOG(ERROR, "The controller port isn't available"); + LOGD(ERROR, domid, "The controller port isn't available"); rc = ERROR_FAIL; goto out; } @@ -1146,7 +1147,7 @@ static int libxl__device_usbdev_setdefault(libxl__gc *gc, } if (!usbdev->port) { - LOG(ERROR, "No available port under specified controller"); + LOGD(ERROR, domid, "No available port under specified controller"); rc = ERROR_FAIL; goto out; } @@ -1183,7 +1184,7 @@ static int libxl__device_usbdev_add_xenstore(libxl__gc *gc, uint32_t domid, busid = usbdev_busaddr_to_busid(gc, usbdev->u.hostdev.hostbus, usbdev->u.hostdev.hostaddr); if (!busid) { - LOG(DEBUG, "Fail to get busid of usb device"); + LOGD(DEBUG, domid, "Fail to get busid of usb device"); rc = ERROR_FAIL; goto out; } @@ -1217,7 +1218,7 @@ static int libxl__device_usbdev_add_xenstore(libxl__gc *gc, uint32_t domid, be_path = vusb_get_port_path(gc, domid, type, usbdev->ctrl, usbdev->port); - LOG(DEBUG, "Adding usb device %s to xenstore: controller %d, port %d", + LOGD(DEBUG, domid, "Adding usb device %s to xenstore: controller %d, port %d", busid, usbdev->ctrl, usbdev->port); rc = libxl__xs_write_checked(gc, t, be_path, busid); @@ -1245,8 +1246,8 @@ static int libxl__device_usbdev_remove_xenstore(libxl__gc *gc, uint32_t domid, be_path = vusb_get_port_path(gc, domid, type, usbdev->ctrl, usbdev->port); - LOG(DEBUG, "Removing usb device from xenstore: controller %d, port %d", - usbdev->ctrl, usbdev->port); + LOGD(DEBUG, domid, "Removing usb device from xenstore: controller %d, port %d", + usbdev->ctrl, usbdev->port); return libxl__xs_write_checked(gc, XBT_NULL, be_path, ""); } @@ -1634,7 +1635,7 @@ static int do_usbdev_add(libxl__gc *gc, uint32_t domid, } break; default: - LOG(ERROR, "Unsupported usb controller type"); + LOGD(ERROR, domid, "Unsupported usb controller type"); rc = ERROR_FAIL; goto out; } @@ -1687,7 +1688,8 @@ static void libxl__device_usbdev_add(libxl__egc *egc, uint32_t domid, if (rc) goto out; if (usbctrlinfo.backend_id != LIBXL_TOOLSTACK_DOMID) { - LOG(ERROR, "Don't support adding USB device from non-Dom0 backend"); + LOGD(ERROR, domid, + "Don't support adding USB device from non-Dom0 backend"); rc = ERROR_INVAL; goto out; } @@ -1695,7 +1697,7 @@ static void libxl__device_usbdev_add(libxl__egc *egc, uint32_t domid, /* check usb device is assignable type */ if (!is_usbdev_assignable(gc, usbdev)) { - LOG(ERROR, "USB device is not assignable."); + LOGD(ERROR, domid, "USB device is not assignable."); rc = ERROR_FAIL; goto out; } @@ -1703,13 +1705,13 @@ static void libxl__device_usbdev_add(libxl__egc *egc, uint32_t domid, /* check usb device is already assigned */ rc = get_assigned_devices(gc, &assigned, &num_assigned); if (rc) { - LOG(ERROR, "cannot determine if device is assigned," - " refusing to continue"); + LOGD(ERROR, domid, "cannot determine if device is assigned," + " refusing to continue"); goto out; } if (is_usbdev_in_array(assigned, num_assigned, usbdev)) { - LOG(ERROR, "USB device already attached to a domain"); + LOGD(ERROR, domid, "USB device already attached to a domain"); rc = ERROR_INVAL; goto out; } @@ -1771,24 +1773,24 @@ static int do_usbdev_remove(libxl__gc *gc, uint32_t domid, */ rc = usbback_dev_unassign(gc, busid); if (rc) { - LOG(ERROR, "Error removing device from guest." - " Try running usbdev-detach again."); + LOGD(ERROR, domid, "Error removing device from guest." + " Try running usbdev-detach again."); goto out; } rc = libxl__device_usbdev_remove_xenstore(gc, domid, usbdev, LIBXL_USBCTRL_TYPE_PV); if (rc) { - LOG(ERROR, "Error removing device from guest." - " Try running usbdev-detach again."); + LOGD(ERROR, domid, "Error removing device from guest." + " Try running usbdev-detach again."); goto out; } rc = usbdev_rebind(gc, busid); if (rc) { - LOG(ERROR, "USB device removed from guest, but couldn't" - " re-bind to domain 0. Try removing and re-inserting" - " the USB device or reloading the driver modules."); + LOGD(ERROR, domid, "USB device removed from guest, but couldn't" + " re-bind to domain 0. Try removing and re-inserting" + " the USB device or reloading the driver modules."); goto out; } @@ -1814,7 +1816,7 @@ static int do_usbdev_remove(libxl__gc *gc, uint32_t domid, break; default: - LOG(ERROR, "Unsupported usb controller type"); + LOGD(ERROR, domid, "Unsupported usb controller type"); rc = ERROR_FAIL; goto out; } @@ -1843,7 +1845,7 @@ static int libxl__device_usbdev_remove(libxl__gc *gc, uint32_t domid, int rc; if (usbdev->ctrl < 0 || usbdev->port < 1) { - LOG(ERROR, "Invalid USB device"); + LOGD(ERROR, domid, "Invalid USB device"); return ERROR_FAIL; } @@ -1855,7 +1857,8 @@ static int libxl__device_usbdev_remove(libxl__gc *gc, uint32_t domid, if (rc) goto out; if (usbctrlinfo.backend_id != LIBXL_TOOLSTACK_DOMID) { - LOG(ERROR, "Don't support removing USB device from non-Dom0 backend"); + LOGD(ERROR, domid, + "Don't support removing USB device from non-Dom0 backend"); rc = ERROR_INVAL; goto out; }