WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

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

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] x86: Fix build after xentrace changes.
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Mon, 11 Feb 2008 07:10:24 -0800
Delivery-date: Mon, 11 Feb 2008 07:11:18 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1202727057 0
# Node ID e3d417c4786b3fa25e09ce4be37d2ad56ea3898b
# Parent  ad064e48b6f2822ef8daf06fdd6460d8e2553990
x86: Fix build after xentrace changes.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/include/asm-x86/hvm/trace.h |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff -r ad064e48b6f2 -r e3d417c4786b xen/include/asm-x86/hvm/trace.h
--- a/xen/include/asm-x86/hvm/trace.h   Mon Feb 11 10:20:31 2008 +0000
+++ b/xen/include/asm-x86/hvm/trace.h   Mon Feb 11 10:50:57 2008 +0000
@@ -31,8 +31,6 @@
 #define DO_TRC_HVM_CLTS        1
 #define DO_TRC_HVM_LMSW        1
 
-
-
 static inline void hvmtrace_vmexit(struct vcpu *v,
                                    unsigned long rip,
                                    unsigned long exit_reason)
@@ -41,7 +39,7 @@ static inline void hvmtrace_vmexit(struc
         return;
 
 #ifdef __x86_64__
-    if(hvm_long_mode_enabled(v))
+    if ( hvm_long_mode_enabled(v) )
     {
         struct {
             unsigned did:16, vid:16;
@@ -53,9 +51,12 @@ static inline void hvmtrace_vmexit(struc
         d.vid = v->vcpu_id;
         d.exit_reason = exit_reason;
         d.rip = rip;
-        __trace_var(TRC_HVM_VMEXIT64, 1/*cycles*/, sizeof(d), (unsigned char 
*)&d);
-    } else {
+        __trace_var(TRC_HVM_VMEXIT64, 1/*cycles*/, sizeof(d),
+                    (unsigned char *)&d);
+    }
+    else
 #endif
+    {
         struct {
             unsigned did:16, vid:16;
             unsigned exit_reason:32;
@@ -66,10 +67,9 @@ static inline void hvmtrace_vmexit(struc
         d.vid = v->vcpu_id;
         d.exit_reason = exit_reason;
         d.eip = rip;
-        __trace_var(TRC_HVM_VMEXIT, 1/*cycles*/, sizeof(d), (unsigned char 
*)&d);
-#ifdef __x86_64__
-    }
-#endif
+        __trace_var(TRC_HVM_VMEXIT, 1/*cycles*/, sizeof(d),
+                    (unsigned char *)&d);
+    }
 }
 
 
@@ -102,7 +102,8 @@ static inline void hvmtrace_msr_read(str
     d.vid = v->vcpu_id;
     d.ecx = ecx;
     d.msr_content = msr_content;
-    __trace_var(TRC_HVM_MSR_READ, 0/*!cycles*/, sizeof(d), (unsigned char 
*)&d);
+    __trace_var(TRC_HVM_MSR_READ, 0/*!cycles*/, sizeof(d),
+                (unsigned char *)&d);
 }
 
 static inline void hvmtrace_msr_write(struct vcpu *v, u32 ecx, u64 msr_content)
@@ -120,7 +121,8 @@ static inline void hvmtrace_msr_write(st
     d.vid = v->vcpu_id;
     d.ecx = ecx;
     d.msr_content = msr_content;
-    __trace_var(TRC_HVM_MSR_WRITE, 0/*!cycles*/,sizeof(d), (unsigned char 
*)&d);
+    __trace_var(TRC_HVM_MSR_WRITE, 0/*!cycles*/,sizeof(d),
+                (unsigned char *)&d);
 }
 
 static inline void hvmtrace_pf_xen(struct vcpu *v, unsigned long va,
@@ -130,7 +132,7 @@ static inline void hvmtrace_pf_xen(struc
         return;
 
 #ifdef __x86_64__
-    if(hvm_long_mode_enabled(v))
+    if( hvm_long_mode_enabled(v) )
     {
         struct {
             unsigned did:16, vid:16;
@@ -143,8 +145,10 @@ static inline void hvmtrace_pf_xen(struc
         d.va = va;
         __trace_var(TRC_HVM_PF_XEN64, 0/*!cycles*/,sizeof(d),
                     (unsigned char *)&d);
-    } else {
+    }
+    else
 #endif
+    {
         struct {
             unsigned did:16, vid:16;
             u32 error_code;
@@ -156,9 +160,7 @@ static inline void hvmtrace_pf_xen(struc
         d.va = va;
         __trace_var(TRC_HVM_PF_XEN, 0/*!cycles*/,sizeof(d),
                     (unsigned char *)&d);
-#ifdef __x86_64__
-    }
-#endif
+    }
 }
 
 #define HVMTRACE_ND(evt, vcpu, count, d1, d2, d3, d4)                   \
@@ -186,7 +188,8 @@ static inline void hvmtrace_pf_xen(struc
 #define HVMTRACE_1D(evt, vcpu, d1)               HVMTRACE_ND(evt, vcpu, 1, d1, 
 0,  0,  0)
 #define HVMTRACE_0D(evt, vcpu)                   HVMTRACE_ND(evt, vcpu, 0, 0,  
0,  0,  0)
 
-#endif //__ASM_X86_HVM_TRACE_H__
+#endif /* __ASM_X86_HVM_TRACE_H__ */
+
 /*
  * Local variables:
  * mode: C

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] x86: Fix build after xentrace changes., Xen patchbot-unstable <=