Changeset 19179 in vbox

Timestamp:

Apr 24, 2009 6:32:02 PM (16 years ago)

Author:

vboxsync

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

46491

Message:

VMReq.cpp: VMREQDEST values other than ANY doesn't work yet, patch it up for now so we can prepare the user code without crashing or loosing requests.

File:

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

trunk/src/VBox/VMM/VMReq.cpp

@@ -614 +614 @@
                     VERR_VM_REQUEST_INVALID_TYPE);
 
+/** @todo SMP: Temporary hack until the unicast and broadcast cases has been
+ *        implemented correctly below. It asserts + hangs now. */
+if (pReq->enmDest != VMREQDEST_ANY)
+    pReq->enmDest = VMREQDEST_ANY;
+
+
     /*
      * Are we the EMT or not?
@@ -620 +626 @@
     int     rc      = VINF_SUCCESS;
     PUVM    pUVM    = ((VMREQ volatile *)pReq)->pUVM;                 /* volatile paranoia */
-    PUVMCPU pUVMCPU = (PUVMCPU)RTTlsGet(pUVM->vm.s.idxTLS);
+    PUVMCPU pUVCpu  = (PUVMCPU)RTTlsGet(pUVM->vm.s.idxTLS);
 
     if (pReq->enmDest == VMREQDEST_BROADCAST)
@@ -630 +636 @@
             PVMCPU pVCpu = &pUVM->pVM->aCpus[i];
 
-            if (   !pUVMCPU
-                ||  pUVMCPU->idCpu != i)
+            if (   !pUVCpu
+                ||  pUVCpu->idCpu != i)
             {
                 /*
@@ -671 +677 @@
         } /* for each VMCPU */
     }
-    else
-    if (    pReq->enmDest  != VMREQDEST_ANY  /* for a specific VMCPU? */
-        &&  pUVMCPU->idCpu != (unsigned)pReq->enmDest)
-    {
-        RTCPUID  idTarget = (RTCPUID)pReq->enmDest;
+    else if (   pReq->enmDest != VMREQDEST_ANY  /* for a specific VMCPU? */
+             && (   !pUVCpu /* not an EMT */
+                 || pUVCpu->idCpu != (unsigned)pReq->enmDest))
+    {
+        RTCPUID  idTarget = (RTCPUID)pReq->enmDest;     Assert(idTarget < pUVM->cCpus);
         PVMCPU   pVCpu = &pUVM->pVM->aCpus[idTarget];
         unsigned fFlags = ((VMREQ volatile *)pReq)->fFlags;     /* volatile paranoia */
@@ -707 +713 @@
     }
     else if (    pReq->enmDest == VMREQDEST_ANY
-             &&  !pUVMCPU /* only EMT threads have a valid pointer stored in the TLS slot. */)
+             &&  !pUVCpu /* only EMT threads have a valid pointer stored in the TLS slot. */)
     {
         unsigned fFlags = ((VMREQ volatile *)pReq)->fFlags;     /* volatile paranoia */
@@ -738 +744 @@
     else
     {
-        Assert(pUVMCPU);
+        Assert(pUVCpu);
 
         /*