Changeset 13886 in vbox for trunk/src/VBox/Main/ConsoleImpl2.cpp

Timestamp:

Nov 5, 2008 6:16:17 PM (16 years ago)

Author:

vboxsync

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

38885

Message:

#3202/#1865: Disable the Ring-0 parts for vga and pcnet on darwin (for now).

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -575 +575 @@
     hrc = pMachine->COMGETTER(VRAMSize)(&cRamMBs);                                  H();
     rc = CFGMR3InsertInteger(pCfg,  "VRamSize",             cRamMBs * _1M);         RC_CHECK();
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE /* not safe here yet. */
+    rc = CFGMR3InsertInteger(pCfg,  "R0Enabled",            false);                 RC_CHECK();
+#endif
 
     /*
@@ -906 +909 @@
 
         /*
-        * The virtual hardware type. Create appropriate device first.
-        */
+         * The virtual hardware type. Create appropriate device first.
+         */
         NetworkAdapterType_T adapterType;
         hrc = networkAdapter->COMGETTER(AdapterType)(&adapterType);                 H();
@@ -941 +944 @@
         rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);                 RC_CHECK();
         rc = CFGMR3InsertNode(pInst, "Config", &pCfg);                              RC_CHECK();
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE /* not safe here yet. */
+        if (pDev == pDevPCNet)
+        {
+            rc = CFGMR3InsertInteger(pCfg,  "R0Enabled",    false);                 RC_CHECK();
+        }
+#endif
 
         /*
-        * The virtual hardware type. PCNet supports two types.
-        */
+         * The virtual hardware type. PCNet supports two types.
+         */
         switch (adapterType)
         {