Changeset 50891 in vbox

Timestamp:

Mar 26, 2014 1:54:05 PM (11 years ago)

Author:

vboxsync

Message:

VMMDevHGCM: do not delete pending HGCM requests when VM is being saved.

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (1 diff)
• VMMDevHGCM.cpp (modified) (4 diffs)
• VMMDevHGCM.h (modified) (1 diff)

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

@@ -3665 +3665 @@
         pThis->pCredentials = NULL;
     }
+
+    vmmdevHGCMDestroy(pThis);
 
 #ifndef VBOX_WITHOUT_TESTING_FEATURES

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

@@ -92 +92 @@
     /** 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. */
@@ -1956 +1953 @@
     vmmdevHGCMRemoveCommand (pThis, pCmd);
 
-    if (pCmd->fCancelled || pCmd->fSaved)
-    {
-        LogFlowFunc(("A cancelled command %p: %d %d\n", pCmd, pCmd->fCancelled, pCmd->fSaved));
+    if (pCmd->fCancelled)
+    {
+        LogFlowFunc(("A cancelled command %p: %d\n", pCmd, pCmd->fCancelled));
     }
     else
@@ -2507 +2504 @@
             rc = SSMR3PutU32(pSSM, 0);
             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 (pThis, pIter);
 
             pIter = pNext;
@@ -2988 +2979 @@
     return rc;
 }
+
+void vmmdevHGCMDestroy(PVMMDEV pThis)
+{
+    LogFlowFunc(("\n"));
+
+    PVBOXHGCMCMD pIter = pThis->pHGCMCmdList;
+
+    while (pIter)
+    {
+        PVBOXHGCMCMD pNext = pIter->pNext;
+
+        vmmdevHGCMRemoveCommand(pThis, pIter);
+
+        /* Deallocate the command memory. */
+        RTMemFree(pIter->paLinPtrs);
+        RTMemFree(pIter);
+
+        pIter = pNext;
+    }
+
+    return;
+}

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

@@ -33 +33 @@
 int vmmdevHGCMLoadState(VMMDevState *pVMMDevState, PSSMHANDLE pSSM, uint32_t u32Version);
 int vmmdevHGCMLoadStateDone(VMMDevState *pVMMDevState, PSSMHANDLE pSSM);
+
+void vmmdevHGCMDestroy(PVMMDEV pThis);
 RT_C_DECLS_END