From patchwork Wed Aug 16 12:51:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 9903677 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 30A7A6038C for ; Wed, 16 Aug 2017 12:55:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22FF4289CD for ; Wed, 16 Aug 2017 12:55:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17E7D289E0; 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 C87CB289CD for ; Wed, 16 Aug 2017 12:55:00 +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 1dhxoF-0008M4-64; Wed, 16 Aug 2017 12:52:31 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhxoD-0008Fy-Av for xen-devel@lists.xenproject.org; Wed, 16 Aug 2017 12:52:29 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id 59/7E-03406-D0044995; Wed, 16 Aug 2017 12:52:29 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVyuP0Ovy6Pw5R Ig1vPZCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyDTx8yFrRxV2zqfMLawHiIo4uRk0NCwEji 7cR/TF2MXBxCAgsZJfqO/mMDSbAJqEpsuH6KFcQWEVCSuLdqMhOIzSxQKHGyuw8sLiyQKrHl2 Tp2EJsFqP75zOOMIDavgInEmv9PmSEWyEt0HJjMAmJzAsUnbzgGZgsJGEts72lkn8DIvYCRYR WjRnFqUVlqka6xgV5SUWZ6RkluYmaOrqGBmV5uanFxYnpqTmJSsV5yfu4mRqB/GYBgB+PftYG HGCU5mJREeYO0pkQK8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuCVtAfKCRalpqdWpGXmAAMNJi3B waMkwusKkuYtLkjMLc5Mh0idYtTleDXh/zcmIZa8/LxUKXHeW3ZARQIgRRmleXAjYEF/iVFWS piXEegoIZ6C1KLczBJU+VeM4hyMSsK8EiCreDLzSuA2vQI6ggnoiCvtk0COKElESEk1MAYuP1 987ugl366Ix6+FnS83tYvmH9UTzOsPbFrUZpijcc1XN8fBKGa3de/rTUvuLTUK9jkc+MbXXjO lPyp90iS2do/69ku21crbGdvzHPurfD8tv/POxjtmupvswkvvvY7u5YuQLZt05vSh5pcaDElp B/V1t0841fiacf0sQb+rj09Ei95IUGIpzkg01GIuKk4EAI1Y8u91AgAA X-Env-Sender: jgross@suse.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1502887948!106580485!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 48569 invoked from network); 16 Aug 2017 12:52:28 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-5.tower-27.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 16 Aug 2017 12:52:28 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 111D7AE94; Wed, 16 Aug 2017 12:52:28 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Wed, 16 Aug 2017 14:51:47 +0200 Message-Id: <20170816125219.5255-21-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 20/52] xen/arch/x86/shutdown.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/shutdown.c to indicate whether the parameter value was parsed successfully. Cc: Jan Beulich Cc: Andrew Cooper Signed-off-by: Juergen Gross --- V3: - dont stop loop at first invalid character (Jan Beulich) --- xen/arch/x86/shutdown.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c index f63b8a668f..862384a8eb 100644 --- a/xen/arch/x86/shutdown.c +++ b/xen/arch/x86/shutdown.c @@ -51,8 +51,11 @@ static int reboot_mode; * efi Use the EFI reboot (if running under EFI) */ static enum reboot_type reboot_type = BOOT_INVALID; -static void __init set_reboot_type(char *str) + +static int __init set_reboot_type(const char *str) { + int rc = 0; + for ( ; ; ) { switch ( *str ) @@ -74,6 +77,8 @@ static void __init set_reboot_type(char *str) case 't': reboot_type = *str; break; + default: + rc = -EINVAL; } if ( (str = strchr(str, ',')) == NULL ) break; @@ -82,6 +87,8 @@ static void __init set_reboot_type(char *str) if ( reboot_type == BOOT_EFI && !efi_enabled(EFI_RS) ) reboot_type = BOOT_INVALID; + + return rc; } custom_param("reboot", set_reboot_type);