From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Egger Subject: [PATCH] xen: fix MSR xentrace output Date: Tue, 3 Aug 2010 18:24:21 +0200 Message-ID: <201008031824.21390.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_1KEWM0Att1d5qfO" 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=_1KEWM0Att1d5qfO Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi! Attached patch corrects MSR read/write trace output. Also avoid duplicate MSR read/write lines in xentrace output. MSR and value are mixed up. 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=_1KEWM0Att1d5qfO Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_fixtrace.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_fixtrace.diff" diff -r 2c6ae364ed7b xen/arch/x86/hvm/hvm.c --- a/xen/arch/x86/hvm/hvm.c Mon Aug 02 11:00:56 2010 +0100 +++ b/xen/arch/x86/hvm/hvm.c Tue Aug 03 18:21:41 2010 +0200 @@ -2105,11 +2105,12 @@ int hvm_msr_read_intercept(unsigned int } } - HVMTRACE_3D(MSR_READ, (uint32_t)*msr_content, (uint32_t)(*msr_content >> 32), msr); + HVMTRACE_3D(MSR_READ, msr, (uint32_t)*msr_content, (uint32_t)(*msr_content >> 32)); return X86EMUL_OKAY; gp_fault: + HVMTRACE_3D(MSR_READ, msr, (uint32_t)*msr_content, (uint32_t)(*msr_content >> 32)); hvm_inject_exception(TRAP_gp_fault, 0, 0); return X86EMUL_EXCEPTION; } @@ -2121,8 +2122,6 @@ int hvm_msr_write_intercept(unsigned int uint32_t cpuid[4]; int ret; - HVMTRACE_3D(MSR_WRITE, (uint32_t)msr_content, (uint32_t)(msr_content >> 32), msr); - hvm_cpuid(1, &cpuid[0], &cpuid[1], &cpuid[2], &cpuid[3]); mtrr = !!(cpuid[3] & bitmaskof(X86_FEATURE_MTRR)); @@ -2203,9 +2202,13 @@ int hvm_msr_write_intercept(unsigned int return hvm_funcs.msr_write_intercept(msr, msr_content); } + HVMTRACE_3D(MSR_WRITE, msr, (uint32_t)msr_content, (uint32_t)(msr_content >> 32)); + return X86EMUL_OKAY; gp_fault: + HVMTRACE_3D(MSR_WRITE, msr, (uint32_t)msr_content, (uint32_t)(msr_content >> 32)); + hvm_inject_exception(TRAP_gp_fault, 0, 0); return X86EMUL_EXCEPTION; } --Boundary-00=_1KEWM0Att1d5qfO 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=_1KEWM0Att1d5qfO--