From patchwork Wed Aug 16 12:52:13 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: 9903661 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 7C7F96038C for ; Wed, 16 Aug 2017 12:54:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E392289CD for ; Wed, 16 Aug 2017 12:54:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63097289E1; Wed, 16 Aug 2017 12:54:51 +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 DA84F289CD for ; Wed, 16 Aug 2017 12:54:50 +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 1dhxoP-0000X5-IN; Wed, 16 Aug 2017 12:52:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhxoO-0000MV-Bh for xen-devel@lists.xenproject.org; Wed, 16 Aug 2017 12:52:40 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 2B/FD-01996-71044995; Wed, 16 Aug 2017 12:52:39 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVyuP0Ov66Iw5R Ig4aTvBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bbGzdZCq6LVRzaNo2pgfGsYBcjJ4eEgJHE 24n/mEBsIYGFjBKLO0JBbDYBVYkN10+xgtgiAkoS91ZNBqrh4mAWeMwkMWPXcrAGYYFIiTc7v 4MVsQA1fOn8xwZi8wqYSBz6vJcJYoG8RMeBySwgNidQfPKGYywQy4wltvc0sk9g5F7AyLCKUb 04tagstUjXUC+pKDM9oyQ3MTNH19DAVC83tbg4MT01JzGpWC85P3cTI9C79QwMjDsYm3qdDzF KcjApifIGaU2JFOJLyk+pzEgszogvKs1JLT7EKMPBoSTBu8gOKCdYlJqeWpGWmQMMM5i0BAeP kghvmi1Qmre4IDG3ODMdInWKUZfj1YT/35iEWPLy81KlxHlvgcwQACnKKM2DGwEL+UuMslLCv IwMDAxCPAWpRbmZJajyrxjFORiVhHkl7IGm8GTmlcBtegV0BBPQEVfaJ4EcUZKIkJJqYCx8bP Az4mlAgN32feXPwxI4GH8d7whqW83ufff9K624T9vL/Tl/P9UqM2wPsXbKvh/OtzL2t/uO/sK gBBf9nXPLWrKEZs/3+GT6+J/2PNaq21P9rv2MnDKVTU6q14E37FXiynnmf0t3yz/4LBm73XzW wcJG1ROzExNsjwoclr8oXTVh4ZXZz5RYijMSDbWYi4oTAYWeh310AgAA X-Env-Sender: jgross@suse.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1502887956!91639944!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 29611 invoked from network); 16 Aug 2017 12:52:36 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-16.tower-206.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 16 Aug 2017 12:52:36 -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 DB380AE9E; Wed, 16 Aug 2017 12:52:35 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Wed, 16 Aug 2017 14:52:13 +0200 Message-Id: <20170816125219.5255-47-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 , Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Jan Beulich Subject: [Xen-devel] [PATCH v3 46/52] xen: carve out a generic parsing function from _cmdline_parse() 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 In order to support generic parameter parsing carve out the parser from _cmdline_parse(). As this generic function might be called after boot remove the __init annotations from all called sub-functions. Cc: Andrew Cooper Cc: George Dunlap Cc: Ian Jackson Cc: Jan Beulich Cc: Konrad Rzeszutek Wilk Cc: Stefano Stabellini Cc: Tim Deegan Cc: Wei Liu Signed-off-by: Juergen Gross Reviewed-by: Wei Liu Acked-by: Jan Beulich --- xen/common/kernel.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index c629ffa11c..1b66ad4e55 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -23,8 +23,7 @@ enum system_state system_state = SYS_STATE_early_boot; xen_commandline_t saved_cmdline; static const char __initconst opt_builtin_cmdline[] = CONFIG_CMDLINE; -static int __init assign_integer_param( - const struct kernel_param *param, uint64_t val) +static int assign_integer_param(const struct kernel_param *param, uint64_t val) { switch ( param->len ) { @@ -53,12 +52,13 @@ static int __init assign_integer_param( return 0; } -static void __init _cmdline_parse(const char *cmdline) +static int parse_params(const char *cmdline, const struct kernel_param *start, + const struct kernel_param *end) { char opt[128], *optval, *optkey, *q; const char *p = cmdline, *s, *key; const struct kernel_param *param; - int bool_assert, rctmp, rc; + int bool_assert, rctmp, rc, final_rc = 0; bool found; for ( ; ; ) @@ -100,7 +100,7 @@ static void __init _cmdline_parse(const char *cmdline) rc = 0; found = false; - for ( param = __setup_start; param < __setup_end; param++ ) + for ( param = start; param < end; param++ ) { if ( strcmp(param->name, optkey) ) { @@ -169,10 +169,23 @@ static void __init _cmdline_parse(const char *cmdline) } if ( rc ) + { printk("parameter \"%s\" has invalid value \"%s\"!\n", key, optval); + final_rc = rc; + } if ( !found ) + { printk("parameter \"%s\" unknown!\n", key); + final_rc = -EINVAL; + } } + + return final_rc; +} + +static void __init _cmdline_parse(const char *cmdline) +{ + parse_params(cmdline, __setup_start, __setup_end); } /** @@ -197,7 +210,7 @@ void __init cmdline_parse(const char *cmdline) #endif } -int __init parse_bool(const char *s) +int parse_bool(const char *s) { if ( !strcmp("no", s) || !strcmp("off", s) ||