|
@@ -1308,7 +1308,7 @@ static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked);
|
|
static bool nested_vmx_is_page_fault_vmexit(struct vmcs12 *vmcs12,
|
|
static bool nested_vmx_is_page_fault_vmexit(struct vmcs12 *vmcs12,
|
|
u16 error_code);
|
|
u16 error_code);
|
|
static void vmx_update_msr_bitmap(struct kvm_vcpu *vcpu);
|
|
static void vmx_update_msr_bitmap(struct kvm_vcpu *vcpu);
|
|
-static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,
|
|
|
|
|
|
+static __always_inline void vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,
|
|
u32 msr, int type);
|
|
u32 msr, int type);
|
|
|
|
|
|
static DEFINE_PER_CPU(struct vmcs *, vmxarea);
|
|
static DEFINE_PER_CPU(struct vmcs *, vmxarea);
|
|
@@ -5956,7 +5956,7 @@ static void free_vpid(int vpid)
|
|
spin_unlock(&vmx_vpid_lock);
|
|
spin_unlock(&vmx_vpid_lock);
|
|
}
|
|
}
|
|
|
|
|
|
-static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,
|
|
|
|
|
|
+static __always_inline void vmx_disable_intercept_for_msr(unsigned long *msr_bitmap,
|
|
u32 msr, int type)
|
|
u32 msr, int type)
|
|
{
|
|
{
|
|
int f = sizeof(unsigned long);
|
|
int f = sizeof(unsigned long);
|
|
@@ -5994,7 +5994,7 @@ static void __always_inline vmx_disable_intercept_for_msr(unsigned long *msr_bit
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static void __always_inline vmx_enable_intercept_for_msr(unsigned long *msr_bitmap,
|
|
|
|
|
|
+static __always_inline void vmx_enable_intercept_for_msr(unsigned long *msr_bitmap,
|
|
u32 msr, int type)
|
|
u32 msr, int type)
|
|
{
|
|
{
|
|
int f = sizeof(unsigned long);
|
|
int f = sizeof(unsigned long);
|
|
@@ -6032,7 +6032,7 @@ static void __always_inline vmx_enable_intercept_for_msr(unsigned long *msr_bitm
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static void __always_inline vmx_set_intercept_for_msr(unsigned long *msr_bitmap,
|
|
|
|
|
|
+static __always_inline void vmx_set_intercept_for_msr(unsigned long *msr_bitmap,
|
|
u32 msr, int type, bool value)
|
|
u32 msr, int type, bool value)
|
|
{
|
|
{
|
|
if (value)
|
|
if (value)
|