diff options
| author | Avi Kivity <avi@redhat.com> | 2010-05-11 21:28:44 (GMT) |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-19 08:41:08 (GMT) |
| commit | f78e917688edbf1f14c318d2e50dc8e7dad20445 (patch) | |
| tree | 8894410296279382ec6d9860534442c4cd1a5087 /arch/x86 | |
| parent | 09c9e81366b9167b88ff05cf29fa94dc3553eb3d (diff) | |
| download | linux-fsl-qoriq-f78e917688edbf1f14c318d2e50dc8e7dad20445.tar.xz | |
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: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 474a27f..fa1c519 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -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); |