From patchwork Wed Aug 16 12:51:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 9903691 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 9BF2E6038C for ; Wed, 16 Aug 2017 12:55:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DF76289CD for ; Wed, 16 Aug 2017 12:55:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82DA3289E0; Wed, 16 Aug 2017 12:55:05 +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 B37CC289CD for ; Wed, 16 Aug 2017 12:55:03 +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 1dhxoI-0008W3-RN; Wed, 16 Aug 2017 12:52:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhxoH-0008QM-DF for xen-devel@lists.xenproject.org; Wed, 16 Aug 2017 12:52:33 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 8B/EB-01862-01044995; Wed, 16 Aug 2017 12:52:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVyuP0Ovy6/w5R Ig2/PzCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxdC9tYCq7JVbx5voelgfGJRBcjJ4eEgJHE 24n/mLoYuTiEBBYySvzctoQNJMEmoCqx4fopVhBbREBJ4t6qyWBFzAKPmSRm7FrOBJIQFsiQO H37PDOIzQLUcOpMCyOIzStgInFyxxImiA3yEh0HJrOA2JxA8ckbjoHZQgLGEtt7GtknMHIvYG RYxahenFpUllqka6qXVJSZnlGSm5iZo2toYKyXm1pcnJiempOYVKyXnJ+7iRHo33oGBsYdjJe /Oh1ilORgUhLlDdKaEinEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgneRHVBOsCg1PbUiLTMHGGgw aQkOHiUR3jRboDRvcUFibnFmOkTqFKMux6sJ/78xCbHk5eelSonzZoLMEAApyijNgxsBC/pLj LJSwryMDAwMQjwFqUW5mSWo8q8YxTkYlYR5r4JM4cnMK4Hb9AroCCagI660TwI5oiQRISXVwM ie0hl2+OgWmzgZlrcnfqvq8pUeUksOKnDZ9W2lpOqyDY2FDtcmLTuz14zZ7CJHkKIr//6OY85 b7796Ksxywp+lVbUl2EDAiOHL7qk7lyszGP32zF6rdeefzrcl9tpd+R6L+35e8dSbnfjM+tXX V9PKKxeUKlY8WHnNruTj/ZcZszaWbnf6sUSJpTgj0VCLuag4EQDZui64dQIAAA== X-Env-Sender: jgross@suse.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1502887951!93460009!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 5897 invoked from network); 16 Aug 2017 12:52:31 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-12.tower-31.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 16 Aug 2017 12:52:31 -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 8D64FAE84; Wed, 16 Aug 2017 12:52:31 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Wed, 16 Aug 2017 14:51:57 +0200 Message-Id: <20170816125219.5255-31-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 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 Acked-by: Jan Beulich --- xen/drivers/char/console.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index f0659fba1b..17ad02083d 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(const 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(const char *s); +static int parse_guest_loglvl(const char *s); /* * := none|error|warning|info|debug|all @@ -145,7 +145,7 @@ static atomic_t print_everything = ATOMIC_INIT(0); return (lvlnum); \ } -static int __init __parse_loglvl(char *s, char **ps) +static int __init __parse_loglvl(const char *s, const char **ps) { ___parse_loglvl(s, ps, "none", 0); ___parse_loglvl(s, ps, "error", 1); @@ -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(const 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(const 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(const 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(const 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)