From patchwork Tue Nov 15 10:18:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cedric Bosdonnat X-Patchwork-Id: 9429343 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 27AEC60469 for ; Tue, 15 Nov 2016 10:22:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10319286B9 for ; Tue, 15 Nov 2016 10:22:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F383A286C2; Tue, 15 Nov 2016 10:22:14 +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 9F09C286B9 for ; Tue, 15 Nov 2016 10:22:14 +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 1c6aqZ-0005c1-Tz; Tue, 15 Nov 2016 10:20:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c6aqY-0005BA-HQ for xen-devel@lists.xen.org; Tue, 15 Nov 2016 10:20:10 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 9E/FF-22495-A51EA285; Tue, 15 Nov 2016 10:20:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsVyuP0uq27kQ60 Igw13tSyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oy5/atZC1bKVhz5/YKlgfG5SBcjJ4eQwBJG iWczSkFsNgF7ia4/R5lAbBEBaYlrny8zdjFycTALnGCU6Nm4mQ0kISzgIPH81kx2EJtFQFXi3 a7fYA28ApYSM48vA6uREJCXuHD1FAuIzQkU/3n0KTvEMguJJZe7mSHqBSVOznwCVMMBtEBdYv 08IZAwM1Br89bZzBMYeWchqZqFUDULSdUCRuZVjBrFqUVlqUW6RpZ6SUWZ6RkluYmZObqGBsZ 6uanFxYnpqTmJScV6yfm5mxiBIVXPwMC4g7Fpr98hRkkOJiVRXqHVWhFCfEn5KZUZicUZ8UWl OanFhxhlODiUJHgnPADKCRalpqdWpGXmAIMbJi3BwaMkwjsdJM1bXJCYW5yZDpE6xagoJc4bA JIQAElklObBtcEi6hKjrJQwLyMDA4MQT0FqUW5mCar8K0ZxDkYlYd40kCk8mXklcNNfAS1mAl q8y1wDZHFJIkJKqoEx5PFkBjG7+qilIQrmhi4LAr0eCPzRP7XzxQcdh2D9lLvsr/uanbfdOhZ va816I+166skdIqcX7rCr2LqixU2O/Vp/c8Dsu8XBi2fPstPj5FRrjk++2ZZ8Jf5y0IJlUvO+ HqyQuNTn8iRqec+TTZn+zp/D0soeCn8M+Bxmzfs0I2I+bx3vhxolluKMREMt5qLiRABaxCBBo wIAAA== X-Env-Sender: cbosdonnat@suse.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1479205209!44659568!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 60609 invoked from network); 15 Nov 2016 10:20:09 -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; 15 Nov 2016 10:20:09 -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); Tue, 15 Nov 2016 11:20:08 +0100 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= To: xen-devel@lists.xen.org Date: Tue, 15 Nov 2016 11:18:58 +0100 Message-Id: <20161115101913.10396-21-cbosdonnat@suse.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161115101913.10396-1-cbosdonnat@suse.com> References: <20161115101913.10396-1-cbosdonnat@suse.com> MIME-Version: 1.0 Cc: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= , Wei Liu , Ian Jackson , =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Subject: [Xen-devel] [PATCH 20/35] libxl/libxl_linux.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: Cédric Bosdonnat Use LOG*D logging functions where possible instead of the LOG* ones. Signed-off-by: Cédric Bosdonnat --- tools/libxl/libxl_linux.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_linux.c b/tools/libxl/libxl_linux.c index 0033a0e..6ef0abc 100644 --- a/tools/libxl/libxl_linux.c +++ b/tools/libxl/libxl_linux.c @@ -61,7 +61,7 @@ static char **get_hotplug_env(libxl__gc *gc, env[nr++] = gatewaydev ? : ""; if (libxl__nic_type(gc, dev, &nictype)) { - LOG(ERROR, "unable to get nictype"); + LOGD(ERROR, dev->domid, "unable to get nictype"); return NULL; } switch (nictype) { @@ -107,14 +107,15 @@ static int libxl__hotplug_nic(libxl__gc *gc, libxl__device *dev, script = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/%s", be_path, "script")); if (!script) { - LOGE(ERROR, "unable to read script from %s", be_path); + LOGED(ERROR, dev->domid, + "unable to read script from %s", be_path); rc = ERROR_FAIL; goto out; } rc = libxl__nic_type(gc, dev, &nictype); if (rc) { - LOG(ERROR, "error when fetching nic type"); + LOGD(ERROR, dev->domid, "error when fetching nic type"); rc = ERROR_FAIL; goto out; } @@ -161,14 +162,15 @@ static int libxl__hotplug_disk(libxl__gc *gc, libxl__device *dev, script = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("%s/%s", be_path, "script")); if (!script) { - LOGEV(ERROR, errno, "unable to read script from %s", be_path); + LOGEVD(ERROR, errno, dev->domid, + "unable to read script from %s", be_path); rc = ERROR_FAIL; goto error; } *env = get_hotplug_env(gc, script, dev); if (!*env) { - LOG(ERROR, "Failed to get hotplug environment"); + LOGD(ERROR, dev->domid, "Failed to get hotplug environment"); rc = ERROR_FAIL; goto error; } @@ -180,7 +182,7 @@ static int libxl__hotplug_disk(libxl__gc *gc, libxl__device *dev, (*args)[nr++] = NULL; assert(nr == arraysize); - LOG(DEBUG, "Args and environment ready"); + LOGD(DEBUG, dev->domid, "Args and environment ready"); rc = 1; error: @@ -197,7 +199,8 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, switch (dev->backend_kind) { case LIBXL__DEVICE_KIND_VBD: if (num_exec != 0) { - LOG(DEBUG, "num_exec %d, not running hotplug scripts", num_exec); + LOGD(DEBUG, dev->domid, + "num_exec %d, not running hotplug scripts", num_exec); rc = 0; goto out; } @@ -210,7 +213,8 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, */ if ((num_exec > 1) || (libxl_get_stubdom_id(CTX, dev->domid) && num_exec)) { - LOG(DEBUG, "num_exec %d, not running hotplug scripts", num_exec); + LOGD(DEBUG, dev->domid, + "num_exec %d, not running hotplug scripts", num_exec); rc = 0; goto out; } @@ -218,7 +222,8 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev, break; default: /* No need to execute any hotplug scripts */ - LOG(DEBUG, "backend_kind %d, no need to execute scripts", dev->backend_kind); + LOGD(DEBUG, dev->domid, + "backend_kind %d, no need to execute scripts", dev->backend_kind); rc = 0; break; }