[Xen-changelog] [xen-unstable] Fix 32-bit build after the latest mem-event series

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

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1294401335 0
# Node ID 14ee2ec6ad5afe91de64fa8b33ed20ce7c1a65cd
# Parent  6ec9d1491f2ae1d7c4f3862aae2d185aba487ab4
Fix 32-bit build after the latest mem-event series

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---
 xen/arch/x86/hvm/hvm.c        |    2 ++
 xen/arch/x86/hvm/svm/svm.c    |    2 +-
 xen/arch/x86/mm/p2m.c         |    2 +-
 xen/include/asm-x86/hvm/hvm.h |   11 +++++++++++
 xen/include/asm-x86/p2m.h     |    7 +++++++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff -r 6ec9d1491f2a -r 14ee2ec6ad5a xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c    Fri Jan 07 11:54:52 2011 +0000
+++ b/xen/arch/x86/hvm/hvm.c    Fri Jan 07 11:55:35 2011 +0000
@@ -3781,6 +3781,7 @@ int hvm_debug_op(struct vcpu *v, int32_t
     return rc;
 }
 
+#ifdef __x86_64__
 static int hvm_memory_event_traps(long p, uint32_t reason,
                                   unsigned long value, unsigned long old, 
                                   bool_t gla_valid, unsigned long gla) 
@@ -3859,6 +3860,7 @@ int hvm_memory_event_int3(unsigned long 
                                   MEM_EVENT_REASON_INT3,
                                   gfn, 0, 1, gla);
 }
+#endif /* __x86_64__ */
 
 /*
  * Local variables:
diff -r 6ec9d1491f2a -r 14ee2ec6ad5a xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c        Fri Jan 07 11:54:52 2011 +0000
+++ b/xen/arch/x86/hvm/svm/svm.c        Fri Jan 07 11:55:35 2011 +0000
@@ -979,7 +979,7 @@ static void svm_do_nested_pgfault(paddr_
         __trace_var(TRC_HVM_NPF, 0, sizeof(_d), &_d);
     }
 
-    if ( hvm_hap_nested_page_fault(gpa, 0, ~0ull, 0, 0, 0, 0) )
+    if ( hvm_hap_nested_page_fault(gpa, 0, ~0ul, 0, 0, 0, 0) )
         return;
 
     /* Everything else is an error. */
diff -r 6ec9d1491f2a -r 14ee2ec6ad5a xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Fri Jan 07 11:54:52 2011 +0000
+++ b/xen/arch/x86/mm/p2m.c     Fri Jan 07 11:55:35 2011 +0000
@@ -2857,7 +2857,6 @@ void p2m_mem_paging_resume(struct p2m_do
     /* Unpause any domains that were paused because the ring was full */
     mem_event_unpause_vcpus(d);
 }
-#endif /* __x86_64__ */
 
 void p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long 
gla, 
                           bool_t access_r, bool_t access_w, bool_t access_x)
@@ -2949,6 +2948,7 @@ void p2m_mem_access_resume(struct p2m_do
      * was available */
     mem_event_unpause_vcpus(d);
 }
+#endif /* __x86_64__ */
 
 /*
  * Local variables:
diff -r 6ec9d1491f2a -r 14ee2ec6ad5a xen/include/asm-x86/hvm/hvm.h
--- a/xen/include/asm-x86/hvm/hvm.h     Fri Jan 07 11:54:52 2011 +0000
+++ b/xen/include/asm-x86/hvm/hvm.h     Fri Jan 07 11:55:35 2011 +0000
@@ -372,6 +372,7 @@ int hvm_x2apic_msr_read(struct vcpu *v, 
 int hvm_x2apic_msr_read(struct vcpu *v, unsigned int msr, uint64_t 
*msr_content);
 int hvm_x2apic_msr_write(struct vcpu *v, unsigned int msr, uint64_t 
msr_content);
 
+#ifdef __x86_64__
 /* Called for current VCPU on crX changes by guest */
 void hvm_memory_event_cr0(unsigned long value, unsigned long old);
 void hvm_memory_event_cr3(unsigned long value, unsigned long old);
@@ -379,5 +380,15 @@ void hvm_memory_event_cr4(unsigned long 
 
 /* Called for current VCPU on int3: returns -1 if no listener */
 int hvm_memory_event_int3(unsigned long gla);
+#else
+static inline void hvm_memory_event_cr0(unsigned long value, unsigned long old)
+{ }
+static inline void hvm_memory_event_cr3(unsigned long value, unsigned long old)
+{ }
+static inline void hvm_memory_event_cr4(unsigned long value, unsigned long old)
+{ }
+static inline int hvm_memory_event_int3(unsigned long gla)
+{ return 0; }
+#endif
 
 #endif /* __ASM_X86_HVM_HVM_H__ */
diff -r 6ec9d1491f2a -r 14ee2ec6ad5a xen/include/asm-x86/p2m.h
--- a/xen/include/asm-x86/p2m.h Fri Jan 07 11:54:52 2011 +0000
+++ b/xen/include/asm-x86/p2m.h Fri Jan 07 11:55:35 2011 +0000
@@ -522,12 +522,19 @@ static inline void p2m_mem_paging_popula
 { }
 #endif
 
+#ifdef __x86_64__
 /* Send mem event based on the access (gla is -1ull if not available).  Handles
  * the rw2rx conversion */
 void p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long 
gla, 
                           bool_t access_r, bool_t access_w, bool_t access_x);
 /* Resumes the running of the VCPU, restarting the last instruction */
 void p2m_mem_access_resume(struct p2m_domain *p2m);
+#else
+static inline void p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, 
+                                        unsigned long gla, bool_t access_r, 
+                                        bool_t access_w, bool_t access_x)
+{ }
+#endif
 
 struct page_info *p2m_alloc_ptp(struct p2m_domain *p2m, unsigned long type);
 

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