[Xen-changelog] [xen-unstable] xen: stringify assertion condition for printing sooner.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1295341317 0
# Node ID 96441daf4a5b71bb5df81b9475a08f307d1d53e5
# Parent  02c0af2bf280e37c891e1ac9c5b6baa5799527cb
xen: stringify assertion condition for printing sooner.

So that:
(XEN) Assertion '!(((*({ unsigned long __ptr; __asm__ ("" :
"=r"(__ptr) : "0"(&per_cpu____preempt_count));
(typeof(&per_cpu____preempt_count)) (__ptr +
(get_cpu_info()->per_cpu_offset)); }))) ||
((irq_stat[(((get_cpu_info()->processor_id)1...
becomes:
(XEN) Assertion '"!in_atomic()"' failed at softirq.c:61

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/include/asm-x86/bug.h |    2 +-
 xen/include/xen/lib.h     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r 02c0af2bf280 -r 96441daf4a5b xen/include/asm-x86/bug.h
--- a/xen/include/asm-x86/bug.h Mon Jan 17 18:05:52 2011 +0000
+++ b/xen/include/asm-x86/bug.h Tue Jan 18 09:01:57 2011 +0000
@@ -40,7 +40,7 @@ struct bug_frame {
     asm volatile (                                 \
         "ud2 ; ret %0" BUG_STR(1) BUG_STR(2)       \
         : : "i" (BUGFRAME_assert | (__LINE__<<2)), \
-            "i" (__FILE__), "i" (#p) )
+            "i" (__FILE__), "i" (p) )
 
 
 #endif /* __X86_BUG_H__ */
diff -r 02c0af2bf280 -r 96441daf4a5b xen/include/xen/lib.h
--- a/xen/include/xen/lib.h     Mon Jan 17 18:05:52 2011 +0000
+++ b/xen/include/xen/lib.h     Tue Jan 18 09:01:57 2011 +0000
@@ -27,7 +27,7 @@ void __warn(char *file, int line);
 #ifndef assert_failed
 #define assert_failed(p)                                        \
 do {                                                            \
-    printk("Assertion '%s' failed, line %d, file %s\n", #p ,    \
+    printk("Assertion '%s' failed, line %d, file %s\n", p ,     \
                    __LINE__, __FILE__);                         \
     BUG();                                                      \
 } while (0)
@@ -35,7 +35,7 @@ do {                                    
 
 #ifndef NDEBUG
 #define ASSERT(p) \
-    do { if ( unlikely(!(p)) ) assert_failed(p); } while (0)
+    do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0)
 #else
 #define ASSERT(p) ((void)0)
 #endif

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