Changeset 21351 in vbox for trunk/src/VBox/HostDrivers/VBoxNetAdp/linux

Timestamp:

Jul 7, 2009 3:56:04 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49700

Message:

HstDrv: Made vboxnetadp and vboxnetflt use IPRT from vboxdrv.

Location:

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux

Files:

• Makefile (modified) (2 diffs)
• VBoxNetAdp-linux.c (modified) (3 diffs)
• files_vboxnetadp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile

@@ -67 +67 @@
 OBJS   = \
         linux/VBoxNetAdp-linux.o \
-        VBoxNetAdp.o \
-        r0drv/alloc-r0drv.o \
-        r0drv/initterm-r0drv.o \
-        r0drv/memobj-r0drv.o \
-        r0drv/mpnotification-r0drv.o \
-        r0drv/powernotification-r0drv.o \
-        r0drv/linux/assert-r0drv-linux.o \
-        r0drv/linux/alloc-r0drv-linux.o \
-        r0drv/linux/initterm-r0drv-linux.o \
-        r0drv/linux/memobj-r0drv-linux.o \
-        r0drv/linux/mp-r0drv-linux.o \
-        r0drv/linux/mpnotification-r0drv-linux.o \
-        r0drv/linux/process-r0drv-linux.o \
-        r0drv/linux/semevent-r0drv-linux.o \
-        r0drv/linux/semeventmulti-r0drv-linux.o \
-        r0drv/linux/semfastmutex-r0drv-linux.o \
-        r0drv/linux/spinlock-r0drv-linux.o \
-        r0drv/linux/thread-r0drv-linux.o \
-        r0drv/linux/thread2-r0drv-linux.o \
-        r0drv/linux/time-r0drv-linux.o \
-        common/err/RTErrConvertFromErrno.o \
-        common/err/RTErrConvertToErrno.o \
-        common/log/log.o \
-        common/log/logellipsis.o \
-        common/log/logrel.o \
-        common/log/logrelellipsis.o \
-        common/log/logcom.o \
-        common/log/logformat.o \
-        common/string/strformat.o \
-        common/string/strformatrt.o \
-        common/string/strformattype.o \
-        common/string/strprintf.o \
-        common/string/strtonum.o \
-        r0drv/linux/RTLogWriteDebugger-r0drv-linux.o \
-        generic/RTAssertShouldPanic-generic.o \
-        generic/RTLogWriteStdErr-stub-generic.o \
-        generic/RTLogWriteStdOut-stub-generic.o \
-        generic/RTLogWriteUser-generic.o \
-        generic/uuid-generic.o \
-        VBox/log-vbox.o \
-        VBox/strformat-vbox.o
+        VBoxNetAdp.o
 ifeq ($(BUILD_TARGET_ARCH),x86)
 OBJS += math/gcc/divdi3.o \
@@ -115 +75 @@
         math/gcc/divdi3.o \
         math/gcc/umoddi3.o
-endif
-ifeq ($(BUILD_TARGET_ARCH),amd64)
-OBJS += alloc/heapsimple.o
 endif
 

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c

@@ -72 +72 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-#ifdef RT_ARCH_AMD64
-/**
- * Memory for the executable memory heap (in IPRT).
- */
-extern uint8_t g_abExecMemory[4096]; /* cannot donate less than one page */
-__asm__(".section execmemory, \"awx\", @progbits\n\t"
-        ".align 32\n\t"
-        ".globl g_abExecMemory\n"
-        "g_abExecMemory:\n\t"
-        ".zero 4096\n\t"
-        ".type g_abExecMemory, @object\n\t"
-        ".size g_abExecMemory, 4096\n\t"
-        ".text\n\t");
-#endif
-
 module_init(VBoxNetAdpLinuxInit);
 module_exit(VBoxNetAdpLinuxUnload);
@@ -359 +344 @@
     if (RT_SUCCESS(rc))
     {
-#ifdef RT_ARCH_AMD64
-        rc = RTR0MemExecDonate(&g_abExecMemory[0], sizeof(g_abExecMemory));
-        printk(KERN_DEBUG "VBoxNetAdp: dbg - g_abExecMemory=%p\n", (void *)&g_abExecMemory[0]);
-        if (RT_FAILURE(rc))
-        {
-            printk(KERN_WARNING "VBoxNetAdp: failed to donate exec memory, no logging will be available.\n");
-        }
-#endif
         Log(("VBoxNetAdpLinuxInit\n"));
 
@@ -417 +394 @@
     Log(("VBoxNetFltLinuxUnload - done\n"));
 }
