vbox的更動 12984 路徑 trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp

時間撮記:

2008-10-4 下午11:20:58 (16 年 以前)

作者:

vboxsync

訊息:

#1865: PDMQueue.

檔案:

• trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp (修改) (8 筆差異)

trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp

@@ -49 +49 @@
 PDMDECL(PPDMQUEUEITEMCORE) PDMQueueAlloc(PPDMQUEUE pQueue)
 {
-    Assert(VALID_PTR(pQueue) && pQueue->CTXSUFF(pVM));
+    Assert(VALID_PTR(pQueue) && pQueue->CTX_SUFF(pVM));
     PPDMQUEUEITEMCORE pNew;
     uint32_t iNext;
@@ -58 +58 @@
         if (i == pQueue->iFreeHead)
             return NULL;
-        pNew = pQueue->aFreeItems[i].CTXSUFF(pItem);
+        pNew = pQueue->aFreeItems[i].CTX_SUFF(pItem);
         iNext = (i + 1) % (pQueue->cItems + PDMQUEUE_FREE_SLACK);
     } while (!ASMAtomicCmpXchgU32(&pQueue->iFreeTail, iNext, i));
@@ -76 +76 @@
 PDMDECL(void) PDMQueueInsert(PPDMQUEUE pQueue, PPDMQUEUEITEMCORE pItem)
 {
-    Assert(VALID_PTR(pQueue) && pQueue->CTXSUFF(pVM));
+    Assert(VALID_PTR(pQueue) && pQueue->CTX_SUFF(pVM));
     Assert(VALID_PTR(pItem));
 
@@ -82 +82 @@
     do
     {
-        pNext = pQueue->CTXSUFF(pPending);
-        pItem->CTXSUFF(pNext) = pNext;
-    } while (!ASMAtomicCmpXchgPtr((void * volatile *)&pQueue->CTXSUFF(pPending), pItem, pNext));
+        pNext = pQueue->CTX_SUFF(pPending);
+        pItem->CTX_SUFF(pNext) = pNext;
+    } while (!ASMAtomicCmpXchgPtr((void * volatile *)&pQueue->CTX_SUFF(pPending), pItem, pNext));
 
     if (!pQueue->pTimer)
     {
-        PVM pVM = pQueue->CTXSUFF(pVM);
+        PVM pVM = pQueue->CTX_SUFF(pVM);
         Log2(("PDMQueueInsert: VM_FF_PDM_QUEUES %d -> 1\n", VM_FF_ISSET(pVM, VM_FF_PDM_QUEUES)));
         VM_FF_SET(pVM, VM_FF_PDM_QUEUES);
@@ -114 +114 @@
     PDMQueueInsert(pQueue, pItem);
 #ifdef IN_GC
-    PVM pVM = pQueue->CTXSUFF(pVM);
+    PVM pVM = pQueue->CTX_SUFF(pVM);
     /** @todo figure out where to put this, the next bit should go there too.
     if (NanoMaxDelay)
@@ -140 +140 @@
 {
     Assert(VALID_PTR(pQueue));
-    Assert(pQueue->pVMHC && pQueue->pVMGC);
+    Assert(pQueue->pVMR3 && pQueue->pVMRC);
 #ifdef IN_GC
     return pQueue;
 #else
-    return MMHyperCCToRC(pQueue->pVMHC, pQueue);
+    return MMHyperCCToRC(pQueue->CTX_SUFF(pVM), pQueue);
 #endif
 }
@@ -159 +159 @@
 {
     Assert(VALID_PTR(pQueue));
-    Assert(pQueue->pVMHC && pQueue->pVMGC);
+    Assert(pQueue->pVMR3 && pQueue->pVMR0);
 #ifdef IN_RING0
     return pQueue;
 #else
-    return MMHyperCCToR0(pQueue->CTXSUFF(pVM), pQueue);
+    return MMHyperCCToR0(pQueue->CTX_SUFF(pVM), pQueue);
 #endif
 }
@@ -176 +176 @@
 {
     Assert(VALID_PTR(pQueue));
-    Assert(pQueue->pVMHC && pQueue->pVMGC);
-    PVM pVM = CTXSUFF(pQueue->pVM);
+    Assert(pQueue->pVMR3);
+    PVM pVM = pQueue->CTX_SUFF(pVM);
+
 #ifdef IN_GC
-    pVM->pdm.s.CTXSUFF(pQueueFlush) = pQueue;
+    Assert(pQueue->pVMRC);
+    pVM->pdm.s.CTX_SUFF(pQueueFlush) = pQueue;
     VMMGCCallHost(pVM, VMMCALLHOST_PDM_QUEUE_FLUSH, (uintptr_t)pQueue);
+
 #elif defined(IN_RING0)
-    pVM->pdm.s.CTXSUFF(pQueueFlush) = pQueue;
+    Assert(pQueue->pVMR0);
+    pVM->pdm.s.CTX_SUFF(pQueueFlush) = pQueue;
     VMMR0CallHost(pVM, VMMCALLHOST_PDM_QUEUE_FLUSH, (uintptr_t)pQueue);
+
 #else /* IN_RING3: */
     PVMREQ pReq;