Changeset 5158 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Oct 4, 2007 2:49:25 PM (17 years ago)

Author:

vboxsync

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

25051

Message:

L4: limit the amount of video memory to the memory we actually got mapped from the guest

File:

• trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -169 +169 @@
 static const char *pszBootDevice = "IDE";
 static uint32_t g_u32MemorySizeMB = 128;
-static uint32_t g_u32VRamSizeMB = 4;
+static uint32_t g_u32VRamSize = 4 * _1M;
 #ifdef VBOXSDL_ADVANCED_OPTIONS
 static bool g_fRawR0 = true;
@@ -408 +408 @@
     char *secureLabelFontFile = NULL;
 #endif
+#ifdef RT_OS_L4
+    uint32_t u32MaxVRAM;
+#endif
+
     RTPrintf("VirtualBox Simple SDL GUI built %s %s\n", __DATE__, __TIME__);
 
@@ -476 +480 @@
             if (++curArg >= argc)
                 return SyntaxError("missing argument for vram size!\n");
-            rc = RTStrToUInt32Ex(argv[curArg], NULL, 0, &g_u32VRamSizeMB);
+            uint32_t uVRAMMB;
+            rc = RTStrToUInt32Ex(argv[curArg], NULL, 0, &uVRAMMB);
+            g_u32VRamSize = uVRAMMB * _1M;
             if (VBOX_FAILURE(rc))
                 return SyntaxError("bad video ram size: %s (error %Vrc)\n",
@@ -816 +822 @@
 #ifdef RT_OS_L4
     /* The L4 console provides (currently) a fixed resolution. */
-    if (g_u32VRamSizeMB * _1M >=   gFramebuffer->getHostXres()
-                          * gFramebuffer->getHostYres()
-                          * (gDisplay->getBitsPerPixel() / 8))
+    if (g_u32VRamSize >= gFramebuffer->getHostXres()
+                       * gFramebuffer->getHostYres()
+                       * (gDisplay->getBitsPerPixel() / 8))
         gDisplay->SetVideoModeHint(gFramebuffer->getHostXres(), gFramebuffer->getHostYres(), 0, 0);
+    /* Limit the VRAM of the guest to the amount of memory we got actually
+     * mapped from the L4 console. */
+    u32MaxVRAM = (gFramebuffer->getHostYres() + 18) /* don't omit the status bar */
+               * gFramebuffer->getHostXres()
+               * (gDisplay->getBitsPerPixel() / 8);
+    if (g_u32VRamSize > u32MaxVRAM)
+    {
+        RTPrintf("Limiting the video memory to %u bytes\n", u32MaxVRAM);
+        g_u32VRamSize = u32MaxVRAM;
+    }
 #endif
 
@@ -1439 +1455 @@
     rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",  0);                           UPDATE_RC();
     rc = CFGMR3InsertNode(pInst,    "Config",         &pCfg);                       UPDATE_RC();
-    rc = CFGMR3InsertInteger(pCfg,  "VRamSize",       g_u32VRamSizeMB * _1M);       UPDATE_RC();
+    rc = CFGMR3InsertInteger(pCfg,  "VRamSize",       g_u32VRamSize);               UPDATE_RC();
 
 #ifdef RT_OS_L4