Changeset 54053 in vbox

Timestamp:

Jan 30, 2015 6:03:39 PM (10 years ago)

Author:

vboxsync

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

97979

Message:

Main/Display: do not send ACPI events if host cursor capabilities have not changed and remember guest VBVA and host cursor capabilities in the saved state.

Location:

trunk/src/VBox/Main

Files:

• include/DisplayImpl.h (modified) (1 diff)
• include/DisplayUtils.h (modified) (1 diff)
• src-client/DisplayImpl.cpp (modified) (11 diffs)

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

@@ -380 +380 @@
      *  Does not go into the saved state as it is refreshed on restore. */
     bool        mfVMMDevSupportsGraphics;
-    /** Mirror of the current guest VBVA capabilities.
-     *  Does not go into the saved state as it is refreshed on restore. */
+    /** Mirror of the current guest VBVA capabilities. */
     uint32_t    mfGuestVBVACapabilities;
-    /** Mirror of the current host cursor integration support capability.
-     *  Does not go into the saved state as it is refreshed on restore. */
-    uint32_t    mfHostSupportsCursorIntegration;
+    /** Mirror of the current host cursor capabilities. */
+    uint32_t    mfHostCursorCapabilities;
 
     bool mfSourceBitmapEnabled;

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

@@ -24 +24 @@
 #define sSSMDisplayVer3 0x00010003
 #define sSSMDisplayVer4 0x00010004
+#define sSSMDisplayVer5 0x00010005
 
 int readSavedGuestScreenInfo(const Utf8Str &strStateFilePath, uint32_t u32ScreenId,

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

@@ -125 +125 @@
     mfVMMDevSupportsGraphics = false;
     mfGuestVBVACapabilities = 0;
+    mfHostCursorCapabilities = 0;
 #endif
 #ifdef VBOX_WITH_VPX
@@ -511 +512 @@
     SSMR3PutU32(pSSM, that->cxInputMapping);
     SSMR3PutU32(pSSM, that->cyInputMapping);
+    SSMR3PutU32(pSSM, that->mfGuestVBVACapabilities);
+    SSMR3PutU32(pSSM, that->mfHostCursorCapabilities);
 }
 
@@ -521 +524 @@
         && uVersion != sSSMDisplayVer2
         && uVersion != sSSMDisplayVer3
-        && uVersion != sSSMDisplayVer4)
+        && uVersion != sSSMDisplayVer4
+        && uVersion != sSSMDisplayVer5)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
@@ -537 +541 @@
         if (   uVersion == sSSMDisplayVer2
             || uVersion == sSSMDisplayVer3
-            || uVersion == sSSMDisplayVer4)
+            || uVersion == sSSMDisplayVer4
+            || uVersion == sSSMDisplayVer5)
         {
             uint32_t w;
@@ -547 +552 @@
         }
         if (   uVersion == sSSMDisplayVer3
-            || uVersion == sSSMDisplayVer4)
+            || uVersion == sSSMDisplayVer4
+            || uVersion == sSSMDisplayVer5)
         {
             int32_t xOrigin;
@@ -561 +567 @@
         }
     }
-    if (uVersion == sSSMDisplayVer4)
+    if (   uVersion == sSSMDisplayVer4
+        || uVersion == sSSMDisplayVer5)
     {
         SSMR3GetS32(pSSM, &that->xInputMappingOrigin);
@@ -567 +574 @@
         SSMR3GetU32(pSSM, &that->cxInputMapping);
         SSMR3GetU32(pSSM, &that->cyInputMapping);
+    }
+    if (uVersion == sSSMDisplayVer5)
+    {
+        SSMR3GetU32(pSSM, &that->mfGuestVBVACapabilities);
+        SSMR3GetU32(pSSM, &that->mfHostCursorCapabilities);
     }
 
@@ -706 +718 @@
 {
     /* Version 2 adds width and height of the framebuffer; version 3 adds
-     * the framebuffer offset in the virtual desktop and the framebuffer flags.
+     * the framebuffer offset in the virtual desktop and the framebuffer flags;
+     * version 4 adds guest to host input event mapping and version 5 adds
+     * guest VBVA and host cursor capabilities.
      */
-    int rc = SSMR3RegisterExternal(pUVM, "DisplayData", 0, sSSMDisplayVer4,
+    int rc = SSMR3RegisterExternal(pUVM, "DisplayData", 0, sSSMDisplayVer5,
                                    mcMonitors * sizeof(uint32_t) * 8 + sizeof(uint32_t),
                                    NULL, NULL, NULL,
@@ -1163 +1177 @@
      * ensures that mpDrv will remain valid. */
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    uint32_t fHostCursorCapabilities =   (mfHostCursorCapabilities | fCapabilitiesAdded)
+                                       & ~fCapabilitiesRemoved;
 
     Console::SafeVMPtr ptrVM(mParent);
@@ -1171 +1187 @@
     mpDrv->pUpPort->pfnReportHostCursorCapabilities (mpDrv->pUpPort, fCapabilitiesAdded, fCapabilitiesRemoved);
     if (   mfGuestVBVACapabilities & VBVACAPS_DISABLE_CURSOR_INTEGRATION
-        && !(mfGuestVBVACapabilities & VBVACAPS_IRQ))
+        && !(mfGuestVBVACapabilities & VBVACAPS_IRQ)
+        && fHostCursorCapabilities != mfHostCursorCapabilities)
     {
         HRESULT hrc = mParent->i_sendACPIMonitorHotPlugEvent();
@@ -1177 +1194 @@
             return hrc;
     }
+    mfHostCursorCapabilities = fHostCursorCapabilities;
     return S_OK;
 }