1.1 --- a/xen/arch/x86/hvm/svm/svm.c	Tue Jun 10 09:17:55 2008 +0100
     1.2 +++ b/xen/arch/x86/hvm/svm/svm.c	Tue Jun 10 09:24:47 2008 +0100
     1.3 @@ -1175,12 +1175,9 @@ asmlinkage void svm_vmexit_handler(struc
     1.4  
     1.5      exit_reason = vmcb->exitcode;
     1.6  
     1.7 -    if ( hvm_long_mode_enabled(v) )
     1.8 -        HVMTRACE_ND (VMEXIT64, 1/*cycles*/, v, 3, exit_reason,
     1.9 -            regs->eip & 0xFFFFFFFF, regs->eip >> 32, 0, 0, 0);
    1.10 -    else
    1.11 -        HVMTRACE_ND (VMEXIT, 1/*cycles*/, v, 2, exit_reason,
    1.12 -            regs->eip, 0, 0, 0, 0);
    1.13 +    HVMTRACE_ND(VMEXIT64, 1/*cycles*/, v, 3, exit_reason,
    1.14 +                (uint32_t)regs->eip, (uint32_t)((uint64_t)regs->eip >> 32),
    1.15 +                0, 0, 0);
    1.16  
    1.17      if ( unlikely(exit_reason == VMEXIT_INVALID) )
    1.18      {

     2.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Tue Jun 10 09:17:55 2008 +0100
     2.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Tue Jun 10 09:24:47 2008 +0100
     2.3 @@ -2020,12 +2020,9 @@ asmlinkage void vmx_vmexit_handler(struc
     2.4  
     2.5      exit_reason = __vmread(VM_EXIT_REASON);
     2.6  
     2.7 -    if ( hvm_long_mode_enabled(v) )
     2.8 -        HVMTRACE_ND (VMEXIT64, 1/*cycles*/, v, 3, exit_reason,
     2.9 -            regs->eip & 0xFFFFFFFF, regs->eip >> 32, 0, 0, 0);
    2.10 -    else
    2.11 -        HVMTRACE_ND (VMEXIT, 1/*cycles*/, v, 2, exit_reason,
    2.12 -            regs->eip, 0, 0, 0, 0);
    2.13 +    HVMTRACE_ND(VMEXIT64, 1/*cycles*/, v, 3, exit_reason,
    2.14 +                (uint32_t)regs->eip, (uint32_t)((uint64_t)regs->eip >> 32),
    2.15 +                0, 0, 0);
    2.16  
    2.17      perfc_incra(vmexits, exit_reason);
    2.18