From: Christoph Egger Subject: [PATCH 9/15] Nested Virtualization: MSR Date: Thu, 3 Jun 2010 18:16:12 +0200 Message-ID: <201006031816.12864.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_MV9BM3WOd3kEcTd" 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 List-Id: xen-devel@lists.xenproject.org --Boundary-00=_MV9BM3WOd3kEcTd 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: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_MV9BM3WOd3kEcTd Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_nh09_msr.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_nh09_msr.diff" # HG changeset patch # User cegger # Date 1275382031 -7200 Emulate MSRs needed for Nested Virtualization diff -r c3ca485ecfbe -r 11f96c916410 xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2148,14 +2148,21 @@ int hvm_msr_read_intercept(struct cpu_us break; default: + ret = nestedhvm_rdmsr(v, ecx, &msr_content); + if ( ret < 0 ) + goto gp_fault; + else if ( ret ) + break; + + BUG_ON( ret ); ret = vmce_rdmsr(ecx, &msr_content); if ( ret < 0 ) goto gp_fault; else if ( ret ) break; - /* ret == 0, This is not an MCE MSR, see other MSRs */ - else if (!ret) - return hvm_funcs.msr_read_intercept(regs); + + BUG_ON( ret ); + return hvm_funcs.msr_read_intercept(regs); } regs->eax = (uint32_t)msr_content; @@ -2247,13 +2254,21 @@ int hvm_msr_write_intercept(struct cpu_u break; default: + ret = nestedhvm_wrmsr(v, ecx, msr_content); + if ( ret < 0 ) + goto gp_fault; + else if ( ret ) + break; + + BUG_ON( ret ); ret = vmce_wrmsr(ecx, msr_content); if ( ret < 0 ) goto gp_fault; else if ( ret ) break; - else if (!ret) - return hvm_funcs.msr_write_intercept(regs); + + BUG_ON( ret ); + return hvm_funcs.msr_write_intercept(regs); } return X86EMUL_OKAY; --Boundary-00=_MV9BM3WOd3kEcTd 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=_MV9BM3WOd3kEcTd--