diff options
author | Gleb Natapov <gleb@redhat.com> | 2010-02-10 07:21:31 -0500 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-01 10:36:11 -0500 |
commit | a0044755679f3e761b8b95995e5f2db2b7efd0f6 (patch) | |
tree | 3a4db9d3e0512109130c2f4f1f425305378c0a27 /arch/x86/kvm/x86.c | |
parent | 60a29d4ea4e7b6b95d9391ebc8625b0426f3a363 (diff) |
KVM: x86 emulator: Add Virtual-8086 mode of emulation
For some instructions CPU behaves differently for real-mode and
virtual 8086. Let emulator know which mode cpu is in, so it will
not poke into vcpu state directly.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Cc: stable@kernel.org
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index b2f91b9af00d..a28379507d30 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -3348,8 +3348,9 @@ int emulate_instruction(struct kvm_vcpu *vcpu, | |||
3348 | vcpu->arch.emulate_ctxt.vcpu = vcpu; | 3348 | vcpu->arch.emulate_ctxt.vcpu = vcpu; |
3349 | vcpu->arch.emulate_ctxt.eflags = kvm_get_rflags(vcpu); | 3349 | vcpu->arch.emulate_ctxt.eflags = kvm_get_rflags(vcpu); |
3350 | vcpu->arch.emulate_ctxt.mode = | 3350 | vcpu->arch.emulate_ctxt.mode = |
3351 | (!is_protmode(vcpu)) ? X86EMUL_MODE_REAL : | ||
3351 | (vcpu->arch.emulate_ctxt.eflags & X86_EFLAGS_VM) | 3352 | (vcpu->arch.emulate_ctxt.eflags & X86_EFLAGS_VM) |
3352 | ? X86EMUL_MODE_REAL : cs_l | 3353 | ? X86EMUL_MODE_VM86 : cs_l |
3353 | ? X86EMUL_MODE_PROT64 : cs_db | 3354 | ? X86EMUL_MODE_PROT64 : cs_db |
3354 | ? X86EMUL_MODE_PROT32 : X86EMUL_MODE_PROT16; | 3355 | ? X86EMUL_MODE_PROT32 : X86EMUL_MODE_PROT16; |
3355 | 3356 | ||