Changeset 31829 in vbox for trunk

Timestamp:

Aug 20, 2010 11:19:37 PM (14 years ago)

Author:

vboxsync

Message:

IPRT,SUP: Moved the strformat*.cpp completely out of RuntimeR0 on all platforms so that %RT[pgmpage] will work in ring-0. Minor SUPDrv IOC interface version increment.

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDrv.c (modified) (4 diffs)
• HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• HostDrivers/Support/SUPLib.cpp (modified) (1 diff)
• HostDrivers/Support/freebsd/Makefile (modified) (1 diff)
• HostDrivers/Support/freebsd/files_vboxdrv (modified) (2 diffs)
• HostDrivers/Support/linux/Makefile (modified) (2 diffs)
• HostDrivers/Support/linux/files_vboxdrv (modified) (2 diffs)
• Runtime/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -47 +47 @@
 #include <iprt/thread.h>
 #include <iprt/uuid.h>
-#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(RT_OS_WINDOWS)
-# include <iprt/net.h>
-# include <iprt/crc32.h>
-# include <iprt/string.h>
+#include <iprt/net.h>
+#include <iprt/crc32.h>
+#include <iprt/string.h>
+#if defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
 # include <iprt/rand.h>
 # include <iprt/path.h>
@@ -300 +300 @@
     { "RTAssertSetMayPanic",                    (void *)RTAssertSetMayPanic },
     { "RTAssertAreQuiet",                       (void *)RTAssertAreQuiet },
-#ifdef RT_OS_WINDOWS
-    /* We need to include more of our runtime to prevent the dynamically linked R0 modules to get too large. */
+    { "RTStrFormat",                            (void *)RTStrFormat },
+    { "RTStrFormatNumber",                      (void *)RTStrFormatNumber },
+    { "RTStrFormatTypeDeregister",              (void *)RTStrFormatTypeDeregister },
+    { "RTStrFormatTypeRegister",                (void *)RTStrFormatTypeRegister },
+    { "RTStrFormatTypeSetUser",                 (void *)RTStrFormatTypeSetUser },
+    { "RTStrFormatV",                           (void *)RTStrFormatV },
+    { "RTStrPrintf",                            (void *)RTStrPrintf },
+    { "RTStrPrintfEx",                          (void *)RTStrPrintfEx },
+    { "RTStrPrintfExV",                         (void *)RTStrPrintfExV },
+    { "RTStrPrintfV",                           (void *)RTStrPrintfV },
+    { "RTHandleTableAllocWithCtx",              (void *)RTHandleTableAllocWithCtx },
+    { "RTHandleTableCreate",                    (void *)RTHandleTableCreate },
+    { "RTHandleTableCreateEx",                  (void *)RTHandleTableCreateEx },
+    { "RTHandleTableDestroy",                   (void *)RTHandleTableDestroy },
+    { "RTHandleTableFreeWithCtx",               (void *)RTHandleTableFreeWithCtx },
+    { "RTHandleTableLookupWithCtx",             (void *)RTHandleTableLookupWithCtx },
     { "RTNetIPv4AddDataChecksum",               (void *)RTNetIPv4AddDataChecksum },
     { "RTNetIPv4AddTCPChecksum",                (void *)RTNetIPv4AddTCPChecksum },
@@ -322 +336 @@
     { "RTNetTCPChecksum",                       (void *)RTNetTCPChecksum },
     { "RTNetUDPChecksum",                       (void *)RTNetUDPChecksum },
-    { "RTStrFormat",                            (void *)RTStrFormat },
-    { "RTStrFormatNumber",                      (void *)RTStrFormatNumber },
-    { "RTStrFormatTypeDeregister",              (void *)RTStrFormatTypeDeregister },
-    { "RTStrFormatTypeRegister",                (void *)RTStrFormatTypeRegister },
-    { "RTStrFormatTypeSetUser",                 (void *)RTStrFormatTypeSetUser },
-    { "RTStrFormatV",                           (void *)RTStrFormatV },
-    { "RTStrPrintf",                            (void *)RTStrPrintf },
-    { "RTStrPrintfEx",                          (void *)RTStrPrintfEx },
-    { "RTStrPrintfExV",                         (void *)RTStrPrintfExV },
-    { "RTStrPrintfV",                           (void *)RTStrPrintfV },
     { "RTCrc32",                                (void *)RTCrc32 },
     { "RTCrc32Finish",                          (void *)RTCrc32Finish },
     { "RTCrc32Process",                         (void *)RTCrc32Process },
     { "RTCrc32Start",                           (void *)RTCrc32Start },
