Changeset 13314 in vbox for trunk/src/VBox/Additions/linux/module

Timestamp:

Oct 15, 2008 10:46:08 PM (16 years ago)

Author:

vboxsync

Message:

Created assert-r0drv-linux.c (finally).

Location:

trunk/src/VBox/Additions/linux/module

Files:

• Makefile.module (modified) (3 diffs)
• files_vboxadd (modified) (1 diff)
• vboxmod.c (modified) (6 diffs)

trunk/src/VBox/Additions/linux/module/Makefile.module

@@ -71 +71 @@
         r0drv/alloc-r0drv.o \
         r0drv/linux/alloc-r0drv-linux.o \
+        r0drv/linux/assert-r0drv-linux.o \
         r0drv/linux/semevent-r0drv-linux.o \
         r0drv/linux/semfastmutex-r0drv-linux.o \
@@ -79 +80 @@
         umoddi3.o \
         qdivrem.o \
-        assert.o \
         logbackdoor.o \
         logformat.o \
@@ -85 +85 @@
         strformatrt.o \
         strformattype.o \
-        strformat-vbox.o
+        strformat-vbox.o \
+    RTAssertShouldPanic-generic.o
 ifeq ($(BUILD_TARGET_ARCH),amd64)
 OBJS += \

trunk/src/VBox/Additions/linux/module/files_vboxadd

@@ -66 +66 @@
     ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivdi3.c=>udivdi3.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/umoddi3.c=>umoddi3.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/misc/assert.cpp=>assert.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformat.cpp=>strformat.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatrt.cpp=>strformatrt.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformattype.cpp=>strformattype.c \
+    ${PATH_ROOT}/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp=>RTAssertShouldPanic-generic.cpp \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c=>r0drv/linux/alloc-r0drv-linux.c \
+    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c=>r0drv/linux/assert-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c=>r0drv/linux/semevent-r0drv-linux.c \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c=>r0drv/linux/semeventmulti-r0drv-linux.c \

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -1 +1 @@
 /** @file
- *
  * vboxadd -- VirtualBox Guest Additions for Linux
  */
@@ -85 +84 @@
 #endif
 
-/* This is called by our assert macros to find out whether we want
-   to insert a breakpoint after the assertion. In kernel modules we
-   do not of course. */
-RTDECL(bool)    RTAssertDoBreakpoint(void)
-{
-    return false;
-}
-EXPORT_SYMBOL(RTAssertDoBreakpoint);
-
 /** device extension structure (we only support one device instance) */
 static VBoxDevice *vboxDev = NULL;
@@ -115 +105 @@
 EXPORT_SYMBOL (vboxadd_cmc_open);
 EXPORT_SYMBOL (vboxadd_cmc_close);
+
+/** @todo check that this works for all the kernels. */
+EXPORT_SYMBOL (RTR0AssertPanicSystem);
+EXPORT_SYMBOL (RTAssertShouldPanic);
+EXPORT_SYMBOL (AssertMsg1);
+EXPORT_SYMBOL (AssertMsg2);
+
 
 #define MAX_HGCM_CONNECTIONS 1024
@@ -599 +596 @@
 
 /**
- * Dummy read function - we only supply this because we implement poll and 
+ * Dummy read function - we only supply this because we implement poll and
  * fasync.
  */
@@ -1167 +1164 @@
 MODULE_DEVICE_TABLE(pci, vmmdev_pci_id);
 
-int __gxx_personality_v0 = 0xdeadbeef;
+
 
 /*
@@ -1176 +1173 @@
  * End:
  */
+