ia64/xen-unstable

changeset 17027:e3d417c4786b

x86: Fix build after xentrace changes.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Feb 11 10:50:57 2008 +0000 (2008-02-11)
parents ad064e48b6f2
children faefbf2c4840
files xen/include/asm-x86/hvm/trace.h
line diff
     1.1 --- a/xen/include/asm-x86/hvm/trace.h	Mon Feb 11 10:20:31 2008 +0000
     1.2 +++ b/xen/include/asm-x86/hvm/trace.h	Mon Feb 11 10:50:57 2008 +0000
     1.3 @@ -31,8 +31,6 @@
     1.4  #define DO_TRC_HVM_CLTS        1
     1.5  #define DO_TRC_HVM_LMSW        1
     1.6  
     1.7 -
     1.8 -
     1.9  static inline void hvmtrace_vmexit(struct vcpu *v,
    1.10                                     unsigned long rip,
    1.11                                     unsigned long exit_reason)
    1.12 @@ -41,7 +39,7 @@ static inline void hvmtrace_vmexit(struc
    1.13          return;
    1.14  
    1.15  #ifdef __x86_64__
    1.16 -    if(hvm_long_mode_enabled(v))
    1.17 +    if ( hvm_long_mode_enabled(v) )
    1.18      {
    1.19          struct {
    1.20              unsigned did:16, vid:16;
    1.21 @@ -53,9 +51,12 @@ static inline void hvmtrace_vmexit(struc
    1.22          d.vid = v->vcpu_id;
    1.23          d.exit_reason = exit_reason;
    1.24          d.rip = rip;
    1.25 -        __trace_var(TRC_HVM_VMEXIT64, 1/*cycles*/, sizeof(d), (unsigned char *)&d);
    1.26 -    } else {
    1.27 +        __trace_var(TRC_HVM_VMEXIT64, 1/*cycles*/, sizeof(d),
    1.28 +                    (unsigned char *)&d);
    1.29 +    }
    1.30 +    else
    1.31  #endif
    1.32 +    {
    1.33          struct {
    1.34              unsigned did:16, vid:16;
    1.35              unsigned exit_reason:32;
    1.36 @@ -66,10 +67,9 @@ static inline void hvmtrace_vmexit(struc
    1.37          d.vid = v->vcpu_id;
    1.38          d.exit_reason = exit_reason;
    1.39          d.eip = rip;
    1.40 -        __trace_var(TRC_HVM_VMEXIT, 1/*cycles*/, sizeof(d), (unsigned char *)&d);
    1.41 -#ifdef __x86_64__
    1.42 +        __trace_var(TRC_HVM_VMEXIT, 1/*cycles*/, sizeof(d),
    1.43 +                    (unsigned char *)&d);
    1.44      }
    1.45 -#endif
    1.46  }
    1.47  
    1.48  
    1.49 @@ -102,7 +102,8 @@ static inline void hvmtrace_msr_read(str
    1.50      d.vid = v->vcpu_id;
    1.51      d.ecx = ecx;
    1.52      d.msr_content = msr_content;
    1.53 -    __trace_var(TRC_HVM_MSR_READ, 0/*!cycles*/, sizeof(d), (unsigned char *)&d);
    1.54 +    __trace_var(TRC_HVM_MSR_READ, 0/*!cycles*/, sizeof(d),
    1.55 +                (unsigned char *)&d);
    1.56  }
    1.57  
    1.58  static inline void hvmtrace_msr_write(struct vcpu *v, u32 ecx, u64 msr_content)
    1.59 @@ -120,7 +121,8 @@ static inline void hvmtrace_msr_write(st
    1.60      d.vid = v->vcpu_id;
    1.61      d.ecx = ecx;
    1.62      d.msr_content = msr_content;
    1.63 -    __trace_var(TRC_HVM_MSR_WRITE, 0/*!cycles*/,sizeof(d), (unsigned char *)&d);
    1.64 +    __trace_var(TRC_HVM_MSR_WRITE, 0/*!cycles*/,sizeof(d),
    1.65 +                (unsigned char *)&d);
    1.66  }
    1.67  
    1.68  static inline void hvmtrace_pf_xen(struct vcpu *v, unsigned long va,
    1.69 @@ -130,7 +132,7 @@ static inline void hvmtrace_pf_xen(struc
    1.70          return;
    1.71  
    1.72  #ifdef __x86_64__
    1.73 -    if(hvm_long_mode_enabled(v))
    1.74 +    if( hvm_long_mode_enabled(v) )
    1.75      {
    1.76          struct {
    1.77              unsigned did:16, vid:16;
    1.78 @@ -143,8 +145,10 @@ static inline void hvmtrace_pf_xen(struc
    1.79          d.va = va;
    1.80          __trace_var(TRC_HVM_PF_XEN64, 0/*!cycles*/,sizeof(d),
    1.81                      (unsigned char *)&d);
    1.82 -    } else {
    1.83 +    }
    1.84 +    else
    1.85  #endif
    1.86 +    {
    1.87          struct {
    1.88              unsigned did:16, vid:16;
    1.89              u32 error_code;
    1.90 @@ -156,9 +160,7 @@ static inline void hvmtrace_pf_xen(struc
    1.91          d.va = va;
    1.92          __trace_var(TRC_HVM_PF_XEN, 0/*!cycles*/,sizeof(d),
    1.93                      (unsigned char *)&d);
    1.94 -#ifdef __x86_64__
    1.95      }
    1.96 -#endif
    1.97  }
    1.98  
    1.99  #define HVMTRACE_ND(evt, vcpu, count, d1, d2, d3, d4)                   \
   1.100 @@ -186,7 +188,8 @@ static inline void hvmtrace_pf_xen(struc
   1.101  #define HVMTRACE_1D(evt, vcpu, d1)               HVMTRACE_ND(evt, vcpu, 1, d1,  0,  0,  0)
   1.102  #define HVMTRACE_0D(evt, vcpu)                   HVMTRACE_ND(evt, vcpu, 0, 0,  0,  0,  0)
   1.103  
   1.104 -#endif //__ASM_X86_HVM_TRACE_H__
   1.105 +#endif /* __ASM_X86_HVM_TRACE_H__ */
   1.106 +
   1.107  /*
   1.108   * Local variables:
   1.109   * mode: C