From patchwork Mon Aug 14 07:08:12 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: 9898253 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 37B70603B5 for ; Mon, 14 Aug 2017 07:12:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2929626E1A for ; Mon, 14 Aug 2017 07:12:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E19526E4A; Mon, 14 Aug 2017 07:12:20 +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 A022E285C5 for ; Mon, 14 Aug 2017 07:12:15 +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 1dh9Uo-0003hg-T7; Mon, 14 Aug 2017 07:09:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dh9Un-0003fK-3i for xen-devel@lists.xenproject.org; Mon, 14 Aug 2017 07:09:05 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 6D/EF-01993-F8C41995; Mon, 14 Aug 2017 07:09:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVyuP0Ov26vz8R Ig+W7xC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozHl0+xFjznrdjz8RV7A+MDri5GTg4JASOJ txP/MXUxcnEICSxklNj+dyoTSIJNQFViw/VTrCC2iICSxL1Vk8HizAKFEie7+4DiHBzCAgkSf 76VgoRZgMoPz+9nA7F5BUwlLj/9wggxX16i48BkFhCbEyh+ad9SMFtIwESib2sXywRG7gWMDK sYNYpTi8pSi3SNjPWSijLTM0pyEzNzdA0NTPVyU4uLE9NTcxKTivWS83M3MQK9W8/AwLiDcUe 73yFGSQ4mJVHeBJ/eSCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvCu9JkYKCRalpqdWpGXmAMMM Ji3BwaMkwlsOkuYtLkjMLc5Mh0idYtTleDXh/zcmIZa8/LxUKXHeZyBFAiBFGaV5cCNgIX+JU VZKmJeRgYFBiKcgtSg3swRV/hWjOAejkjBvN8gUnsy8ErhNr4COYAI6og/kft7ikkSElFQDo4 HTzbvZ9/IL3/nP/hdibf3Pnj1/peHbTP4ZJ/U+aSgbBkqp7X4koGNxS5JbtN/53Mp3vUYOWgt vrrt7LHqx7dG0mAiGwy+394d7vlT93vsj0qe4VV9y4/8dE3icXpwpK7POP67cz5ybfcGsUdDy k3zHkpgJG/aUhjzT2N2daMFxjOFSyKdaJZbijERDLeai4kQA/cNbQHQCAAA= X-Env-Sender: jgross@suse.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1502694541!104230783!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 24704 invoked from network); 14 Aug 2017 07:09:01 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-7.tower-206.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 14 Aug 2017 07:09:01 -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 0B80CABC3; Mon, 14 Aug 2017 07:09:01 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Mon, 14 Aug 2017 09:08:12 +0200 Message-Id: <20170814070849.20986-16-jgross@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170814070849.20986-1-jgross@suse.com> References: <20170814070849.20986-1-jgross@suse.com> Cc: Juergen Gross , Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH v2 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 --- xen/arch/x86/nmi.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index 8914581f66..038c5608e1 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -46,35 +46,43 @@ 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(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(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);