-    { "RTHandleTableAllocWithCtx",              (void *)RTHandleTableAllocWithCtx },
-    { "RTHandleTableCreate",                    (void *)RTHandleTableCreate },
-    { "RTHandleTableCreateEx",                  (void *)RTHandleTableCreateEx },
-    { "RTHandleTableDestroy",                   (void *)RTHandleTableDestroy },
-    { "RTHandleTableFreeWithCtx",               (void *)RTHandleTableFreeWithCtx },
-    { "RTHandleTableLookupWithCtx",             (void *)RTHandleTableLookupWithCtx },
-#endif
 };
 
@@ -353 +350 @@
 {
     /* VBoxNetFlt */
-    (PFNRT)RTCrc32,
     (PFNRT)RTErrConvertFromErrno,
-    (PFNRT)RTNetIPv4IsHdrValid,
-    (PFNRT)RTNetIPv4TCPChecksum,
-    (PFNRT)RTNetIPv4UDPChecksum,
     (PFNRT)RTUuidCompare,
     (PFNRT)RTUuidCompareStr,

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -193 +193 @@
  *          - Nothing.
  */
-#define SUPDRV_IOC_VERSION                              0x00150000
+#define SUPDRV_IOC_VERSION                              0x00150001
 
 /** SUP_IOCTL_COOKIE. */

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -268 +268 @@
         strcpy(CookieReq.u.In.szMagic, SUPCOOKIE_MAGIC);
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
-        const uint32_t uMinVersion = /*(SUPDRV_IOC_VERSION & 0xffff0000) == 0x00150000
+        const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00150000
                                    ?  0x00150001
-                                   :*/ SUPDRV_IOC_VERSION & 0xffff0000;
+                                   : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;
         rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_COOKIE, &CookieReq, SUP_IOCTL_COOKIE_SIZE);

trunk/src/VBox/HostDrivers/Support/freebsd/Makefile

@@ -105 +105 @@
 SRCS += \
         crc32.c \
-        ipv4.c
+        ipv4.c \
+        ipv6.c
 
 .PATH:  ${.CURDIR}/common/table

trunk/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv

@@ -36 +36 @@
     ${PATH_ROOT}/include/iprt/cdefs.h=>include/iprt/cdefs.h \
     ${PATH_ROOT}/include/iprt/cpuset.h=>include/iprt/cpuset.h \
+    ${PATH_ROOT}/include/iprt/crc.h=>include/iprt/crc.h \
     ${PATH_ROOT}/include/iprt/ctype.h=>include/iprt/ctype.h \
     ${PATH_ROOT}/include/iprt/err.h=>include/iprt/err.h \
@@ -119 +120 @@
     ${PATH_ROOT}/src/VBox/Runtime/common/checksum/crc32.cpp=>common/checksum/crc32.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/checksum/ipv4.cpp=>common/checksum/ipv4.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/checksum/ipv6.cpp=>common/checksum/ipv6.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/table/avlpv.cpp=>common/table/avlpv.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/table/avl_Base.cpp.h=>common/table/avl_Base.cpp.h \

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -6 +6 @@
 #
 #
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -98 +98 @@
         r0drv/generic/semspinmutex-r0drv-generic.o \
         common/alloc/alloc.o \
+        common/checksum/crc32.o \
         common/checksum/ipv4.o \
         common/checksum/ipv6.o \

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -35 +35 @@
     ${PATH_ROOT}/include/iprt/cdefs.h=>include/iprt/cdefs.h \
     ${PATH_ROOT}/include/iprt/cpuset.h=>include/iprt/cpuset.h \
+    ${PATH_ROOT}/include/iprt/crc.h=>include/iprt/crc.h \
     ${PATH_ROOT}/include/iprt/ctype.h=>include/iprt/ctype.h \
     ${PATH_ROOT}/include/iprt/err.h=>include/iprt/err.h \
@@ -80 +81 @@
     ${PATH_ROOT}/src/VBox/Runtime/common/alloc/alloc.cpp=>common/alloc/alloc.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/alloc/heapsimple.cpp=>common/alloc/heapsimple.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/checksum/crc32.cpp=>common/checksum/crc32.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/checksum/ipv4.cpp=>common/checksum/ipv4.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/checksum/ipv6.cpp=>common/checksum/ipv6.c \

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1256 +1256 @@
         $(RuntimeNoCrt_SOURCES)
 
-ifneq ($(KBUILD_TARGET),win)
-RuntimeR0_SOURCES      += \
-        common/checksum/crc32.cpp \
-        common/checksum/crc64.cpp \
-        common/checksum/md5.cpp \
-        common/checksum/ipv4.cpp \
-        common/checksum/ipv6.cpp \
-        common/misc/handletable.cpp \
-        common/misc/handletablectx.cpp \
-        common/misc/handletablesimple.cpp \
-        common/string/strformat.cpp \
-        common/string/strformatrt.cpp \
-        common/string/strformattype.cpp \
-        common/string/strprintf.cpp
-endif
-
 if1of ($(KBUILD_TARGET), darwin solaris freebsd)
 RuntimeR0_SOURCES += \