Changeset 64650 in vbox for trunk/include/VBox

Timestamp:

Nov 11, 2016 2:55:07 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8614: Additions/common/VBoxVideo: make the code more self-contained: my last attempt at removing all assertions from debug versions of the Linux video driver was not correct: I missed some places, and forgot that LINUX_VERSION_CODE is only defined when Linux headers are included. Hopefully fix that.

Location:

trunk/include/VBox

Files:

• HGSMI/HGSMIMemAlloc.h (modified) (1 diff)
• VBoxVideoGuest.h (modified) (1 diff)

trunk/include/VBox/HGSMI/HGSMIMemAlloc.h

@@ -92 +92 @@
 {
     HGSMIOFFSET order = HGSMIPopCnt32(cb - 1) - HGSMI_MA_DESC_ORDER_BASE;
+#ifdef HGSMI_STRICT
     Assert(HGSMIMAOrder2Size(order) == cb);
+#endif
     return order;
 }

trunk/include/VBox/VBoxVideoGuest.h

@@ -52 +52 @@
  typedef HGSMIHEAP HGSMIGUESTCMDHEAP;
 # define HGSMIGUESTCMDHEAP_GET(_p) (_p)
+#endif
+
+#if defined(IN_RING0) && defined(RT_OS_LINUX)
+# define VBVOAssert(a) do {} while(0)
+# define VBVOAssertPtr(a) do {} while(0)
+# define VBVOAssertReturnVoid(a) if (!(a)) return
+# define VBVOAssertRC(a) do {} while(0)
+# define VBVOAssertPtrNullReturnVoid(a) do {} while(0)
+# define VBVOAssertPtrReturnVoid(a) if (!(a)) return
+#else
+# define VBVOAssert Assert
+# define VBVOAssertPtr AssertPtr
+# define VBVOAssertReturnVoid AssertReturnVoid
+# define VBVOAssertRC AssertRC
+# define VBVOAssertPtrNullReturnVoid AssertPtrNullReturnVoid
+# define VBVOAssertPtrReturnVoid AssertPtrReturnVoid
 #endif