|
@@ -2327,6 +2327,11 @@ static void vmx_vcpu_put(struct kvm_vcpu *vcpu)
|
|
|
__vmx_load_host_state(to_vmx(vcpu));
|
|
|
}
|
|
|
|
|
|
+static bool emulation_required(struct kvm_vcpu *vcpu)
|
|
|
+{
|
|
|
+ return emulate_invalid_guest_state && !guest_state_valid(vcpu);
|
|
|
+}
|
|
|
+
|
|
|
static void vmx_decache_cr0_guest_bits(struct kvm_vcpu *vcpu);
|
|
|
|
|
|
/*
|
|
@@ -2364,6 +2369,8 @@ static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu)
|
|
|
|
|
|
static void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
|
|
|
{
|
|
|
+ unsigned long old_rflags = vmx_get_rflags(vcpu);
|
|
|
+
|
|
|
__set_bit(VCPU_EXREG_RFLAGS, (ulong *)&vcpu->arch.regs_avail);
|
|
|
to_vmx(vcpu)->rflags = rflags;
|
|
|
if (to_vmx(vcpu)->rmode.vm86_active) {
|
|
@@ -2371,6 +2378,9 @@ static void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
|
|
|
rflags |= X86_EFLAGS_IOPL | X86_EFLAGS_VM;
|
|
|
}
|
|
|
vmcs_writel(GUEST_RFLAGS, rflags);
|
|
|
+
|
|
|
+ if ((old_rflags ^ to_vmx(vcpu)->rflags) & X86_EFLAGS_VM)
|
|
|
+ to_vmx(vcpu)->emulation_required = emulation_required(vcpu);
|
|
|
}
|
|
|
|
|
|
static u32 vmx_get_pkru(struct kvm_vcpu *vcpu)
|
|
@@ -3858,11 +3868,6 @@ static __init int alloc_kvm_area(void)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static bool emulation_required(struct kvm_vcpu *vcpu)
|
|
|
-{
|
|
|
- return emulate_invalid_guest_state && !guest_state_valid(vcpu);
|
|
|
-}
|
|
|
-
|
|
|
static void fix_pmode_seg(struct kvm_vcpu *vcpu, int seg,
|
|
|
struct kvm_segment *save)
|
|
|
{
|