From mboxrd@z Thu Jan 1 00:00:00 1970 From: Qing He Subject: Re: [PATCH 01/17] vmx: nest: fix CR4.VME in update_guest_cr Date: Thu, 20 May 2010 17:36:11 +0800 Message-ID: <20100520093611.GA21042@qhe2-db> References: <1271929289-18572-1-git-send-email-qing.he@intel.com> <1271929289-18572-2-git-send-email-qing.he@intel.com> <20100520092619.GJ4164@whitby.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20100520092619.GJ4164@whitby.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Tim Deegan Cc: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org On Thu, 2010-05-20 at 17:26 +0800, Tim Deegan wrote: > At 10:41 +0100 on 22 Apr (1271932873), Qing He wrote: > > X86_CR4_VME in guest_cr[4] is updated in cr0 handling, but not in > > cr4 handling, fix it for guest VM86. > > Nack. This patch doesn't actually do anything. > Thank you. I intended to write 'if ( realmode || (guest_cr[4] & VME) ) hw_cr[4]...' until just now I notice there is a hw_cr[4] |= guest_cr[4] right above it. > Cheers, > > Tim. > > > Signed-off-by: Qing He > > > > --- > > vmx.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff -r 9be1d3918ec7 -r ca507122f84e xen/arch/x86/hvm/vmx/vmx.c > > --- a/xen/arch/x86/hvm/vmx/vmx.c Wed Apr 21 23:43:59 2010 +0800 > > +++ b/xen/arch/x86/hvm/vmx/vmx.c Thu Apr 22 21:28:41 2010 +0800 > > @@ -1174,7 +1174,8 @@ > > if ( paging_mode_hap(v->domain) ) > > v->arch.hvm_vcpu.hw_cr[4] &= ~X86_CR4_PAE; > > v->arch.hvm_vcpu.hw_cr[4] |= v->arch.hvm_vcpu.guest_cr[4]; > > - if ( v->arch.hvm_vmx.vmx_realmode ) > > + if ( v->arch.hvm_vmx.vmx_realmode || > > + (v->arch.hvm_vcpu.hw_cr[4] & X86_CR4_VME) ) > > v->arch.hvm_vcpu.hw_cr[4] |= X86_CR4_VME; > > if ( paging_mode_hap(v->domain) && !hvm_paging_enabled(v) ) > > { > > > > _______________________________________________ > > Xen-devel mailing list > > Xen-devel@lists.xensource.com > > http://lists.xensource.com/xen-devel > > -- > Tim Deegan > Principal Software Engineer, XenServer Engineering > Citrix Systems UK Ltd. (Company #02937203, SL9 0BG)