Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f78e9176 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Don't allow lmsw to clear cr0.pe 



The current lmsw implementation allows the guest to clear cr0.pe, contrary
to the manual, which breaks EMM386.EXE.

Fix by ORing the old cr0.pe with lmsw's operand.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 09c9e813

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ EXPORT_SYMBOL_GPL(kvm_set_cr0); 


void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw)

{

	kvm_set_cr0(vcpu, kvm_read_cr0_bits(vcpu, ~0x0ful) | (msw & 0x0f));

	kvm_set_cr0(vcpu, kvm_read_cr0_bits(vcpu, ~0x0eul) | (msw & 0x0f));

}

EXPORT_SYMBOL_GPL(kvm_lmsw);