From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Walls Subject: Re: [PATCH] KVM: Don't allow lmsw to clear cr0.pe Date: Tue, 11 May 2010 18:13:11 -0400 Message-ID: <1273615991.4840.32.camel@localhost> References: <1273613324-31910-1-git-send-email-avi@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: Marcelo Tosatti , kvm@vger.kernel.org To: Avi Kivity Return-path: Received: from proofpoint-cluster.metrocast.net ([65.175.128.136]:23959 "EHLO proofpoint-cluster.metrocast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753314Ab0EKWkw (ORCPT ); Tue, 11 May 2010 18:40:52 -0400 In-Reply-To: <1273613324-31910-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On Wed, 2010-05-12 at 00:28 +0300, Avi Kivity wrote: > 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 > --- > 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 cd8a606..a40170c 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -462,7 +462,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); > Cool. I will build a kernel and test tomorrow. Regards, Andy