Changeset 22388 in vbox for trunk/src/VBox

Timestamp:

Aug 21, 2009 1:37:10 PM (15 years ago)

Author:

vboxsync

Message:

Pass the number of guest monitors to VGA device.

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA.cpp (modified) (2 diffs)
• Devices/Graphics/DevVGA.h (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -5677 +5677 @@
      */
     if (!CFGMR3AreValuesValid(pCfgHandle, "VRamSize\0"
+                                          "MonitorCount\0"
                                           "GCEnabled\0"
                                           "R0Enabled\0"
@@ -5716 +5717 @@
         return PDMDevHlpVMSetError(pDevIns, VERR_INVALID_PARAMETER, RT_SRC_POS,
                                    "VRamSize is too small, %#x, max %#x", pThis->vram_size, VGA_VRAM_MIN);
+
+    rc = CFGMR3QueryU32Def(pCfgHandle, "MonitorCount", &pThis->cMonitors, 1);
+    AssertLogRelRCReturn(rc, rc);
 
     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &pThis->fGCEnabled, true);

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -285 +285 @@
     bool                        padding9[2];
 
+    uint32_t                    cMonitors;
+    uint32_t                    padding10;
+
 #ifdef VBOX_WITH_HGSMI
     R3PTRTYPE(PHGSMIINSTANCE)   pHGSMI;

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -774 +774 @@
     hrc = pMachine->COMGETTER(VRAMSize)(&cVRamMBs);                                 H();
     rc = CFGMR3InsertInteger(pCfg,  "VRamSize",             cVRamMBs * _1M);        RC_CHECK();
+    ULONG cMonitorCount;
+    hrc = pMachine->COMGETTER(MonitorCount)(&cMonitorCount);                        H();
+    rc = CFGMR3InsertInteger(pCfg,  "MonitorCount",         cMonitorCount);         RC_CHECK();
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE /* not safe here yet. */ /** @todo this needs fixing !!! No wonder VGA is slooooooooow on 32-bit darwin! */
     rc = CFGMR3InsertInteger(pCfg,  "R0Enabled",            fHWVirtExEnabled);      RC_CHECK();