Changeset 19267 in vbox

Timestamp:

Apr 29, 2009 2:53:28 PM (16 years ago)

Author:

vboxsync

Message:

Cleaned up the VMREQDEST_BROADCAST code.

Location:

trunk/src/VBox/VMM

Files:

• VM.cpp (modified) (1 diff)
• VMReq.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VM.cpp

@@ -1629 +1629 @@
          * Request EMT to do the larger part of the destruction. (in reverse order as VCPU 0 does the real cleanup)
          */
-        for (int idCpu = pVM->cCPUs - 1;idCpu>=0;idCpu--)
-        {
-            PVMREQ pReq = NULL;
-            int rc = VMR3ReqCallU(pUVM, (VMREQDEST)idCpu, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)vmR3Destroy, 1, pVM);
-            if (RT_SUCCESS(rc))
-                rc = pReq->iStatus;
-            AssertRC(rc);
-            VMR3ReqFree(pReq);
-        }
+        PVMREQ pReq = NULL;
+        int rc = VMR3ReqCallU(pUVM, VMREQDEST_BROADCAST_REVERSE, &pReq, RT_INDEFINITE_WAIT, 0, (PFNRT)vmR3Destroy, 1, pVM);
+        if (RT_SUCCESS(rc))
+            rc = pReq->iStatus;
+        AssertRC(rc);
+        VMR3ReqFree(pReq);
 
         /*

trunk/src/VBox/VMM/VMReq.cpp

@@ -401 +401 @@
                     VERR_VM_REQUEST_INVALID_TYPE);
     AssertPtrReturn(ppReq, VERR_INVALID_POINTER);
-    AssertMsgReturn(enmDest == VMREQDEST_ANY || enmDest == VMREQDEST_BROADCAST || (unsigned)enmDest < pUVM->cCpus, ("Invalid destination %d (max=%d)\n", enmDest, pUVM->cCpus), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(enmDest == VMREQDEST_ANY || enmDest == VMREQDEST_BROADCAST || enmDest == VMREQDEST_BROADCAST_REVERSE || (unsigned)enmDest < pUVM->cCpus, ("Invalid destination %d (max=%d)\n", enmDest, pUVM->cCpus), VERR_INVALID_PARAMETER);
 
     /*
@@ -624 +624 @@
     if (pReq->enmDest == VMREQDEST_BROADCAST)
     {
-        unsigned fFlags = ((VMREQ volatile *)pReq)->fFlags;     /* volatile paranoia */
-
-        for (unsigned i=0;i<pUVM->cCpus;i++)
-        {
-            PVMCPU pVCpu = &pUVM->pVM->aCpus[i];
-
-            if (   !pUVCpu
-                ||  pUVCpu->idCpu != i)
-            {
-                /*
-                 * Insert it.
-                 */
-                pReq->enmState = VMREQSTATE_QUEUED;
-                PVMREQ pNext;
-                do
-                {
-                    pNext = pUVM->aCpus[i].vm.s.pReqs;
-                    pReq->pNext = pNext;
-                } while (!ASMAtomicCmpXchgPtr((void * volatile *)&pUVM->aCpus[i].vm.s.pReqs, (void *)pReq, (void *)pNext));
-
-                /*
-                 * Notify EMT.
-                 */
-                if (pUVM->pVM)
-                    VMCPU_FF_SET(pVCpu, VMCPU_FF_REQUEST);
-                VMR3NotifyCpuFFU(&pUVM->aCpus[i], false);
-
-                /*
-                 * Wait and return.
-                 */
-                if (!(fFlags & VMREQFLAGS_NO_WAIT))
-                    rc = VMR3ReqWait(pReq, cMillies);
-                LogFlow(("VMR3ReqQueue: returns %Rrc\n", rc));
-            }
-            else
-            {
-                /*
-                 * The requester was EMT, just execute it.
-                 */
-                pReq->enmState = VMREQSTATE_QUEUED;
-                rc = vmR3ReqProcessOneU(pUVM, pReq);
-                LogFlow(("VMR3ReqQueue: returns %Rrc (processed)\n", rc));
-            }
-        } /* for each VMCPU */
+        for (unsigned i = 0; i < pUVM->cCpus; i++)
+        {
+            /* Reinit some members. */
+            pReq->enmState = VMREQSTATE_ALLOCATED;
+            pReq->enmDest = (VMREQDEST)i;
+            rc = VMR3ReqQueue(pReq, cMillies);
+            if (RT_FAILURE(rc))
+                break;
+        }
+    }
+    else if (pReq->enmDest == VMREQDEST_BROADCAST_REVERSE)
+    {
+        for (int i = pUVM->cCpus-1; i >= 0; i--)
+        {
+            /* Reinit some members. */
+            pReq->enmState = VMREQSTATE_ALLOCATED;
+            pReq->enmDest  = (VMREQDEST)i;
+            rc = VMR3ReqQueue(pReq, cMillies);
+            if (RT_FAILURE(rc))
+                break;
+        }
     }
     else if (   pReq->enmDest != VMREQDEST_ANY  /* for a specific VMCPU? */