Changeset 25946 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 20, 2010 11:52:24 PM (15 years ago)

Author:

vboxsync

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

56788

Message:

*: VBOX_WITH_RAW_MODE - Initial build changes (builds on mac os x).

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (4 diffs)
• Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -266 +266 @@
     rc = CFGMR3InsertInteger(pRoot, "NumCPUs",              cCpus);                 RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "TimerMillies",         10);                    RC_CHECK();
+#ifdef VBOX_WITH_RAW_MODE
     rc = CFGMR3InsertInteger(pRoot, "RawR3Enabled",         1);     /* boolean */   RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "RawR0Enabled",         1);     /* boolean */   RC_CHECK();
@@ -271 +272 @@
     rc = CFGMR3InsertInteger(pRoot, "PATMEnabled",          1);     /* boolean */   RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "CSAMEnabled",          1);     /* boolean */   RC_CHECK();
+#endif
 
     /* cpuid leaf overrides. */
@@ -310 +312 @@
     /* hardware virtualization extensions */
     BOOL fHWVirtExEnabled;
+    BOOL fHwVirtExtForced;
+#ifdef VBOX_WITH_RAW_MODE
     hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_Enabled, &fHWVirtExEnabled); H();
     if (cCpus > 1) /** @todo SMP: This isn't nice, but things won't work on mac otherwise. */
         fHWVirtExEnabled = TRUE;
-
-#ifdef RT_OS_DARWIN
-    rc = CFGMR3InsertInteger(pRoot, "HwVirtExtForced",      fHWVirtExEnabled);      RC_CHECK();
-#else
+# ifdef RT_OS_DARWIN
+    fHwVirtExtForced = fHWVirtExEnabled;
+# else
     /* - With more than 4GB PGM will use different RAMRANGE sizes for raw
          mode and hv mode to optimize lookup times.
        - With more than one virtual CPU, raw-mode isn't a fallback option. */
-    BOOL fHwVirtExtForced = fHWVirtExEnabled
-                         && (   cbRam > (_4G - cbRamHole)
-                             || cCpus > 1);
+    fHwVirtExtForced = fHWVirtExEnabled
+                    && (   cbRam > (_4G - cbRamHole)
+                        || cCpus > 1);
+# endif
+#else  /* !VBOX_WITH_RAW_MODE */
+    fHWVirtExEnabled = fHwVirtExtForced = TRUE;
+#endif /* !VBOX_WITH_RAW_MODE */
     rc = CFGMR3InsertInteger(pRoot, "HwVirtExtForced",      fHwVirtExtForced);      RC_CHECK();
-#endif
 
     PCFGMNODE pHWVirtExt;
@@ -361 +367 @@
 #endif
 
-        /* @todo Not exactly pretty to check strings; VBOXOSTYPE would be better, but that requires quite a bit of API change in Main. */
+        /** @todo Not exactly pretty to check strings; VBOXOSTYPE would be better, but that requires quite a bit of API change in Main. */
         if (    !fIs64BitGuest
             &&  fIOAPIC

trunk/src/VBox/Main/Makefile.kmk

@@ -45 +45 @@
  include $(KBUILD_PATH)/tools/VCC70.kmk
  include $(KBUILD_PATH)/sdks/WINPSDK.kmk
-endif #!VBOX_ONLY_SDK
+endif # !VBOX_ONLY_SDK
 
 
@@ -56 +56 @@
  endif
  ifneq ($(KBUILD_TARGET),os2)
-  VBOX_MAIN_DEFS+= VBOX_WITH_SYS_V_IPC_SESSION_WATCHER
+  VBOX_MAIN_DEFS += VBOX_WITH_SYS_V_IPC_SESSION_WATCHER
  endif
 endif
 VBOX_MAIN_DEFS += \
+        $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \
         $(if $(VBOX_WITH_NETFLT),VBOX_WITH_NETFLT,) \
         $(if $(VBOX_WITH_CROGL),VBOX_WITH_CROGL,) \