From: Christoph Egger Subject: [PATCH 05/13] Nested Virtualization: CRn & paged real mode Date: Wed, 1 Sep 2010 17:00:44 +0200 Message-ID: <201009011700.45203.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_dqmfMUTI2T9ZVo7" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" Cc: "Dong, Eddie" , Tim Deegan List-Id: xen-devel@lists.xenproject.org --Boundary-00=_dqmfMUTI2T9ZVo7 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Signed-off-by: Christoph Egger -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_dqmfMUTI2T9ZVo7 Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_nh05_cr.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_nh05_cr.diff" # HG changeset patch # User cegger # Date 1283345878 -7200 Allow paged real mode during vmrun emulation. Emulate cr0 and cr4 when guest does not intercept them. diff -r 0199b689a2d0 -r e0eae5b67977 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -1109,9 +1110,13 @@ int hvm_set_cr0(unsigned long value) /* ET is reserved and should be always be 1. */ value |= X86_CR0_ET; - if ( (value & (X86_CR0_PE | X86_CR0_PG)) == X86_CR0_PG ) + if ( !nestedhvm_vmentry_emulate(v) && + (value & (X86_CR0_PE | X86_CR0_PG)) == X86_CR0_PG ) goto gpf; + if ( nestedhvm_vcpu_in_guestmode(v) ) + value &= ~(X86_CR0_CD | X86_CR0_NW); + if ( (value & X86_CR0_PG) && !(old_value & X86_CR0_PG) ) { if ( v->arch.hvm_vcpu.guest_efer & EFER_LME ) @@ -1163,7 +1168,7 @@ int hvm_set_cr0(unsigned long value) } } - if ( has_arch_mmios(v->domain) ) + if ( !nestedhvm_vmentry_emulate(v) && has_arch_mmios(v->domain) ) { if ( (value & X86_CR0_CD) && !(value & X86_CR0_NW) ) { --Boundary-00=_dqmfMUTI2T9ZVo7 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_dqmfMUTI2T9ZVo7--