Changeset 22270 in vbox

Timestamp:

Aug 14, 2009 8:28:17 PM (16 years ago)

Author:

vboxsync

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

51110

Message:

Devices/VMMDev: reverted r51107 in order to split it into two changesets

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (6 diffs)
• VMMDevState.h (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -707 +707 @@
                                                        NULL);
                 }
-                pThis->fHostCursorRequested = fVisible;
                 pRequestHeader->rc = VINF_SUCCESS;
             }
@@ -2086 +2085 @@
 
 
-#define VMMDEV_SSM_VERSION  10
+#define VMMDEV_SSM_VERSION  9
 
 /**
@@ -2121 +2120 @@
 #endif /* VBOX_WITH_HGCM */
 
-    SSMR3PutU32(pSSMHandle, pThis->fHostCursorRequested);
-
     return VINF_SUCCESS;
 }
@@ -2169 +2166 @@
         SSMR3GetU32(pSSMHandle, &temp);
     }
+
 #ifdef VBOX_WITH_HGCM
     vmmdevHGCMLoadState (pThis, pSSMHandle, u32Version);
 #endif /* VBOX_WITH_HGCM */
-
-    if (   SSM_VERSION_MAJOR(u32Version) ==  0
-        && SSM_VERSION_MINOR(u32Version) >= 10)
-        SSMR3GetU32(pSSMHandle, &pThis->fHostCursorRequested);
 
     /*
@@ -2183 +2177 @@
     Log(("vmmdevLoadState: capabilities changed (%x), informing connector\n", pThis->mouseCapabilities));
     if (pThis->pDrv)
-    {
         pThis->pDrv->pfnUpdateMouseCapabilities(pThis->pDrv, pThis->mouseCapabilities);
-        if (   SSM_VERSION_MAJOR(u32Version) ==  0
-            && SSM_VERSION_MINOR(u32Version) >= 10)
-                pThis->pDrv->pfnUpdatePointerShape(pThis->pDrv,
-                                                   pThis->fHostCursorRequested,
-                                                   0,
-                                                   0, 0,
-                                                   0, 0,
-                                                   NULL);
-    }
 
     /* Reestablish the acceleration status. */
@@ -2480 +2464 @@
 
     /*
-     * Reset the mouse integration feature bits
+     * Reset the mouse integration feature bit
      */
-    if (pThis->mouseCapabilities & VMMDEV_MOUSE_GUEST_MASK)
-    {
-        pThis->mouseCapabilities &= ~VMMDEV_MOUSE_GUEST_MASK;
+    if (pThis->mouseCapabilities & (VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE|VMMDEV_MOUSE_GUEST_NEEDS_HOST_CURSOR))
+    {
+        pThis->mouseCapabilities &= ~VMMDEV_MOUSE_GUEST_CAN_ABSOLUTE;
         /* notify the connector */
         Log(("vmmdevReset: capabilities changed (%x), informing connector\n", pThis->mouseCapabilities));
         pThis->pDrv->pfnUpdateMouseCapabilities(pThis->pDrv, pThis->mouseCapabilities);
     }
-    pThis->fHostCursorRequested = false;
 
     pThis->hypervisorSize = 0;

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -38 +38 @@
     uint32_t hypervisorSize;
 
-    /** mouse capabilities of host and guest */
+    /** bit 0: guest capability (1 == wants), bit 1: flag value has changed */
+    /** bit 2: host capability (1 == wants), bit 3: flag value has changed */
     uint32_t mouseCapabilities;
     /** absolute mouse position in pixels */
     uint32_t mouseXAbs;
     uint32_t mouseYAbs;
-    /** Does the guest currently want the host pointer to be shown? */
-    uint32_t fHostCursorRequested;
 
     /** Pointer to device instance. */