Changeset 29905 in vbox

Timestamp:

May 31, 2010 12:59:42 PM (14 years ago)

Author:

vboxsync

Message:

PDM: Flushed out the PDMQueueFlush code as its unused and problematic wrt guest SMP.

Location:

trunk

Files:

• include/VBox/vmm.h (modified) (1 diff)
• src/VBox/VMM/PDMQueue.cpp (modified) (2 diffs)

trunk/include/VBox/vmm.h

@@ -81 +81 @@
     /** Acquire the PDM lock. */
     VMMCALLRING3_PDM_LOCK,
-    /** Call PDMR3QueueFlushWorker. */
-    VMMCALLRING3_PDM_QUEUE_FLUSH,
     /** Acquire the PGM lock. */
     VMMCALLRING3_PGM_LOCK,

trunk/src/VBox/VMM/PDMQueue.cpp

@@ -712 +712 @@
     RTR0PTR           pItemsR0 = ASMAtomicXchgR0Ptr(&pQueue->pPendingR0, NIL_RTR0PTR);
 
-    if (    !pItems
-        &&  !pItemsRC
-        &&  !pItemsR0)
-        /* Somebody may be racing us ... never mind. */
-        return true;
+    AssertMsgReturn(   pItemsR0
+                    || pItemsRC
+                    || pItems,
+                    ("Someone is racing us? This shouldn't happen!\n"),
+                    true);
 
     /*
@@ -895 +895 @@
     Assert(pTimer == pQueue->pTimer); NOREF(pTimer);
 
-    if (    pQueue->pPendingR3
-        ||  pQueue->pPendingR0
-        ||  pQueue->pPendingRC)
+    if (   pQueue->pPendingR3
+        || pQueue->pPendingR0
+        || pQueue->pPendingRC)
         pdmR3QueueFlush(pQueue);
     int rc = TMTimerSetMillies(pQueue->pTimer, pQueue->cMilliesInterval);