Commit 42bf549f authored by Nadav Amit's avatar Nadav Amit Committed by Marcelo Tosatti
Browse files

KVM: x86: Processor mode may be determined incorrectly 



If EFER.LMA is off, cs.l does not determine execution mode.
Currently, the emulation engine assumes differently.

Signed-off-by: default avatarNadav Amit <namit@cs.technion.ac.il>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent e6e39f04

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -4888,7 +4888,7 @@ static void init_emulate_ctxt(struct kvm_vcpu *vcpu) 
	ctxt->eip = kvm_rip_read(vcpu);

	ctxt->mode = (!is_protmode(vcpu))		? X86EMUL_MODE_REAL :

		     (ctxt->eflags & X86_EFLAGS_VM)	? X86EMUL_MODE_VM86 :

		     cs_l				? X86EMUL_MODE_PROT64 :

		     (cs_l && is_long_mode(vcpu))	? X86EMUL_MODE_PROT64 :

		     cs_db				? X86EMUL_MODE_PROT32 :

							  X86EMUL_MODE_PROT16;

	ctxt->guest_mode = is_guest_mode(vcpu);