From patchwork Wed Aug 16 12:52:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 9903663 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 18A796038C for ; Wed, 16 Aug 2017 12:54:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09E59289CD for ; Wed, 16 Aug 2017 12:54:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F2DF5289E1; 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 8525E289CD for ; Wed, 16 Aug 2017 12:54:51 +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-0000YL-Rb; 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-0000MQ-BV for xen-devel@lists.xenproject.org; Wed, 16 Aug 2017 12:52:40 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id ED/07-01994-71044995; Wed, 16 Aug 2017 12:52:39 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVyuP0Ov66Yw5R Ig43tJhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aqhfNYCuapVTQ8PMHawPhNvouRk0NCwEji 7cR/TCC2kMBCRomOF1UgNpuAqsSG66dYQWwRASWJe6smA9VwcTALPGaSmLFrOZDDwSEsEC5x/ L0iSA0LUP3HEw/ZQWxeAROJmfdnsEDMl5foODAZzOYEik/ecIwFYpexxPaeRvYJjNwLGBlWMW oUpxaVpRbpGhnrJRVlpmeU5CZm5ugaGpjq5aYWFyemp+YkJhXrJefnbmIEereegYFxB+OOdr9 DjJIcTEqivEFaUyKF+JLyUyozEosz4otKc1KLDzHKcHAoSfAusgPKCRalpqdWpGXmAMMMJi3B waMkwptmC5TmLS5IzC3OTIdInWLU5Xg14f83JiGWvPy8VClx3kyQGQIgRRmleXAjYCF/iVFWS piXkYGBQYinILUoN7MEVf4VozgHo5Iwr4Q90BSezLwSuE2vgI5gAjriSvskkCNKEhFSUg2MPS HSmVuDeP1O58+VUuEoeVfo+0TlwMwAuW/3wgKk/inpaCs9UKsqbpy9wtFuH8+/Mqlfj+yOlSx a++HL9PYpTiu5/f6ZWF/WTeO7/nn2Eb7bC06nH26bnu1t8qm0JzlRL8Yh7oV6xiKPfys3nGEp 8y85/GjOceVPMrefqEjevizsc6z5vsFlJZbijERDLeai4kQAB2f6u3QCAAA= X-Env-Sender: jgross@suse.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1502887958!91639954!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30058 invoked from network); 16 Aug 2017 12:52:38 -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:38 -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 7AB4BAEB0; Wed, 16 Aug 2017 12:52:38 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Wed, 16 Aug 2017 14:52:19 +0200 Message-Id: <20170816125219.5255-53-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 52/52] xen: make some console related parameters settable at runtime 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 Support modifying conswitch, console_timestamps, loglvl and guest_loglvl at runtime. 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: Jan Beulich Reviewed-by: Wei Liu --- V3: - *_runtime_param() now includes boot parameter setting (Jan Beulich) --- docs/misc/xen-command-line.markdown | 8 ++++++++ xen/drivers/char/console.c | 18 +++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 4002eab08b..9797c8db2d 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -391,6 +391,8 @@ makes sense on its own. > Default: `none` +> Can be modified at runtime + Specify which timestamp format Xen should use for each console line. * `none`: No timestamps @@ -417,6 +419,8 @@ into the console ring buffer. > Default: `conswitch=a` +> Can be modified at runtime + Specify which character should be used to switch serial input between Xen and dom0. The required sequence is CTRL-<switch char> three times. @@ -898,6 +902,8 @@ maximum number of maptrack frames domain. > Default: `guest_loglvl=none/warning` +> Can be modified at runtime + Set the logging level for Xen guests. Any log message with equal more more importance will be printed. @@ -1164,6 +1170,8 @@ if left disabled by the BIOS. > Default: `loglvl=warning` +> Can be modified at runtime + Set the logging level for Xen. Any log message with equal more more importance will be printed. diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 17ad02083d..068e2f617c 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -40,7 +40,7 @@ string_param("console", opt_console); /* Char 2: If this character is 'x', then do not auto-switch to DOM0 when it */ /* boots. Any other value, or omitting the char, enables auto-switch */ static unsigned char __read_mostly opt_conswitch[3] = "a"; -string_param("conswitch", opt_conswitch); +string_runtime_param("conswitch", opt_conswitch); /* sync_console: force synchronous console output (useful for debugging). */ static bool_t __initdata opt_sync_console; @@ -68,7 +68,7 @@ enum con_timestamp_mode static enum con_timestamp_mode __read_mostly opt_con_timestamp_mode = TSM_NONE; static int parse_console_timestamps(const char *s); -custom_param("console_timestamps", parse_console_timestamps); +custom_runtime_param("console_timestamps", parse_console_timestamps); /* conring_size: allows a large console ring than default (16kB). */ static uint32_t __initdata opt_conring_size; @@ -134,8 +134,8 @@ static int parse_guest_loglvl(const char *s); * Similar definitions for guest_loglvl, but applies to guest tracing. * Defaults: loglvl=warning ; guest_loglvl=none/warning */ -custom_param("loglvl", parse_loglvl); -custom_param("guest_loglvl", parse_guest_loglvl); +custom_runtime_param("loglvl", parse_loglvl); +custom_runtime_param("guest_loglvl", parse_guest_loglvl); static atomic_t print_everything = ATOMIC_INIT(0); @@ -145,7 +145,7 @@ static atomic_t print_everything = ATOMIC_INIT(0); return (lvlnum); \ } -static int __init __parse_loglvl(const char *s, const char **ps) +static int __parse_loglvl(const char *s, const char **ps) { ___parse_loglvl(s, ps, "none", 0); ___parse_loglvl(s, ps, "error", 1); @@ -156,7 +156,7 @@ static int __init __parse_loglvl(const char *s, const char **ps) return 2; /* sane fallback */ } -static int __init _parse_loglvl(const char *s, int *lower, int *upper) +static int _parse_loglvl(const char *s, int *lower, int *upper) { *lower = *upper = __parse_loglvl(s, &s); if ( *s == '/' ) @@ -167,12 +167,12 @@ static int __init _parse_loglvl(const char *s, int *lower, int *upper) return *s ? -EINVAL : 0; } -static int __init parse_loglvl(const char *s) +static int parse_loglvl(const char *s) { return _parse_loglvl(s, &xenlog_lower_thresh, &xenlog_upper_thresh); } -static int __init parse_guest_loglvl(const char *s) +static int parse_guest_loglvl(const char *s) { return _parse_loglvl(s, &xenlog_guest_lower_thresh, &xenlog_guest_upper_thresh); @@ -606,7 +606,7 @@ static int printk_prefix_check(char *p, char **pp) ((loglvl < upper_thresh) && printk_ratelimit())); } -static int __init parse_console_timestamps(const char *s) +static int parse_console_timestamps(const char *s) { switch ( parse_bool(s) ) {