Changeset 4707 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Sep 11, 2007 12:35:12 PM (17 years ago)

Author:

vboxsync

Message:

Added backdoor logging to the Linux kernel modules, with full logging capability in debug builds

Location:

trunk/src/VBox/Additions/linux

Files:

• module/Makefile.module (modified) (2 diffs)
• module/files_vboxadd (modified) (4 diffs)
• sharedfolders/Makefile.kmk (modified) (1 diff)
• sharedfolders/Makefile.module (modified) (2 diffs)
• sharedfolders/files_vboxvfs (modified) (1 diff)
• sharedfolders/vfs-utils.c (deleted)

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

@@ -21 +21 @@
         vboxmod.o \
         GenericRequest.o \
+        HGCMInternal.o \
+        Init.o \
         PhysHeap.o \
         SysHlp.o \
-        Init.o \
         VMMDev.o \
-        HGCMInternal.o \
         r0drv/alloc-r0drv.o \
         r0drv/linux/alloc-r0drv-linux.o \
         r0drv/linux/semaphore-r0drv-linux.o
+#ifdef DEBUG
+OBJS  += \
+        logbackdoor.o \
+        logformat.o \
+        strformat.o \
+        strformatrt.o \
+        strformat-vbox.o \
+        udivdi3.o \
+        umoddi3.o \
+        qdivrem.o
+#endif
 
 ifneq ($(MAKECMDGOALS),clean)
@@ -96 +107 @@
  export INCL
 endif
-KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ -DIN_RT_R0 -DIN_SUP_R0 \
-            -DVBGL_VBOXGUEST -DVBOX_HGCM -DLOG_TO_BACKDOOR
-#ifeq ($(BUILD_TYPE),debug) - you'll have to enable this manually to get debug stuff.
-#KFLAGS   += -DDEBUG
+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
+#ifeq ($(BUILD_TYPE),debug)
+KFLAGS   += -DDEBUG
 #endif
 

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

@@ -14 +14 @@
 
 FILES_VBOXADD_NOBIN=" \
+    ${PATH_ROOT}/include/iprt/nocrt/limits.h=>include/iprt/nocrt/limits.h \
     ${PATH_ROOT}/include/iprt/alloca.h=>include/iprt/alloca.h \
     ${PATH_ROOT}/include/iprt/alloc.h=>include/iprt/alloc.h \
@@ -27 +28 @@
     ${PATH_ROOT}/include/iprt/stdint.h=>include/iprt/stdint.h \
     ${PATH_ROOT}/include/iprt/string.h=>include/iprt/string.h \
+    ${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
     ${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
     ${PATH_ROOT}/include/VBox/cdefs.h=>include/VBox/cdefs.h \
@@ -45 +47 @@
     ${PATH_ROOT}/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp=>VMMDev.c \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
+    ${PATH_ROOT}/src/VBox/Runtime/include/internal/string.h=>include/internal/string.h \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/qdivrem.c=>qdivrem.c \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/quad.h=>quad.h \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/udivdi3.c=>udivdi3.c \
+    ${PATH_ROOT}/src/VBox/Runtime/math/gcc/umoddi3.c=>umoddi3.c \
     ${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 \
@@ -51 +58 @@
     ${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/VBox/logbackdoor.cpp=>logbackdoor.c \
+    ${PATH_ROOT}/src/VBox/Runtime/VBox/strformat-vbox.cpp=>strformat-vbox.c \
+    ${PATH_ROOT}/src/VBox/Runtime/logformat.cpp=>logformat.c \
+    ${PATH_ROOT}/src/VBox/Runtime/strformat.cpp=>strformat.c \
+    ${PATH_ROOT}/src/VBox/Runtime/strformatrt.cpp=>strformatrt.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/module/vboxmod.c=>vboxmod.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/module/cmc.c=>cmc.c \

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

@@ -46 +46 @@
 vboxvfs_DEFS           := KBUILD_MODNAME=KBUILD_STR\(vboxadd\) KBUILD_BASENAME=KBUILD_STR\(vboxadd\) MODULE IN_RING0 IN_RT_R0 VBOXGUEST VBOX_HGCM
 vboxvfs_LIBS            = $(PATH_LIB)/VBoxGuestLibLinux.a $(PATH_LIB)/RuntimeLnx32GuestR0.a
-vboxvfs_SOURCES         = vfsmod.c vfs-utils.c
+vboxvfs_SOURCES         = vfsmod.c
 vboxvfs_NOINST          = 1
 vboxvfs_CFLAGS         += -fshort-wchar

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

@@ -18 +18 @@
 OBJS   = \
         vfsmod.o \
-        vfs-utils.o \
         GenericRequest.o \
         SysHlp.o \
@@ -97 +96 @@
  export INCL
 endif
-KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ -DIN_RT_R0 -DIN_SUP_R0 \
-            -DVBOX_HGCM -DLOG_TO_BACKDOOR
-#ifeq ($(BUILD_TYPE),debug) - you'll have to enable this manually to get debug stuff.
-#KFLAGS   += -DDEBUG
-#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
+ifeq ($(BUILD_TYPE),debug)
+KFLAGS   += -DDEBUG
+endif
 
 ifeq ($(KERN_VERSION), 24)

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

@@ -61 +61 @@
     ${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/regops.c=>regops.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/utils.c=>utils.c \
-    ${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/vfs-utils.c=>vfs-utils.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/vbsfmount.h=>vbsfmount.h \
     ${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/vfsmod.c=>vfsmod.c \