Changeset 1345 in vbox

Timestamp:

Mar 8, 2007 9:21:41 PM (18 years ago)

Author:

vboxsync

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

19326

Message:

VBOX_WITH_INTERNAL_NETWORKING. disabled for L4 and Darwin.

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Devices/Builtins.cpp (modified) (3 diffs)
• src/VBox/Devices/Makefile (modified) (1 diff)
• src/VBox/VMM/Makefile (modified) (1 diff)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -211 +211 @@
 # Set this to skip installing the redistributable compiler runtime.
 #VBOX_WITHOUT_COMPILER_REDIST = 1
-
+# Enabled internal networking.
+VBOX_WITH_INTERNAL_NETWORKING = 1
 
 #
@@ -239 +240 @@
  VBOX_WITH_DOCS=
  VBOX_WITH_ISCSI=
-endif
-
-# Most stuff doesn't build yet on the two new targets.
-ifeq ($(filter-out darwin os2 freebsd,$(BUILD_TARGET)),)
+ VBOX_WITH_INTERNAL_NETWORKING=
+endif
+
+# Darwin have to skip a few things at present.
+ifeq ($(BUILD_TARGET),darwin)
+ # Internal networking requires testing and possibly proper ring-3/ring0 separation.
+ VBOX_WITH_INTERNAL_NETWORKING=
+ # Don't bother with SDL ttf for now.
+ VBOX_WITH_SECURELABEL=
+ # Later.
+ VBOX_WITH_USB=
+ VBOX_WITH_TESTSUITE=
+ VBOX_WITH_INSTALLER=
+ VBOX_WITH_DOCS=
+ VBOX_WITH_VRDP=
+ VBOX_WITH_VRDP_AUTHMOD=
+ VBOX_WITH_VRDP_RDESKTOP=
+ ifdef VBOX_OSE
+  VBOX_WITH_QTGUI=
+ endif
+endif
+
+# Most stuff doesn't build yet on the new targets.
+ifeq ($(filter-out os2 freebsd solaris,$(BUILD_TARGET)),)
  #VBOX_WITH_VBOXBFE=
- ifneq ($(filter-out darwin,$(BUILD_TARGET)),)
-  VBOX_WITH_MAIN=
-  VBOX_WITH_VBOXSDL=
-  VBOX_WITH_QTGUI=
-  VBOX_WITH_DEBUGGER_GUI=
- endif
+ VBOX_WITH_MAIN=
+ VBOX_WITH_VBOXSDL=
+ VBOX_WITH_QTGUI=
+ VBOX_WITH_DEBUGGER_GUI=
  VBOX_WITH_INSTALLER=
  VBOX_WITH_SECURELABEL=

trunk/src/VBox/Devices/Builtins.cpp

@@ -31 +31 @@
 
 #include <VBox/log.h>
+#include <VBox/config.h>
 #include <iprt/assert.h>
 
@@ -102 +103 @@
     if (VBOX_FAILURE(rc))
         return rc;
-#if 0 /** @todo remove this, see #1407. */
-    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceUSBBackend);
-    if (VBOX_FAILURE(rc))
-        return rc;
-#endif
 #if defined(VBOX_WITH_USB) && (defined(__WIN__) || defined(__LINUX__) || defined(__L4ENV__))
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceOHCI);
@@ -185 +181 @@
         return rc;
 #endif
-#if !defined(__DARWIN__) && !defined(__OS2__)
+#ifdef VBOX_WITH_INTERNAL_NETWORKING
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostInterface);
     if (VBOX_FAILURE(rc))

trunk/src/VBox/Devices/Makefile

@@ -50 +50 @@
 ifdef VBOX_WITH_VRDP
 DEFS += VBOX_VRDP
+endif
+ifdef VBOX_WITH_INTERNAL_NETWORKING
+DEFS += VBOX_WITH_INTERNAL_NETWORKING
 endif
 

trunk/src/VBox/VMM/Makefile

@@ -37 +37 @@
 # Enable the PDM lock.
 #DEFS += VBOX_WITH_PDM_LOCK
+ifdef VBOX_WITH_INTERNAL_NETWORKING
+DEFS += VBOX_WITH_INTERNAL_NETWORKING
+endif
 
 

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -581 +581 @@
         }
 
-#if !defined(__L4__) && !defined(__AMD64__) /** @todo Port this to L4. */ /** @todo fix logging and other services problems on AMD64. */
+#ifdef VBOX_WITH_INTERNAL_NETWORKING
         /*
          * Services.
@@ -651 +651 @@
             }
         }
-#endif /* !__L4__ */
+#endif /* VBOX_WITH_INTERNAL_NETWORKING */
 
         /*