| From b4123a844843cf71c0c729250f33a40f8525a376 Mon Sep 17 00:00:00 2001 |
| From: Avi Kivity <avi@redhat.com> |
| Date: Wed, 12 May 2010 00:28:44 +0300 |
| Subject: KVM: Don't allow lmsw to clear cr0.pe |
| |
| From: Avi Kivity <avi@redhat.com> |
| |
| 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: Avi Kivity <avi@redhat.com> |
| Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| (cherry picked from commit f78e917688edbf1f14c318d2e50dc8e7dad20445) |
| --- |
| arch/x86/kvm/x86.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -345,7 +345,7 @@ EXPORT_SYMBOL_GPL(kvm_set_cr0); |
| |
| void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw) |
| { |
| - kvm_set_cr0(vcpu, (vcpu->arch.cr0 & ~0x0ful) | (msw & 0x0f)); |
| + kvm_set_cr0(vcpu, (vcpu->arch.cr0 & ~0x0eul) | (msw & 0x0f)); |
| } |
| EXPORT_SYMBOL_GPL(kvm_lmsw); |
| |
