Changeset 12985 in vbox

Timestamp:

Oct 4, 2008 11:25:26 PM (16 years ago)

Author:

vboxsync

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

37418

Message:

PDMQueue: pQueueFlushR3 isn't necessary.

Location:

trunk/src/VBox/VMM

Files:

• PDMInternal.h (modified) (1 diff)
• PDMQueue.cpp (modified) (5 diffs)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PDMInternal.h

@@ -843 +843 @@
     /** Linked list of force action driven PDM queues. */
     R3PTRTYPE(struct PDMQUEUE *)    pQueuesForced;
-    /** Pointer to the queue which should be manually flushed - R3 Ptr.
-     * Only touched by EMT. */
-    R3PTRTYPE(struct PDMQUEUE *)    pQueueFlushR3;
     /** Pointer to the queue which should be manually flushed - R0 Ptr.
      * Only touched by EMT. */
     R0PTRTYPE(struct PDMQUEUE *)    pQueueFlushR0;
-    /** Pointer to the queue which should be manually flushed - RC Ptr. */
+    /** Pointer to the queue which should be manually flushed - RC Ptr.
+     * Only touched by EMT. */
     RCPTRTYPE(struct PDMQUEUE *)    pQueueFlushRC;
 #if HC_ARCH_BITS == 64

trunk/src/VBox/VMM/PDMQueue.cpp

@@ -574 +574 @@
                 pQueue->pVMRC = pVM->pVMRC;
 
-                /* Pending GC items. */
+                /* Pending RC items. */
                 if (pQueue->pPendingRC)
                 {
@@ -789 +789 @@
  * flush in ring-3.
  *
- * The queue which should be flushed is pointed to by either pQueueFlushGC,
- * pQueueFlushHC, or pQueueue. This function will flush that queue and
- * recalc the queue FF.
+ * The queue which should be flushed is pointed to by either pQueueFlushRC,
+ * pQueueFlushR0, or pQueue. This function will flush that queue and recalc
+ * the queue FF.
  *
  * @param   pVM     The VM handle.
@@ -798 +798 @@
 PDMR3DECL(void) PDMR3QueueFlushWorker(PVM pVM, PPDMQUEUE pQueue)
 {
-    Assert(pVM->pdm.s.pQueueFlushR3 || pVM->pdm.s.pQueueFlushR0 || pVM->pdm.s.pQueueFlushRC || pQueue);
+    Assert(pVM->pdm.s.pQueueFlushR0 || pVM->pdm.s.pQueueFlushRC || pQueue);
     VM_ASSERT_EMT(pVM);
 
@@ -814 +814 @@
         pVM->pdm.s.pQueueFlushR0 = NIL_RTR0PTR;
     }
-    else if (!pQueue)
-    {
-        pQueue = pVM->pdm.s.pQueueFlushR3;
-        pVM->pdm.s.pQueueFlushR3 = NULL;
-    }
-    Assert(!pVM->pdm.s.pQueueFlushR3 && !pVM->pdm.s.pQueueFlushR0 && !pVM->pdm.s.pQueueFlushRC);
+    Assert(!pVM->pdm.s.pQueueFlushR0 && !pVM->pdm.s.pQueueFlushRC);
 
     if (    !pQueue
@@ -825 +820 @@
     {
         /*
-         * Recalc the FF.
+         * Recalc the FF (for the queues using force action).
          */
         VM_FF_CLEAR(pVM, VM_FF_PDM_QUEUES);

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -308 +308 @@
     GEN_CHECK_OFF(PDM, pQueuesTimer);
     GEN_CHECK_OFF(PDM, pQueuesForced);
-    GEN_CHECK_OFF(PDM, pQueueFlushR3);
     GEN_CHECK_OFF(PDM, pQueueFlushR0);
     GEN_CHECK_OFF(PDM, pQueueFlushRC);