Changeset 24070 in vbox for trunk

Timestamp:

Oct 26, 2009 12:41:34 PM (15 years ago)

Author:

vboxsync

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

53943

Message:

DevBusLogic: Fixed bug in buslogicWaitForAsyncIOFinished causing an unnecessary 100ms delay on a number of operations requiring a quiescent controller. Moved buslogicLiveExec to the right place.

File:

• trunk/src/VBox/Devices/Storage/DevBusLogic.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

@@ -2270 +2270 @@
      */
     u64Start = RTTimeMilliTS();
-    do
+    for (;;)
     {
         fIdle = true;
@@ -2284 +2284 @@
             }
         }
-        if (RTTimeMilliTS() - u64Start >= cMillies)
+        if (   fIdle
+            || RTTimeMilliTS() - u64Start >= cMillies)
             break;
 
         /* Sleep for a bit. */
-        RTThreadSleep(100);
-    } while (!fIdle);
+        RTThreadSleep(100); /** @todo wait on something which can be woken up. 100ms is too long for teleporting VMs! */
+    }
 
     return fIdle;
-}
-
-static DECLCALLBACK(int) buslogicSaveLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
-{
-    PBUSLOGIC pBusLogic = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
-
-    /* Wait that no task is pending on any device. */
-    if (!buslogicWaitForAsyncIOFinished(pBusLogic, 20000))
-    {
-        AssertLogRelMsgFailed(("BusLogic: There are still tasks outstanding\n"));
-        return VERR_TIMEOUT;
-    }
-
-    return VINF_SUCCESS;
 }
 
@@ -2317 +2304 @@
 
     return VINF_SSM_DONT_CALL_AGAIN;
+}
+
+static DECLCALLBACK(int) buslogicSaveLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
+{
+    PBUSLOGIC pBusLogic = PDMINS_2_DATA(pDevIns, PBUSLOGIC);
+
+    /* Wait that no task is pending on any device. */
+    if (!buslogicWaitForAsyncIOFinished(pBusLogic, 20000))
+    {
+        AssertLogRelMsgFailed(("BusLogic: There are still tasks outstanding\n"));
+        return VERR_TIMEOUT;
+    }
+
+    return VINF_SUCCESS;
 }