* [PATCH] KVM: x86: Replace X86_FEATURE_NX offset with the definition
@ 2014-08-20 13:38 Nadav Amit
2014-08-20 13:54 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Nadav Amit @ 2014-08-20 13:38 UTC (permalink / raw)
To: pbonzini; +Cc: kvm, nadav.amit, Nadav Amit
Replace reference to X86_FEATURE_NX using bit shift with the defined
X86_FEATURE_NX.
Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
---
arch/x86/kvm/cpuid.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 38a0afe..f4bad87 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -112,8 +112,8 @@ static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu)
break;
}
}
- if (entry && (entry->edx & (1 << 20)) && !is_efer_nx()) {
- entry->edx &= ~(1 << 20);
+ if (entry && (entry->edx & bit(X86_FEATURE_NX)) && !is_efer_nx()) {
+ entry->edx &= ~bit(X86_FEATURE_NX);
printk(KERN_INFO "kvm: guest NX capability removed\n");
}
}
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] KVM: x86: Replace X86_FEATURE_NX offset with the definition
2014-08-20 13:38 [PATCH] KVM: x86: Replace X86_FEATURE_NX offset with the definition Nadav Amit
@ 2014-08-20 13:54 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2014-08-20 13:54 UTC (permalink / raw)
To: Nadav Amit; +Cc: kvm, nadav.amit
Il 20/08/2014 15:38, Nadav Amit ha scritto:
> Replace reference to X86_FEATURE_NX using bit shift with the defined
> X86_FEATURE_NX.
>
> Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
> ---
> arch/x86/kvm/cpuid.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
> index 38a0afe..f4bad87 100644
> --- a/arch/x86/kvm/cpuid.c
> +++ b/arch/x86/kvm/cpuid.c
> @@ -112,8 +112,8 @@ static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu)
> break;
> }
> }
> - if (entry && (entry->edx & (1 << 20)) && !is_efer_nx()) {
> - entry->edx &= ~(1 << 20);
> + if (entry && (entry->edx & bit(X86_FEATURE_NX)) && !is_efer_nx()) {
> + entry->edx &= ~bit(X86_FEATURE_NX);
> printk(KERN_INFO "kvm: guest NX capability removed\n");
> }
> }
>
Applying, thanks.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-20 13:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-20 13:38 [PATCH] KVM: x86: Replace X86_FEATURE_NX offset with the definition Nadav Amit
2014-08-20 13:54 ` Paolo Bonzini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.