Changeset 45675 in vbox

Timestamp:

Apr 23, 2013 9:13:50 AM (12 years ago)

Author:

vboxsync

Message:

Main/Console: OSX fix

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -528 +528 @@
                                  BusAssignmentManager *pBusMgr,
                                  const ComPtr<IMachine> &pMachine,
-                                 const ComPtr<IBIOSSettings> &biosSettings);
+                                 const ComPtr<IBIOSSettings> &biosSettings,
+                                 bool fHMEnabled);
     int configMediumAttachment(PCFGMNODE pCtlInst,
                                const char *pcszDevice,

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1329 +1329 @@
                 break;
             case GraphicsControllerType_VBoxVGA:
-                rc = configGraphicsController(pDevices, "vga", pBusMgr, pMachine, biosSettings);
+                rc = configGraphicsController(pDevices, "vga", pBusMgr, pMachine, biosSettings, fHMEnabled);
                 if (FAILED(rc))
                     return rc;
@@ -3038 +3038 @@
                                       BusAssignmentManager *pBusMgr,
                                       const ComPtr<IMachine> &pMachine,
-                                      const ComPtr<IBIOSSettings> &biosSettings)
+                                      const ComPtr<IBIOSSettings> &biosSettings,
+                                      bool fHMEnabled)
 {
     // InsertConfig* throws
@@ -3060 +3061 @@
         hrc = pMachine->COMGETTER(MonitorCount)(&cMonitorCount);                            H();
         InsertConfigInteger(pCfg,  "MonitorCount",         cMonitorCount);
-    #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
         InsertConfigInteger(pCfg,  "R0Enabled",            fHMEnabled);
-    #endif
+#else
+        NOREF(fHMEnabled);
+#endif
 
         /* Custom VESA mode list */