From patchwork Sat Feb 6 04:30:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8241571 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 6985ABEEE5 for ; Sat, 6 Feb 2016 04:32:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 72BFC20212 for ; Sat, 6 Feb 2016 04:32:56 +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 64706201D3 for ; Sat, 6 Feb 2016 04:32:55 +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 1aRuVu-0007ry-UW; Sat, 06 Feb 2016 04:30:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aRuVs-0007rD-Mv for xen-devel@lists.xensource.com; Sat, 06 Feb 2016 04:30:24 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id CA/3F-02745-0E675B65; Sat, 06 Feb 2016 04:30:24 +0000 X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-9.tower-31.messagelabs.com!1454733022!1237764!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10579 invoked from network); 6 Feb 2016 04:30:23 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-9.tower-31.messagelabs.com with SMTP; 6 Feb 2016 04:30:23 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7193E201D3; Sat, 6 Feb 2016 04:30:21 +0000 (UTC) Received: from garbanzo.do-not-panic.com (c-73-15-241-2.hsd1.ca.comcast.net [73.15.241.2]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DDC3D20212; Sat, 6 Feb 2016 04:30:19 +0000 (UTC) From: "Luis R. Rodriguez" To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de Date: Fri, 5 Feb 2016 20:30:12 -0800 Message-Id: <1454733014-15237-2-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454733014-15237-1-git-send-email-mcgrof@kernel.org> References: <1454733014-15237-1-git-send-email-mcgrof@kernel.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 Cc: jgross@suse.com, xen-devel@lists.xensource.com, x86@kernel.org, joro@8bytes.org, rusty@rustcorp.com.au, linux-kernel@vger.kernel.org, luto@amacapital.net, aryabinin@virtuozzo.com, "Luis R. Rodriguez" , ryabinin.a.a@gmail.com, JBeulich@suse.com, long.wanglong@huawei.com, qiuxishi@huawei.com, boris.ostrovsky@oracle.com, mcb30@ipxe.org, mchehab@osg.samsung.com Subject: [Xen-devel] [PATCH v2 1/3] paravirt: use bool for paravirt_enabled() and paravirt_has_feature() 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: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Virus-Scanned: ClamAV using ClamSMTP This avoids any possible misuse. Signed-off-by: Luis R. Rodriguez --- arch/x86/include/asm/paravirt.h | 6 +++--- arch/x86/include/asm/paravirt_types.h | 2 +- arch/x86/include/asm/processor.h | 4 ++-- arch/x86/kernel/kvm.c | 2 +- arch/x86/kernel/paravirt.c | 2 +- arch/x86/lguest/boot.c | 2 +- arch/x86/xen/enlighten.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index f6192502149e..60a71dfe0c4e 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -14,15 +14,15 @@ #include #include -static inline int paravirt_enabled(void) +static inline bool paravirt_enabled(void) { return pv_info.paravirt_enabled; } -static inline int paravirt_has_feature(unsigned int feature) +static inline bool paravirt_has_feature(unsigned int feature) { WARN_ON_ONCE(!pv_info.paravirt_enabled); - return (pv_info.features & feature); + return !!(pv_info.features & feature); } static inline void load_sp0(struct tss_struct *tss, diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index 77db5616a473..de2382b023f2 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -69,7 +69,7 @@ struct pv_info { u16 extra_user_64bit_cs; /* __USER_CS if none */ #endif - int paravirt_enabled; + bool paravirt_enabled; unsigned int features; /* valid only if paravirt_enabled is set */ const char *name; }; diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 491a3d9dbb15..5a8e7a61d5be 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -470,8 +470,8 @@ static inline unsigned long current_top_of_stack(void) #include #else #define __cpuid native_cpuid -#define paravirt_enabled() 0 -#define paravirt_has(x) 0 +#define paravirt_enabled() false +#define paravirt_has(x) false static inline void load_sp0(struct tss_struct *tss, struct thread_struct *thread) diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 47190bd399e7..5c717b247e1b 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -290,7 +290,7 @@ static void __init paravirt_ops_setup(void) * features, and paravirt_enabled is about features that are * missing. */ - pv_info.paravirt_enabled = 0; + pv_info.paravirt_enabled = false; if (kvm_para_has_feature(KVM_FEATURE_NOP_IO_DELAY)) pv_cpu_ops.io_delay = kvm_io_delay; diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index f08ac28b8136..6b1f205a6ac7 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -294,7 +294,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void) struct pv_info pv_info = { .name = "bare hardware", - .paravirt_enabled = 0, + .paravirt_enabled = false, .kernel_rpl = 0, .shared_kernel_pmd = 1, /* Only used when CONFIG_X86_PAE is set */ diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index a9033ae13369..c6f302f6dedb 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c @@ -1409,7 +1409,7 @@ __init void lguest_init(void) /* We're under lguest. */ pv_info.name = "lguest"; /* Paravirt is enabled. */ - pv_info.paravirt_enabled = 1; + pv_info.paravirt_enabled = true; /* We're running at privilege level 1, not 0 as normal. */ pv_info.kernel_rpl = 1; /* Everyone except Xen runs with this set. */ diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 2c261082eadf..e303e0043881 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1186,7 +1186,7 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf, } static const struct pv_info xen_info __initconst = { - .paravirt_enabled = 1, + .paravirt_enabled = true, .shared_kernel_pmd = 0, #ifdef CONFIG_X86_64