From patchwork Wed Aug 16 12:51:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 9903679 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 12B366038C for ; Wed, 16 Aug 2017 12:55:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03C3B289DD for ; Wed, 16 Aug 2017 12:55:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EBCBD289E1; Wed, 16 Aug 2017 12:55:01 +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 88D07289DD for ; Wed, 16 Aug 2017 12:55:01 +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 1dhxoD-0008Jp-Js; Wed, 16 Aug 2017 12:52:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhxoC-0008Hi-0H for xen-devel@lists.xenproject.org; Wed, 16 Aug 2017 12:52:28 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 9D/0A-01862-B0044995; Wed, 16 Aug 2017 12:52:27 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVyuP0Ovy6Xw5R Ig1WvDSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oznbROZC07wVXReOM3UwLiFu4uRk0NCwEji 7cR/TF2MXBxCAgsZJQ6s/MMMkmATUJXYcP0UK4gtIqAkcW/VZCYQm1mgUOJkdx9YXFggQeLl2 +/sIDYLUP2tiU2MIDavgInEvgtHWCEWyEt0HJjMAmJzAsUnbzgGZgsJGEts72lkn8DIvYCRYR WjRnFqUVlqka6RpV5SUWZ6RkluYmaOrqGBsV5uanFxYnpqTmJSsV5yfu4mRqB/6xkYGHcwNu3 1O8QoycGkJMobpDUlUogvKT+lMiOxOCO+qDQntfgQowwHh5IEr5gdUE6wKDU9tSItMwcYaDBp CQ4eJRHeNFugNG9xQWJucWY6ROoUoy7Hqwn/vzEJseTl56VKifNmgswQACnKKM2DGwEL+kuMs lLCvIwMDAxCPAWpRbmZJajyrxjFORiVhHkl7IGm8GTmlcBtegV0BBPQEVfaJ4EcUZKIkJJqYA x3dCp5qLM/rXDBHDMHS8mcmOCdnx7e1Dp8PTZq6olVojMnG/X+64ySZ143xaBz2Ykm1kMRD0K Sjub+OLRaZ/O1DUYnXPwEdBjN03et3L/ygUDfFZaZV8/bJ9Z1CosHqL/+eHLuuRWHi5k4t246 LsC5X3QVa1w0z7r4H0kO72exe5RkRVb8OKPEUpyRaKjFXFScCABpys7JdQIAAA== X-Env-Sender: jgross@suse.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1502887946!106210521!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4581 invoked from network); 16 Aug 2017 12:52:26 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-15.tower-31.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 16 Aug 2017 12:52:26 -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 mx1.suse.de (Postfix) with ESMTP id 81C7AAD88; Wed, 16 Aug 2017 12:52:26 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Wed, 16 Aug 2017 14:51:42 +0200 Message-Id: <20170816125219.5255-16-jgross@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170816125219.5255-1-jgross@suse.com> References: <20170816125219.5255-1-jgross@suse.com> Cc: Juergen Gross , Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH v3 15/52] xen/arch/x86/nmi.c: let custom parameter parsing routines return errno 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 Modify the custom parameter parsing routines in: xen/arch/x86/nmi.c to indicate whether the parameter value was parsed successfully. Cc: Jan Beulich Cc: Andrew Cooper Signed-off-by: Juergen Gross Acked-by: Wei Liu Acked-by: Jan Beulich --- V3: - cosmetic changes (Jan Beulich) --- xen/arch/x86/nmi.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index 8914581f66..17013192dd 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -46,35 +46,44 @@ bool __initdata opt_watchdog; /* watchdog_force: If true, process unknown NMIs when running the watchdog. */ bool watchdog_force; -static void __init parse_watchdog(char *s) +static int __init parse_watchdog(const char *s) { if ( !*s ) { opt_watchdog = true; - return; + return 0; } switch ( parse_bool(s) ) { case 0: opt_watchdog = false; - return; + return 0; case 1: opt_watchdog = true; - return; + return 0; } if ( !strcmp(s, "force") ) watchdog_force = opt_watchdog = true; + else + return -EINVAL; + + return 0; } custom_param("watchdog", parse_watchdog); /* opt_watchdog_timeout: Number of seconds to wait before panic. */ static unsigned int opt_watchdog_timeout = 5; -static void parse_watchdog_timeout(char * s) + +static int parse_watchdog_timeout(const char *s) { - opt_watchdog_timeout = simple_strtoull(s, NULL, 0); + const char *q; + + opt_watchdog_timeout = simple_strtoull(s, &q, 0); opt_watchdog = !!opt_watchdog_timeout; + + return *q ? -EINVAL : 0; } custom_param("watchdog_timeout", parse_watchdog_timeout);