Changeset 5042 in vbox for trunk/src

Timestamp:

Sep 26, 2007 9:52:01 AM (17 years ago)

Author:

vboxsync

Message:

Fixes to the Linux additions - use and export functions from the runtime

Location:

trunk/src/VBox

Files:

• Additions/linux/module/Makefile.module (modified) (2 diffs)
• Additions/linux/module/files_vboxadd (modified) (1 diff)
• Additions/linux/module/vboxmod.c (modified) (1 diff)
• Additions/linux/sharedfolders/Makefile.module (modified) (2 diffs)
• Additions/linux/sharedfolders/files_vboxvfs (modified) (1 diff)
• Runtime/RTErrConvertToErrno.cpp (modified) (1 diff)

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

@@ -35 +35 @@
         umoddi3.o \
         qdivrem.o \
+        assert.o \
         logbackdoor.o \
         logformat.o \
@@ -109 +110 @@
 KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ \
             -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DVBGL_VBOXGUEST -DVBOX_HGCM \
-            -DLOG_TO_BACKDOOR -DRT_WITH_VBOX -DIN_MODULE
+            -DLOG_TO_BACKDOOR -DRT_WITH_VBOX -DIN_MODULE -DIN_GUEST_R0
 ifeq ($(BUILD_TYPE),debug)
 KFLAGS   += -DDEBUG

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

@@ -63 +63 @@
     ${PATH_ROOT}/src/VBox/Runtime/VBox/strformat-vbox.cpp=>strformat-vbox.c \
     ${PATH_ROOT}/src/VBox/Runtime/RTErrConvertToErrno.cpp=>RTErrConvertToErrno.c \
+    ${PATH_ROOT}/src/VBox/Runtime/assert.cpp=>assert.c \
     ${PATH_ROOT}/src/VBox/Runtime/logformat.cpp=>logformat.c \
     ${PATH_ROOT}/src/VBox/Runtime/strformat.cpp=>strformat.c \

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

@@ -34 +34 @@
 #endif
 
-/* Runtime assert implementation for Linux ring 0 */
-RTDECL(void) AssertMsg1(const char *pszExpr, unsigned uLine,
-                        const char *pszFile, const char *pszFunction)
-{
-    Log(("!!Assertion Failed!!\n"
-         "Expression: %s\n"
-         "Location  : %s(%d) %s\n",
-         pszExpr, pszFile, uLine, pszFunction));
-}
-EXPORT_SYMBOL(AssertMsg1);
-
-/* Runtime assert implementation for Linux ring 0 */
-RTDECL(void) AssertMsg2(const char *pszFormat, ...)
-{
-    va_list ap;
-    char    msg[256];
-
-    va_start(ap, pszFormat);
-    vsnprintf(msg, sizeof(msg) - 1, pszFormat, ap);
-    msg[sizeof(msg) - 1] = '\0';
-    Log(("%s", msg));
-    va_end(ap);
-}
-EXPORT_SYMBOL(AssertMsg2);
-
+/* 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)
 {

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

@@ -31 +31 @@
         r0drv/linux/alloc-r0drv-linux.o \
         r0drv/linux/semaphore-r0drv-linux.o \
-        RTErrConvertToErrno.o \
         divdi3.o \
         moddi3.o \
@@ -108 +107 @@
 endif
 KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ -DIN_RT_R0 \
-            -DIN_SUP_R0 -DVBOX -DVBOX_HGCM -DLOG_TO_BACKDOOR -DIN_MODULE
+            -DIN_SUP_R0 -DVBOX -DVBOX_HGCM -DLOG_TO_BACKDOOR -DIN_MODULE \
+            -DIN_GUEST_R0
 ifeq ($(BUILD_TYPE),debug)
 KFLAGS   += -DDEBUG

trunk/src/VBox/Additions/linux/sharedfolders/files_vboxvfs

@@ -64 +64 @@
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/string.h=>r0drv/linux/string.h \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
-    ${PATH_ROOT}/src/VBox/Runtime/RTErrConvertToErrno.cpp=>RTErrConvertToErrno.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/Makefile.module=>Makefile \
     ${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/dirops.c=>dirops.c \

trunk/src/VBox/Runtime/RTErrConvertToErrno.cpp

@@ -432 +432 @@
 }
 
+#if defined(RT_OS_LINUX) && defined(IN_MODULE)
+EXPORT_SYMBOL(RTErrConvertToErrno);
+#endif