From patchwork Mon Aug 14 07:08:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 9898279 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 D3E6260230 for ; Mon, 14 Aug 2017 07:12:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C69BF26538 for ; Mon, 14 Aug 2017 07:12:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB52426E4A; Mon, 14 Aug 2017 07:12:22 +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 652CC2859A 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 1dh9Uq-0003kk-Fu; Mon, 14 Aug 2017 07:09:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dh9Up-0003hr-Gl for xen-devel@lists.xenproject.org; Mon, 14 Aug 2017 07:09:07 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 00/63-04533-29C41995; Mon, 14 Aug 2017 07:09:06 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVyuP0Ov+4kn4m RBke+8Ft83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBlrdjayFyyRrljzcydzA+MisS5GTg4JASOJ txP/MXUxcnEICSxklHj6fiMjSIJNQFViw/VTrCC2iICSxL1Vk8GKmAUeM0nM2LWcCSQhLJAhM f96P1gRC1DDhZ6bYDavgKnEpL4GZogN8hIdByazgNicQPFL+5aC2UICJhJ9W7tYJjByL2BkWM WoXpxaVJZapGuml1SUmZ5RkpuYmaNraGCsl5taXJyYnpqTmFSsl5yfu4kR6N96BgbGHYxX2pw PMUpyMCmJ8ib49EYK8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuCd4T0xUkiwKDU9tSItMwcYaDBp CQ4eJRFeBWCwCfEWFyTmFmemQ6ROMepyvJrw/xuTEEtefl6qlDjvU5AZAiBFGaV5cCNgQX+JU VZKmJeRgYFBiKcgtSg3swRV/hWjOAejkjDvZ5ApPJl5JXCbXgEdwQR0RB/I/bzFJYkIKakGRt XetZu+tIbLvlIx3nLz4btagbm3nDnr1RfIZO08LPPN5PAB07f/mRPUu8+cTUl1PX/vRqm1Vaf X4mmWnMfefgz5P/Pc0gbHvk9WEvy2+4261OVk3Wu8Dx89Ya4tHp3wofvrN4bLCQ+CGb8zKd0T 0b/7oO9tZhhjwP7nDTvtdsRtfrTFf92E20osxRmJhlrMRcWJANDtPQJ1AgAA X-Env-Sender: jgross@suse.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1502694546!102259711!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 6458 invoked from network); 14 Aug 2017 07:09:06 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-16.tower-31.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 14 Aug 2017 07:09:06 -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 EB3CCAD16; Mon, 14 Aug 2017 07:09:05 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Mon, 14 Aug 2017 09:08:27 +0200 Message-Id: <20170814070849.20986-31-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 30/52] xen/drivers/char/console.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/drivers/char/console.c to indicate whether the parameter value was parsed successfully. 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 Acked-by: Wei Liu --- xen/drivers/char/console.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index f0659fba1b..daf0e1878d 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -67,7 +67,7 @@ enum con_timestamp_mode static enum con_timestamp_mode __read_mostly opt_con_timestamp_mode = TSM_NONE; -static void parse_console_timestamps(char *s); +static int parse_console_timestamps(char *s); custom_param("console_timestamps", parse_console_timestamps); /* conring_size: allows a large console ring than default (16kB). */ @@ -123,8 +123,8 @@ static int __read_mostly xenlog_guest_upper_thresh = static int __read_mostly xenlog_guest_lower_thresh = XENLOG_GUEST_LOWER_THRESHOLD; -static void parse_loglvl(char *s); -static void parse_guest_loglvl(char *s); +static int parse_loglvl(char *s); +static int parse_guest_loglvl(char *s); /* * := none|error|warning|info|debug|all @@ -156,23 +156,26 @@ static int __init __parse_loglvl(char *s, char **ps) return 2; /* sane fallback */ } -static void __init _parse_loglvl(char *s, int *lower, int *upper) +static int __init _parse_loglvl(char *s, int *lower, int *upper) { *lower = *upper = __parse_loglvl(s, &s); if ( *s == '/' ) *upper = __parse_loglvl(s+1, &s); if ( *upper < *lower ) *upper = *lower; + + return *s ? -EINVAL : 0; } -static void __init parse_loglvl(char *s) +static int __init parse_loglvl(char *s) { - _parse_loglvl(s, &xenlog_lower_thresh, &xenlog_upper_thresh); + return _parse_loglvl(s, &xenlog_lower_thresh, &xenlog_upper_thresh); } -static void __init parse_guest_loglvl(char *s) +static int __init parse_guest_loglvl(char *s) { - _parse_loglvl(s, &xenlog_guest_lower_thresh, &xenlog_guest_upper_thresh); + return _parse_loglvl(s, &xenlog_guest_lower_thresh, + &xenlog_guest_upper_thresh); } static char *loglvl_str(int lvl) @@ -603,16 +606,16 @@ static int printk_prefix_check(char *p, char **pp) ((loglvl < upper_thresh) && printk_ratelimit())); } -static void __init parse_console_timestamps(char *s) +static int __init parse_console_timestamps(char *s) { switch ( parse_bool(s) ) { case 0: opt_con_timestamp_mode = TSM_NONE; - return; + return 0; case 1: opt_con_timestamp_mode = TSM_DATE; - return; + return 0; } if ( *s == '\0' || /* Compat for old booleanparam() */ !strcmp(s, "date") ) @@ -623,6 +626,10 @@ static void __init parse_console_timestamps(char *s) opt_con_timestamp_mode = TSM_BOOT; else if ( !strcmp(s, "none") ) opt_con_timestamp_mode = TSM_NONE; + else + return -EINVAL; + + return 0; } static void printk_start_of_line(const char *prefix)