Changeset 21351 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux
- Timestamp:
- Jul 7, 2009 3:56:04 PM (15 years ago)
- Location:
- trunk/src/VBox/HostDrivers/VBoxNetFlt/linux
- Files:
-
- 3 edited
-
Makefile (modified) (2 diffs)
-
VBoxNetFlt-linux.c (modified) (4 diffs)
-
files_vboxnetflt (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
r19938 r21351 71 71 SUPR0IdcClientComponent.o \ 72 72 SUPR0IdcClient-linux.o \ 73 r0drv/alloc-r0drv.o \ 74 r0drv/initterm-r0drv.o \ 75 r0drv/memobj-r0drv.o \ 76 r0drv/mpnotification-r0drv.o \ 77 r0drv/powernotification-r0drv.o \ 78 r0drv/linux/assert-r0drv-linux.o \ 79 r0drv/linux/alloc-r0drv-linux.o \ 80 r0drv/linux/initterm-r0drv-linux.o \ 81 r0drv/linux/memobj-r0drv-linux.o \ 82 r0drv/linux/mp-r0drv-linux.o \ 83 r0drv/linux/mpnotification-r0drv-linux.o \ 84 r0drv/linux/process-r0drv-linux.o \ 85 r0drv/linux/semevent-r0drv-linux.o \ 86 r0drv/linux/semeventmulti-r0drv-linux.o \ 87 r0drv/linux/semfastmutex-r0drv-linux.o \ 88 r0drv/linux/spinlock-r0drv-linux.o \ 89 r0drv/linux/thread-r0drv-linux.o \ 90 r0drv/linux/thread2-r0drv-linux.o \ 91 r0drv/linux/time-r0drv-linux.o \ 92 common/err/RTErrConvertFromErrno.o \ 93 common/err/RTErrConvertToErrno.o \ 94 common/log/log.o \ 95 common/log/logellipsis.o \ 96 common/log/logrel.o \ 97 common/log/logrelellipsis.o \ 98 common/log/logcom.o \ 99 common/log/logformat.o \ 100 common/string/strformat.o \ 101 common/string/strformatrt.o \ 102 common/string/strformattype.o \ 103 common/string/strprintf.o \ 104 common/string/strtonum.o \ 105 r0drv/linux/RTLogWriteDebugger-r0drv-linux.o \ 106 generic/RTAssertShouldPanic-generic.o \ 107 generic/RTLogWriteStdErr-stub-generic.o \ 108 generic/RTLogWriteStdOut-stub-generic.o \ 109 generic/RTLogWriteUser-generic.o \ 110 generic/uuid-generic.o \ 111 VBox/log-vbox.o \ 112 VBox/strformat-vbox.o 73 113 74 ifeq ($(BUILD_TARGET_ARCH),x86) 114 75 OBJS += math/gcc/divdi3.o \ … … 118 79 math/gcc/divdi3.o \ 119 80 math/gcc/umoddi3.o 120 endif121 ifeq ($(BUILD_TARGET_ARCH),amd64)122 OBJS += alloc/heapsimple.o123 81 endif 124 82 -
trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
r20414 r21351 125 125 * The (common) global data. 126 126 */ 127 #ifdef RT_ARCH_AMD64128 /**129 * Memory for the executable memory heap (in IPRT).130 */131 extern uint8_t g_abExecMemory[4096]; /* cannot donate less than one page */132 __asm__(".section execmemory, \"awx\", @progbits\n\t"133 ".align 32\n\t"134 ".globl g_abExecMemory\n"135 "g_abExecMemory:\n\t"136 ".zero 4096\n\t"137 ".type g_abExecMemory, @object\n\t"138 ".size g_abExecMemory, 4096\n\t"139 ".text\n\t");140 #endif141 142 127 static VBOXNETFLTGLOBALS g_VBoxNetFltGlobals; 143 128 … … 154 139 #endif 155 140 156 /**157 * The (common) global data.158 */159 static VBOXNETFLTGLOBALS g_VBoxNetFltGlobals;160 141 161 142 /** … … 173 154 if (RT_SUCCESS(rc)) 174 155 { 175 #ifdef RT_ARCH_AMD64176 rc = RTR0MemExecDonate(&g_abExecMemory[0], sizeof(g_abExecMemory));177 printk("VBoxNetFlt: dbg - g_abExecMemory=%p\n", (void *)&g_abExecMemory[0]);178 if (RT_FAILURE(rc))179 {180 printk("VBoxNetFlt: failed to donate exec memory, no logging will be available.\n");181 }182 #endif183 156 Log(("VBoxNetFltLinuxInit\n")); 184 157 … … 196 169 return 0; 197 170 } 198 else 199 171 172 LogRel(("VBoxNetFlt: failed to initialize device extension (rc=%d)\n", rc)); 200 173 RTR0Term(); 201 174 } -
trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt
r21337 r21351 1 1 #!/bin/sh 2 # $Id: $ 3 ## @file 4 # Shared file between Makefile.kmk and export_modules 2 5 # 3 # Shared file between Makefile.kmk and export_modules 6 4 7 # 5 8 # Copyright (C) 2007 Sun Microsystems, Inc. … … 26 29 # additional information or have any questions. 27 30 # 28 29 ## @todo30 # At the moment we'll be exporting everything we need here, later31 # we'll be linking against IPRT in vboxdrv like Darwin and Solaris does.32 31 33 32 VBOX_VBOXNETFLT_SOURCES=" \ … … 76 75 ${PATH_ROOT}/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h=>SUPR0IdcClientInternal.h \ 77 76 ${PATH_ROOT}/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c=>SUPR0IdcClient-linux.c \ 78 ${PATH_ROOT}/src/VBox/Runtime/common/alloc/heapsimple.cpp=>alloc/heapsimple.c \79 ${PATH_ROOT}/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp=>common/err/RTErrConvertFromErrno.c \80 ${PATH_ROOT}/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp=>common/err/RTErrConvertToErrno.c \81 ${PATH_ROOT}/src/VBox/Runtime/common/log/log.cpp=>common/log/log.c \82 ${PATH_ROOT}/src/VBox/Runtime/common/log/logellipsis.cpp=>common/log/logellipsis.c \83 ${PATH_ROOT}/src/VBox/Runtime/common/log/logrel.cpp=>common/log/logrel.c \84 ${PATH_ROOT}/src/VBox/Runtime/common/log/logrelellipsis.cpp=>common/log/logrelellipsis.c \85 ${PATH_ROOT}/src/VBox/Runtime/common/log/logcom.cpp=>common/log/logcom.c \86 ${PATH_ROOT}/src/VBox/Runtime/common/log/logformat.cpp=>common/log/logformat.c \87 77 ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/divdi3.c=>math/gcc/divdi3.c \ 88 78 ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/moddi3.c=>math/gcc/moddi3.c \ … … 91 81 ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/udivdi3.c=>math/gcc/udivdi3.c \ 92 82 ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/umoddi3.c=>math/gcc/umoddi3.c \ 93 ${PATH_ROOT}/src/VBox/Runtime/common/string/strformat.cpp=>common/string/strformat.c \94 ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatrt.cpp=>common/string/strformatrt.c \95 ${PATH_ROOT}/src/VBox/Runtime/common/string/strformattype.cpp=>common/string/strformattype.c \96 ${PATH_ROOT}/src/VBox/Runtime/common/string/strprintf.cpp=>common/string/strprintf.c \97 ${PATH_ROOT}/src/VBox/Runtime/common/string/strtonum.cpp=>common/string/strtonum.c \98 83 ${PATH_ROOT}/src/VBox/Runtime/include/internal/initterm.h=>include/internal/initterm.h \ 99 84 ${PATH_ROOT}/src/VBox/Runtime/include/internal/iprt.h=>include/internal/iprt.h \ 100 85 ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \ 101 ${PATH_ROOT}/src/VBox/Runtime/include/internal/memobj.h=>include/internal/memobj.h \102 ${PATH_ROOT}/src/VBox/Runtime/include/internal/string.h=>include/internal/string.h \103 ${PATH_ROOT}/src/VBox/Runtime/include/internal/thread.h=>include/internal/thread.h \104 ${PATH_ROOT}/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp=>generic/RTAssertShouldPanic-generic.c \105 ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp=>generic/RTLogWriteStdErr-stub-generic.c \106 ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp=>generic/RTLogWriteStdOut-stub-generic.c \107 ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp=>generic/RTLogWriteUser-generic.c \108 ${PATH_ROOT}/src/VBox/Runtime/generic/uuid-generic.cpp=>generic/uuid-generic.c \109 ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \110 ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \111 ${PATH_ROOT}/src/VBox/Runtime/r0drv/initterm-r0drv.cpp=>r0drv/initterm-r0drv.c \112 ${PATH_ROOT}/src/VBox/Runtime/r0drv/mp-r0drv.h=>r0drv/mp-r0drv.h \113 ${PATH_ROOT}/src/VBox/Runtime/r0drv/mpnotification-r0drv.c=>r0drv/mpnotification-r0drv.c \114 ${PATH_ROOT}/src/VBox/Runtime/r0drv/power-r0drv.h=>r0drv/power-r0drv.h \115 ${PATH_ROOT}/src/VBox/Runtime/r0drv/powernotification-r0drv.c=>r0drv/powernotification-r0drv.c \116 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c=>r0drv/linux/RTLogWriteDebugger-r0drv-linux.c \117 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c=>r0drv/linux/assert-r0drv-linux.c \118 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c=>r0drv/linux/alloc-r0drv-linux.c \119 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c=>r0drv/linux/initterm-r0drv-linux.c \120 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c=>r0drv/linux/memobj-r0drv-linux.c \121 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c=>r0drv/linux/mp-r0drv-linux.c \122 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c=>r0drv/linux/mpnotification-r0drv-linux.c \123 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c=>r0drv/linux/process-r0drv-linux.c \124 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c=>r0drv/linux/semevent-r0drv-linux.c \125 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c=>r0drv/linux/semeventmulti-r0drv-linux.c \126 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c=>r0drv/linux/semfastmutex-r0drv-linux.c \127 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c=>r0drv/linux/spinlock-r0drv-linux.c \128 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/string.h=>r0drv/linux/string.h \129 86 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \ 130 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c=>r0drv/linux/thread-r0drv-linux.c \131 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c=>r0drv/linux/thread2-r0drv-linux.c \132 ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c=>r0drv/linux/time-r0drv-linux.c \133 ${PATH_ROOT}/src/VBox/Runtime/r0drv/memobj-r0drv.cpp=>r0drv/memobj-r0drv.c \134 ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \135 ${PATH_ROOT}/src/VBox/Runtime/VBox/strformat-vbox.cpp=>VBox/strformat-vbox.c \136 87 ${PATH_OUT}/version-generated.h=>version-generated.h \ 137 88 "
Note:
See TracChangeset
for help on using the changeset viewer.
