From patchwork Mon Oct 31 16:48:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 9406015 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 F2E4C60588 for ; Mon, 31 Oct 2016 16:50:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E13C42935C for ; Mon, 31 Oct 2016 16:50:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D2FE52935B; Mon, 31 Oct 2016 16:50:56 +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 8EC0D29341 for ; Mon, 31 Oct 2016 16:50:56 +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 1c1Fld-00040m-Bf; Mon, 31 Oct 2016 16:49:01 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c1Flb-0003xv-ES for xen-devel@lists.xen.org; Mon, 31 Oct 2016 16:48:59 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id BF/13-14466-AF577185; Mon, 31 Oct 2016 16:48:58 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVyuP0Ov+7PUvE Igz+nLC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ow/P8MKzvNVHH/3gb2B8TxPFyMnh4SAkcTb if+Yuhi5OIQEFjJKrHu/mAkkwSagKrHh+ilWEFtEwEri4f5rYDazQJTEkbbdLCC2sICHRN+dP jYQmwWofmLDPXYQm1fAQeJ36yw2iAVyEtdnTgebyQkUf73mGjOILSRgLzFx2SHmCYzcCxgZVj FqFKcWlaUW6Rqa6iUVZaZnlOQmZuboGhqY6eWmFhcnpqfmJCYV6yXn525iBHqXAQh2MH5bFnC IUZKDSUmU92uYeIQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCd6mEqCcYFFqempFWmYOMMxg0hIc PEoivHOLgdK8xQWJucWZ6RCpU4y6HG92vXzAJMSSl5+XKiXOKwQyQwCkKKM0D24ELOQvMcpKC fMyAh0lxFOQWpSbWYIq/4pRnINRSZh3AsgUnsy8ErhNr4COYAI6Iq1QBOSIkkSElFQDo+7KuR WHZqt2K7UvTb5X+HhZw+HbFgt4EjkVeKJOsp+pO7z1WtW5+SUFV1Rc3x7wmCMQGhQXskqqQCO H/bZe7KJyGQ2lvaE2n6S+vVRRnli3a7emdfw7QW6JqB3uzjFBskJbOrdOk+0IuMOwmDlYpy3J 7En13MdrzmpbNebHa/bLO/3ikJFRYinOSDTUYi4qTgQAQUtRSnQCAAA= X-Env-Sender: jgross@suse.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1477932537!40822304!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.0.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38098 invoked from network); 31 Oct 2016 16:48:57 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-15.tower-21.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 31 Oct 2016 16:48:57 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 7373CAD22; Mon, 31 Oct 2016 16:48:54 +0000 (UTC) From: Juergen Gross To: linux-kernel@vger.kernel.org, xen-devel@lists.xen.org Date: Mon, 31 Oct 2016 17:48:30 +0100 Message-Id: <1477932510-28594-13-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.6 In-Reply-To: <1477932510-28594-1-git-send-email-jgross@suse.com> References: <1477932510-28594-1-git-send-email-jgross@suse.com> Cc: Juergen Gross , boris.ostrovsky@oracle.com, david.vrabel@citrix.com Subject: [Xen-devel] [PATCH 12/12] xen: make use of xenbus_read_unsigned() in xenbus 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use xenbus_read_unsigned() instead of xenbus_scanf() when possible. This requires to change the type of the reads from int to unsigned, but these cases have been wrong before: negative values are not allowed for the modified cases. Signed-off-by: Juergen Gross --- drivers/xen/xenbus/xenbus_probe_backend.c | 8 +------- drivers/xen/xenbus/xenbus_xs.c | 7 +++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/xen/xenbus/xenbus_probe_backend.c b/drivers/xen/xenbus/xenbus_probe_backend.c index 04f7f85..37929df 100644 --- a/drivers/xen/xenbus/xenbus_probe_backend.c +++ b/drivers/xen/xenbus/xenbus_probe_backend.c @@ -224,13 +224,7 @@ static int read_frontend_details(struct xenbus_device *xendev) int xenbus_dev_is_online(struct xenbus_device *dev) { - int rc, val; - - rc = xenbus_scanf(XBT_NIL, dev->nodename, "online", "%d", &val); - if (rc != 1) - val = 0; /* no online node present */ - - return val; + return !!xenbus_read_unsigned(dev->nodename, "online", 0); } EXPORT_SYMBOL_GPL(xenbus_dev_is_online); diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c index 99dfdfa..6afb993 100644 --- a/drivers/xen/xenbus/xenbus_xs.c +++ b/drivers/xen/xenbus/xenbus_xs.c @@ -687,7 +687,7 @@ static bool xen_strict_xenbus_quirk(void) } static void xs_reset_watches(void) { - int err, supported = 0; + int err; if (!xen_hvm_domain() || xen_initial_domain()) return; @@ -695,9 +695,8 @@ static void xs_reset_watches(void) if (xen_strict_xenbus_quirk()) return; - err = xenbus_scanf(XBT_NIL, "control", - "platform-feature-xs_reset_watches", "%d", &supported); - if (err != 1 || !supported) + if (!xenbus_read_unsigned("control", + "platform-feature-xs_reset_watches", 0)) return; err = xs_error(xs_single(XBT_NIL, XS_RESET_WATCHES, "", NULL));