Changeset 40718 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Mar 30, 2012 6:31:04 AM (13 years ago)

Author:

vboxsync

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

77178

Message:

VMMDev: saved HGCM commands must not be completed.

File:

• trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp (modified) (6 diffs)

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

@@ -81 +81 @@
     bool fCancelled;
 
+    /* Whether the command is in the active commands list. */
+    bool fInList;
+
+    /* Whether the command was saved. */
+    bool fSaved;
+
     /* GC physical address of the guest request. */
     RTGCPHYS        GCPhys;
@@ -137 +143 @@
 
         pVMMDevState->pHGCMCmdList = pCmd;
+
+        pCmd->fInList = true;
 
         if (enmCmdType != VBOXHGCMCMDTYPE_LOADSTATE)
@@ -174 +182 @@
         LogFlowFunc(("%p\n", pCmd));
 
+        if (!pCmd->fInList)
+        {
+            LogFlowFunc(("%p not in the list\n", pCmd));
+            vmmdevHGCMCmdListUnlock (pVMMDevState);
+            return VINF_SUCCESS;
+        }
+
         if (pCmd->pNext)
         {
@@ -191 +206 @@
             pVMMDevState->pHGCMCmdList = pCmd->pNext;
         }
+
+        pCmd->pNext = NULL;
+        pCmd->pPrev = NULL;
+        pCmd->fInList = false;
 
         vmmdevHGCMCmdListUnlock (pVMMDevState);
@@ -1774 +1793 @@
     vmmdevHGCMRemoveCommand (pVMMDevState, pCmd);
 
-    if (pCmd->fCancelled)
-    {
-        LogFlowFunc(("A cancelled command %p\n", pCmd));
+    if (pCmd->fCancelled || pCmd->fSaved)
+    {
+        LogFlowFunc(("A cancelled command %p: %d %d\n", pCmd, pCmd->fCancelled, pCmd->fSaved));
     }
     else
@@ -2308 +2327 @@
             AssertRCReturn(rc, rc);
 
+            /* Mark the command as saved to make sure that it will not be
+             * completed later by a still running host service.
+             */
+            pIter->fSaved = true;
             vmmdevHGCMRemoveCommand (pVMMDevState, pIter);