KVM: x86: use F() macro throughout cpuid.c

For code that deals with cpuid, this makes things a bit more readable.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index a4f5ac46226c..11f09a2b31a0 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -53,6 +53,8 @@ u64 kvm_supported_xcr0(void)
         return xcr0;
 }
 
+#define F(x) bit(X86_FEATURE_##x)
+
 int kvm_update_cpuid(struct kvm_vcpu *vcpu)
 {
         struct kvm_cpuid_entry2 *best;
@@ -64,13 +66,13 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu)
 
         /* Update OSXSAVE bit */
         if (cpu_has_xsave && best->function == 0x1) {
-                best->ecx &= ~(bit(X86_FEATURE_OSXSAVE));
+                best->ecx &= ~F(OSXSAVE);
                 if (kvm_read_cr4_bits(vcpu, X86_CR4_OSXSAVE))
-                        best->ecx |= bit(X86_FEATURE_OSXSAVE);
+                        best->ecx |= F(OSXSAVE);
         }
 
         if (apic) {
-                if (best->ecx & bit(X86_FEATURE_TSC_DEADLINE_TIMER))
+                if (best->ecx & F(TSC_DEADLINE_TIMER))
                         apic->lapic_timer.timer_mode_mask = 3 << 17;
                 else
                         apic->lapic_timer.timer_mode_mask = 1 << 17;
@@ -122,8 +124,8 @@ static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu)
                         break;
                 }
         }
-        if (entry && (entry->edx & bit(X86_FEATURE_NX)) && !is_efer_nx()) {
-                entry->edx &= ~bit(X86_FEATURE_NX);
+        if (entry && (entry->edx & F(NX)) && !is_efer_nx()) {
+                entry->edx &= ~F(NX);
                 printk(KERN_INFO "kvm: guest NX capability removed\n");
         }
 }
@@ -227,8 +229,6 @@ static void do_cpuid_1_ent(struct kvm_cpuid_entry2 *entry, u32 function,
         entry->flags = 0;
 }
 
-#define F(x) bit(X86_FEATURE_##x)
-
 static int __do_cpuid_ent_emulated(struct kvm_cpuid_entry2 *entry,
                                    u32 func, u32 index, int *nent, int maxnent)
 {