diff options
| author | Avi Kivity | 2009-08-12 14:29:37 +0200 |
|---|---|---|
| committer | Avi Kivity | 2009-09-10 09:46:43 +0200 |
| commit | 345dcaa8fde7fa70252d58c862bf41fd2149ca2c (patch) | |
| tree | 7e351dd56f459ab19eaf8f46b5fa94f81006c00f | |
| parent | KVM: Move #endif KVM_CAP_IRQ_ROUTING to correct place (diff) | |
| download | kernel-qcow2-linux-345dcaa8fde7fa70252d58c862bf41fd2149ca2c.tar.gz kernel-qcow2-linux-345dcaa8fde7fa70252d58c862bf41fd2149ca2c.tar.xz kernel-qcow2-linux-345dcaa8fde7fa70252d58c862bf41fd2149ca2c.zip | |
KVM: VMX: Adjust rflags if in real mode emulation
We set rflags.vm86 when virtualizing real mode to do through vm8086 mode;
so we need to take it out again when reading rflags.
Signed-off-by: Avi Kivity <avi@redhat.com>
| -rw-r--r-- | arch/x86/kvm/vmx.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 31c3a8740c42..2b7e7bd190fd 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -781,7 +781,12 @@ static void vmx_fpu_deactivate(struct kvm_vcpu *vcpu) static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu) { - return vmcs_readl(GUEST_RFLAGS); + unsigned long rflags; + + rflags = vmcs_readl(GUEST_RFLAGS); + if (to_vmx(vcpu)->rmode.vm86_active) + rflags &= ~(unsigned long)(X86_EFLAGS_IOPL | X86_EFLAGS_VM); + return rflags; } static void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags) |