Changeset 80347 in vbox

Timestamp:

Aug 19, 2019 7:38:08 PM (6 years ago)

Author:

vboxsync

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

132812

Message:

GVMMR0: Removed duplicate pVM pointer in the handle table. bugref:9217

File:

• trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -159 +159 @@
     /** The pointer to the ring-0 only (aka global) VM structure. */
     PGVM                pGVM;
-    /** The ring-0 mapping of the shared VM instance data.
-     * @todo remove this  */
-    PVMCC               pVMRemoveMe;
     /** The virtual machine object. */
     void               *pvObj;
@@ -858 +855 @@
 
         /* consistency checks, a bit paranoid as always. */
-        if (    !pHandle->pVMRemoveMe
-            &&  !pHandle->pGVM
+        if (    !pHandle->pGVM
             &&  !pHandle->pvObj
             &&  pHandle->iSelf == iHandle)
@@ -877 +873 @@
                 pGVMM->cVMs++;
 
-                pHandle->pVMRemoveMe = NULL;
                 pHandle->pGVM     = NULL;
                 pHandle->pSession = pSession;
@@ -968 +963 @@
                                 AssertRC(rc);
 
-                                pHandle->pVMRemoveMe            = pGVM;
                                 pHandle->pGVM                   = pGVM;
                                 pHandle->hEMT0                  = hEMT0;
@@ -1463 +1457 @@
     pGVMM->iFreeHead = iHandle;
     ASMAtomicWriteNullPtr(&pHandle->pGVM);
-    ASMAtomicWriteNullPtr(&pHandle->pVMRemoveMe);
     ASMAtomicWriteNullPtr(&pHandle->pvObj);
     ASMAtomicWriteNullPtr(&pHandle->pSession);
@@ -1602 +1595 @@
      */
     PGVMHANDLE pHandle = &pGVMM->aHandles[hGVM];
-    AssertPtrReturn(pHandle->pVMRemoveMe, NULL);
     AssertPtrReturn(pHandle->pvObj, NULL);
     PGVM pGVM = pHandle->pGVM;