+

trunk/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp

@@ -1 +1 @@
 #!/bin/sh
+# $Revision$
+## @files
+# Shared file between Makefile.kmk and export_modules
 #
-# Shared file between Makefile.kmk and export_modules
+
 #
 # Copyright (C) 2009 Sun Microsystems, Inc.
@@ -26 +29 @@
 # additional information or have any questions.
 #
-
-## @todo
-# At the moment we'll be exporting everything we need here, later
-# we'll be linking against IPRT in vboxdrv like Darwin and Solaris does.
 
 VBOX_VBOXNETADP_SOURCES=" \
@@ -71 +70 @@
     ${PATH_ROOT}/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c=>VBoxNetAdp.c \
     ${PATH_ROOT}/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h=>VBoxNetAdpInternal.h \
-    ${PATH_ROOT}/src/VBox/Runtime/common/alloc/heapsimple.cpp=>alloc/heapsimple.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp=>common/err/RTErrConvertFromErrno.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp=>common/err/RTErrConvertToErrno.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/log/log.cpp=>common/log/log.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/log/logellipsis.cpp=>common/log/logellipsis.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/log/logrel.cpp=>common/log/logrel.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/log/logrelellipsis.cpp=>common/log/logrelellipsis.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/log/logcom.cpp=>common/log/logcom.c \
-    ${PATH_ROOT}/src/VBox/Runtime/common/log/logformat.cpp=>common/log/logformat.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/divdi3.c=>math/gcc/divdi3.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/math/gcc/moddi3.c=>math/gcc/moddi3.c \
@@ -91 +81 @@
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strprintf.cpp=>common/string/strprintf.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strtonum.cpp=>common/string/strtonum.c \
-    ${PATH_ROOT}/src/VBox/Runtime/include/internal/initterm.h=>include/internal/initterm.h \
     ${PATH_ROOT}/src/VBox/Runtime/include/internal/iprt.h=>include/internal/iprt.h \
-    ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \
-    ${PATH_ROOT}/src/VBox/Runtime/include/internal/memobj.h=>include/internal/memobj.h \
-    ${PATH_ROOT}/src/VBox/Runtime/include/internal/string.h=>include/internal/string.h \
-    ${PATH_ROOT}/src/VBox/Runtime/include/internal/thread.h=>include/internal/thread.h \
-    ${PATH_ROOT}/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp=>generic/RTAssertShouldPanic-generic.c \
-    ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp=>generic/RTLogWriteStdErr-stub-generic.c \
-    ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp=>generic/RTLogWriteStdOut-stub-generic.c \
-    ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp=>generic/RTLogWriteUser-generic.c \
-    ${PATH_ROOT}/src/VBox/Runtime/generic/uuid-generic.cpp=>generic/uuid-generic.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 \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/initterm-r0drv.cpp=>r0drv/initterm-r0drv.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/mp-r0drv.h=>r0drv/mp-r0drv.h \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/mpnotification-r0drv.c=>r0drv/mpnotification-r0drv.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/power-r0drv.h=>r0drv/power-r0drv.h \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/powernotification-r0drv.c=>r0drv/powernotification-r0drv.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c=>r0drv/linux/RTLogWriteDebugger-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/alloc-r0drv-linux.c=>r0drv/linux/alloc-r0drv-linux.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c=>r0drv/linux/initterm-r0drv-linux.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c=>r0drv/linux/memobj-r0drv-linux.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c=>r0drv/linux/mp-r0drv-linux.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c=>r0drv/linux/mpnotification-r0drv-linux.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c=>r0drv/linux/process-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 \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c=>r0drv/linux/semfastmutex-r0drv-linux.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c=>r0drv/linux/spinlock-r0drv-linux.c \
-    ${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/r0drv/linux/thread-r0drv-linux.c=>r0drv/linux/thread-r0drv-linux.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c=>r0drv/linux/thread2-r0drv-linux.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c=>r0drv/linux/time-r0drv-linux.c \
-    ${PATH_ROOT}/src/VBox/Runtime/r0drv/memobj-r0drv.cpp=>r0drv/memobj-r0drv.c \
-    ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \
-    ${PATH_ROOT}/src/VBox/Runtime/VBox/strformat-vbox.cpp=>VBox/strformat-vbox.c \
     ${PATH_OUT}/version-generated.h=>version-generated.h \
 "