From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 17 Jan 2008 14:40:23 +0000 (+0000)
Subject: minios: use ASSERT for BUG_ON
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=65599d122f50c115aef74344f1c14f4a877bd3e2;p=people%2Fliuw%2Flibxenctrl-split%2Fmini-os.git

minios: use ASSERT for BUG_ON

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
---

diff --git a/console/xencons_ring.c b/console/xencons_ring.c
index 1f9f497..f0cf920 100644
--- a/console/xencons_ring.c
+++ b/console/xencons_ring.c
@@ -9,9 +9,6 @@
 #include <xen/io/console.h>
 
 
-/* TODO - need to define BUG_ON for whole mini-os, need crash-dump as well */
-#define BUG_ON(_cond)   do{if(_cond) do_exit();} while(0);
-
 static inline struct xencons_interface *xencons_interface(void)
 {
     return mfn_to_virt(start_info.console.domU.mfn);
diff --git a/include/lib.h b/include/lib.h
index 1673d88..97a2305 100644
--- a/include/lib.h
+++ b/include/lib.h
@@ -111,6 +111,8 @@ do {                                                           \
 	}                                                          \
 } while(0)
 
+#define BUG_ON(x) ASSERT(!(x))
+
 /* Consistency check as much as possible. */
 void sanity_check(void);
 
diff --git a/xenbus/xenbus.c b/xenbus/xenbus.c
index d0dddad..a4aa0ac 100644
--- a/xenbus/xenbus.c
+++ b/xenbus/xenbus.c
@@ -28,10 +28,6 @@
 #include <spinlock.h>
 #include <xmalloc.h>
 
-#define BUG_ON(x) do { \
-    if (x) {printk("BUG at %s:%d\n", __FILE__, __LINE__); BUG(); } \
-} while (0)
-
 #define min(x,y) ({                       \
         typeof(x) tmpx = (x);                 \
         typeof(y) tmpy = (y);                 \