From patchwork Mon Feb 8 17:07:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8252591 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 649C9BEEE5 for ; Mon, 8 Feb 2016 17:10:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5DB3820145 for ; Mon, 8 Feb 2016 17:10:20 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3D01B203B8 for ; Mon, 8 Feb 2016 17:10:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSpI2-0007Ih-MM; Mon, 08 Feb 2016 17:07:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSpI1-0007Hl-4G for xen-devel@lists.xen.org; Mon, 08 Feb 2016 17:07:53 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 6C/EE-28221-86BC8B65; Mon, 08 Feb 2016 17:07:52 +0000 X-Env-Sender: prvs=839174cdf=Andrew.Cooper3@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1454951270!22330396!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10516 invoked from network); 8 Feb 2016 17:07:51 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Feb 2016 17:07:51 -0000 X-IronPort-AV: E=Sophos;i="5.22,417,1449532800"; d="scan'208";a="336802564" From: Andrew Cooper To: Xen-devel Date: Mon, 8 Feb 2016 17:07:45 +0000 Message-ID: <1454951267-30034-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH 1/3] xen/x86: Drop the uses of invbool_param() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There are only four users, and invbool_param() is an unnecessary cognitive overhead to use. Convert the four users to boolean_param(), and consistency use opt_* for the variable name. No change to the behaviour of the command line arguments. Signed-off-by: Andrew Cooper --- CC: Jan Beulich --- xen/arch/x86/cpu/mcheck/mce.c | 8 ++++---- xen/arch/x86/cpu/mcheck/mce_intel.c | 8 ++++---- xen/arch/x86/cpu/mcheck/non-fatal.c | 2 +- xen/arch/x86/cpu/mcheck/x86_mca.h | 2 +- xen/arch/x86/cpu/mwait-idle.c | 6 +++--- xen/arch/x86/setup.c | 12 ++++++------ 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index d746d0e..cc446eb 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -30,8 +30,8 @@ #include "util.h" #include "vmce.h" -bool_t __read_mostly mce_disabled; -invbool_param("mce", mce_disabled); +bool_t __read_mostly opt_mce = 1; +boolean_param("mce", opt_mce); bool_t __read_mostly mce_broadcast = 0; bool_t is_mc_panic; unsigned int __read_mostly nr_mce_banks; @@ -627,7 +627,7 @@ static void set_poll_bankmask(struct cpuinfo_x86 *c) mb = per_cpu(poll_bankmask, cpu); BUG_ON(!mb); - if (cmci_support && !mce_disabled) { + if (cmci_support && opt_mce) { mb->num = per_cpu(no_cmci_banks, cpu)->num; bitmap_copy(mb->bank_map, per_cpu(no_cmci_banks, cpu)->bank_map, nr_mce_banks); @@ -734,7 +734,7 @@ void mcheck_init(struct cpuinfo_x86 *c, bool_t bsp) { enum mcheck_type inited = mcheck_none; - if ( mce_disabled ) + if ( !opt_mce ) { if ( bsp ) printk(XENLOG_INFO "MCE support disabled by bootparam\n"); diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index 193366b..0b7fe53 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -587,7 +587,7 @@ static void cmci_discover(void) static void mce_set_owner(void) { - if (!cmci_support || mce_disabled == 1) + if (!cmci_support || !opt_mce) return; cmci_discover(); @@ -600,7 +600,7 @@ static void __cpu_mcheck_distribute_cmci(void *unused) static void cpu_mcheck_distribute_cmci(void) { - if (cmci_support && !mce_disabled) + if (cmci_support && opt_mce) on_each_cpu(__cpu_mcheck_distribute_cmci, NULL, 0); } @@ -608,7 +608,7 @@ static void clear_cmci(void) { int i; - if (!cmci_support || mce_disabled == 1) + if (!cmci_support || !opt_mce) return; mce_printk(MCE_VERBOSE, "CMCI: clear_cmci support on CPU%d\n", @@ -630,7 +630,7 @@ static void cpu_mcheck_disable(void) { clear_in_cr4(X86_CR4_MCE); - if (cmci_support && !mce_disabled) + if (cmci_support && opt_mce) clear_cmci(); } diff --git a/xen/arch/x86/cpu/mcheck/non-fatal.c b/xen/arch/x86/cpu/mcheck/non-fatal.c index 8cd6635..da5cae9 100644 --- a/xen/arch/x86/cpu/mcheck/non-fatal.c +++ b/xen/arch/x86/cpu/mcheck/non-fatal.c @@ -91,7 +91,7 @@ static int __init init_nonfatal_mce_checker(void) struct cpuinfo_x86 *c = &boot_cpu_data; /* Check for MCE support */ - if (mce_disabled || !mce_available(c)) + if (!opt_mce || !mce_available(c)) return -ENODEV; if (__get_cpu_var(poll_bankmask) == NULL) diff --git a/xen/arch/x86/cpu/mcheck/x86_mca.h b/xen/arch/x86/cpu/mcheck/x86_mca.h index 76467d6..e25d619 100644 --- a/xen/arch/x86/cpu/mcheck/x86_mca.h +++ b/xen/arch/x86/cpu/mcheck/x86_mca.h @@ -153,6 +153,6 @@ struct mca_error_handler }; /* Global variables */ -extern bool_t mce_disabled; +extern bool_t opt_mce; #endif /* X86_MCA_H */ diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 87f0e60..b86bdd7 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -70,8 +70,8 @@ # define pr_debug(fmt...) #endif -static __initdata bool_t no_mwait_idle; -invbool_param("mwait-idle", no_mwait_idle); +static __initdata bool_t opt_mwait_idle = 1; +boolean_param("mwait-idle", opt_mwait_idle); static unsigned int mwait_substates; @@ -832,7 +832,7 @@ static int __init mwait_idle_probe(void) !mwait_substates) return -ENODEV; - if (!max_cstate || no_mwait_idle) { + if (!max_cstate || !opt_mwait_idle) { pr_debug(PREFIX "disabled\n"); return -EPERM; } diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 76c7b0f..b8a28d7 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -60,12 +60,12 @@ static unsigned int __initdata max_cpus; integer_param("maxcpus", max_cpus); /* smep: Enable/disable Supervisor Mode Execution Protection (default on). */ -static bool_t __initdata disable_smep; -invbool_param("smep", disable_smep); +static bool_t __initdata opt_smep = 1; +boolean_param("smep", opt_smep); /* smap: Enable/disable Supervisor Mode Access Prevention (default on). */ -static bool_t __initdata disable_smap; -invbool_param("smap", disable_smap); +static bool_t __initdata opt_smap = 1; +boolean_param("smap", opt_smap); /* Boot dom0 in pvh mode */ static bool_t __initdata opt_dom0pvh; @@ -1297,12 +1297,12 @@ void __init noreturn __start_xen(unsigned long mbi_p) set_in_cr4(X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT); - if ( disable_smep ) + if ( !opt_smep ) setup_clear_cpu_cap(X86_FEATURE_SMEP); if ( cpu_has_smep ) set_in_cr4(X86_CR4_SMEP); - if ( disable_smap ) + if ( !opt_smap ) setup_clear_cpu_cap(X86_FEATURE_SMAP); if ( cpu_has_smap ) set_in_cr4(X86_CR4_SMAP);