From patchwork Mon Aug 14 07:08:43 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: 9898201 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 8C23460230 for ; Mon, 14 Aug 2017 07:12:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BB4526E1A for ; Mon, 14 Aug 2017 07:12:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 709BD285FE; Mon, 14 Aug 2017 07:12:16 +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 424C927F92 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 1dh9Uu-0003u2-TO; Mon, 14 Aug 2017 07:09:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dh9Ut-0003nE-Hg for xen-devel@lists.xenproject.org; Mon, 14 Aug 2017 07:09:11 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id EB/3E-01732-79C41995; Mon, 14 Aug 2017 07:09:11 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVyuP0Ov+40n4m RBvtvall83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBmLfykX9IhXPJx2iqmB8bpgFyMnh4SAkcTb if+Yuhi5OIQEFjJKrDp9lBkkwSagKrHh+ilWEFtEQEni3qrJYEXMAo+ZJGbsWs4EkhAWiJQ4d vM/C4jNAtSwatYTsDivgKlE3/1tTBAb5CU6DkwGq+EEil/atxTMFhIwkejb2sUygZF7ASPDKk aN4tSistQiXUMLvaSizPSMktzEzBxdQwNjvdzU4uLE9NScxKRiveT83E2MQP/WMzAw7mD8fdr zEKMkB5OSKG+CT2+kEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQleKe+JkUKCRanpqRVpmTnAQINJ S3DwKInwlnsBpXmLCxJzizPTIVKnGHU5Xk34/41JiCUvPy9VSpw3BmSGAEhRRmke3AhY0F9il JUS5mVkYGAQ4ilILcrNLEGVf8UozsGoJMzLBDKFJzOvBG7TK6AjmICO6AO5n7e4JBEhJdXAyF LH9zl8LnPRVKPdt7SVUreFrhc+d+oz+3rOlFTh6NMbRXsZdCVc5MtaD/X1Hb9pEnnuYvpxm/3 Xf75cpX5bVk1tpW14yPyZUX59+y5M6l38a/FNpkLBCgmJPRaHZotH12++VVUStF6OXW3Tncg/ Sic6X3Ksf/HX7Po2u/kxcy1k5fTWbYv1VmIpzkg01GIuKk4EAN9yyqp1AgAA X-Env-Sender: jgross@suse.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1502694550!71311979!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 38888 invoked from network); 14 Aug 2017 07:09:10 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-6.tower-31.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 14 Aug 2017 07:09:10 -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 62719AD32; Mon, 14 Aug 2017 07:09:10 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Mon, 14 Aug 2017 09:08:43 +0200 Message-Id: <20170814070849.20986-47-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 , Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Jan Beulich Subject: [Xen-devel] [PATCH v2 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 | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 756380be5b..c05198b226 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) { unsigned int bits = param->len * BITS_PER_BYTE; @@ -50,12 +49,13 @@ static int __init assign_integer_param( -EOVERFLOW : 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; const struct kernel_param *param; - int bool_assert, rc = 0; + int bool_assert, rc = 0, final_rc = 0; for ( ; ; ) { @@ -93,7 +93,7 @@ static void __init _cmdline_parse(const char *cmdline) if ( !bool_assert ) optkey += 3; - for ( param = __setup_start; param < __setup_end; param++ ) + for ( param = start; param < end; param++ ) { if ( strcmp(param->name, optkey) ) { @@ -158,11 +158,24 @@ static void __init _cmdline_parse(const char *cmdline) } if ( rc ) + { printk("parameter \"%s\" has invalid value \"%s\"!\n", optkey, optval); - if ( param >= __setup_end ) + final_rc = rc; + } + if ( param >= end ) + { printk("parameter \"%s\" unknown!\n", optkey); + final_rc = -EINVAL; + } } + + return final_rc; +} + +static void __init _cmdline_parse(const char *cmdline) +{ + parse_params(cmdline, __setup_start, __setup_end); } /** @@ -187,7 +200,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) ||