[Xen-changelog] [xen-unstable] x86: Fix the build after HVMTRACE changes.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1213086287 -3600
# Node ID fb294e189b73f4c5437cfe42a5be13c99febf762
# Parent  f769baf14332a1eeea30b1403917626979ea2eb8
x86: Fix the build after HVMTRACE changes.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/hvm/svm/svm.c |    9 +++------
 xen/arch/x86/hvm/vmx/vmx.c |    9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff -r f769baf14332 -r fb294e189b73 xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c        Tue Jun 10 09:17:55 2008 +0100
+++ b/xen/arch/x86/hvm/svm/svm.c        Tue Jun 10 09:24:47 2008 +0100
@@ -1175,12 +1175,9 @@ asmlinkage void svm_vmexit_handler(struc
 
     exit_reason = vmcb->exitcode;
 
-    if ( hvm_long_mode_enabled(v) )
-        HVMTRACE_ND (VMEXIT64, 1/*cycles*/, v, 3, exit_reason,
-            regs->eip & 0xFFFFFFFF, regs->eip >> 32, 0, 0, 0);
-    else
-        HVMTRACE_ND (VMEXIT, 1/*cycles*/, v, 2, exit_reason,
-            regs->eip, 0, 0, 0, 0);
+    HVMTRACE_ND(VMEXIT64, 1/*cycles*/, v, 3, exit_reason,
+                (uint32_t)regs->eip, (uint32_t)((uint64_t)regs->eip >> 32),
+                0, 0, 0);
 
     if ( unlikely(exit_reason == VMEXIT_INVALID) )
     {
diff -r f769baf14332 -r fb294e189b73 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Tue Jun 10 09:17:55 2008 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Tue Jun 10 09:24:47 2008 +0100
@@ -2020,12 +2020,9 @@ asmlinkage void vmx_vmexit_handler(struc
 
     exit_reason = __vmread(VM_EXIT_REASON);
 
-    if ( hvm_long_mode_enabled(v) )
-        HVMTRACE_ND (VMEXIT64, 1/*cycles*/, v, 3, exit_reason,
-            regs->eip & 0xFFFFFFFF, regs->eip >> 32, 0, 0, 0);
-    else
-        HVMTRACE_ND (VMEXIT, 1/*cycles*/, v, 2, exit_reason,
-            regs->eip, 0, 0, 0, 0);
+    HVMTRACE_ND(VMEXIT64, 1/*cycles*/, v, 3, exit_reason,
+                (uint32_t)regs->eip, (uint32_t)((uint64_t)regs->eip >> 32),
+                0, 0, 0);
 
     perfc_incra(vmexits, exit_reason);
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog