Changeset 53529 in vbox for trunk/src/VBox

Timestamp:

Dec 12, 2014 8:41:49 PM (10 years ago)

Author:

vboxsync

Message:

Devices/Graphics, Devices/PC/DevACPI, Main: add support for sending video mode hints through the VGA device, saved state.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (modified) (2 diffs)

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

@@ -1608 +1608 @@
             for (unsigned i = 0; i < RT_ELEMENTS(pCtx->aModeHints); ++i)
             {
-                rc = SSMR3PutMem (pSSM, pCtx->aModeHints[i],
+                rc = SSMR3PutMem (pSSM, &pCtx->aModeHints[i],
                                   sizeof(VBVAMODEHINT));
                 AssertRCReturn(rc, rc);
@@ -1828 +1828 @@
                 {
                     rc = SSMR3Skip(pSSM, cbExtra);
+                    AssertRCReturn(rc, rc);
+                }
+                uint32_t cModeHints, cbModeHints;
+                rc = SSMR3GetU32 (pSSM, &cModeHints);
+                AssertRCReturn(rc, rc);
+                rc = SSMR3GetU32 (pSSM, &cbModeHints);
+                AssertRCReturn(rc, rc);
+                memset(&pCtx->aModeHints, ~0, sizeof(pCtx->aModeHints));
+                unsigned iHint;
+                for (iHint = 0; iHint < cModeHints; ++iHint)
+                {
+                    if (   cbModeHints <= sizeof(VBVAMODEHINT)
+                        && iHint < RT_ELEMENTS(pCtx->aModeHints))
+                        rc = SSMR3GetMem(pSSM, &pCtx->aModeHints[iHint],
+                                         cbModeHints);
+                    else
+                        rc = SSMR3Skip(pSSM, cbModeHints);
                     AssertRCReturn(rc, rc);
                 }