Changeset 6804 in vbox

Timestamp:

Feb 5, 2008 10:27:19 AM (17 years ago)

Author:

vboxsync

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

27905

Message:

Fixed VMR3PowerOn regression.

The problem was that the EMT outer loop wasn't checking for state
changes in the init case (pUVM->pVM == NULL). So, if the VMR3PowerOn
request was queued and executed by the initial VMR3ReqProcessU call
we wouldn't call EMR3ExecuteVM when the VM state changed to running.

File:

• trunk/src/VBox/VMM/VMEmt.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMEmt.cpp

@@ -166 +166 @@
                 ||  pUVM->vm.s.fTerminateEMT)
                 break;
-
-            /*
-             * Some requests (both VMR3Req* and the DBGF) can potentially
-             * resume or start the VM, in that case we'll get a change in
-             * VM status indicating that we're now running.
-             */
-            if (    VBOX_SUCCESS(rc)
-                &&  enmBefore != pVM->enmVMState
-                &&  (pVM->enmVMState == VMSTATE_RUNNING))
-            {
-                rc = EMR3ExecuteVM(pVM);
-                Log(("vmR3EmulationThread: EMR3ExecuteVM() -> rc=%Vrc, enmVMState=%d\n", rc, pVM->enmVMState));
-                if (EMGetState(pVM) == EMSTATE_GURU_MEDITATION)
-                    vmR3SetState(pVM, VMSTATE_GURU_MEDITATION);
-            }
-        }
+        }
+
+        /*
+         * Some requests (both VMR3Req* and the DBGF) can potentially
+         * resume or start the VM, in that case we'll get a change in
+         * VM status indicating that we're now running.
+         */
+        if (    VBOX_SUCCESS(rc)
+            &&  pUVM->pVM
+            &&  enmBefore != pUVM->pVM->enmVMState
+            &&  pUVM->pVM->enmVMState == VMSTATE_RUNNING)
+        {
+            PVM pVM = pUVM->pVM;
+            rc = EMR3ExecuteVM(pVM);
+            Log(("vmR3EmulationThread: EMR3ExecuteVM() -> rc=%Vrc, enmVMState=%d\n", rc, pVM->enmVMState));
+            if (EMGetState(pVM) == EMSTATE_GURU_MEDITATION)
+                vmR3SetState(pVM, VMSTATE_GURU_MEDITATION);
+        }
+
     } /* forever */
 
@@ -336 +339 @@
     PVM pVM = pUVM->pVM;
     int rc = VINF_SUCCESS;
-    ASMAtomicUoWriteBool(&pUVM->vm.s.fWait, true);
+    ASMAtomicWriteBool(&pUVM->vm.s.fWait, true);
     //unsigned cLoops = 0;
     for (;;)
@@ -535 +538 @@
      */
     int rc = VINF_SUCCESS;
-    ASMAtomicUoWriteBool(&pUVM->vm.s.fWait, true);
+    ASMAtomicWriteBool(&pUVM->vm.s.fWait, true);
     unsigned cLoops = 0;
     for (;; cLoops++)
@@ -652 +655 @@
      */
     int rc = VINF_SUCCESS;
-    ASMAtomicUoWriteBool(&pUVM->vm.s.fWait, true);
+    ASMAtomicWriteBool(&pUVM->vm.s.fWait, true);
     unsigned cLoops = 0;
     for (;; cLoops++)
@@ -726 +729 @@
 static DECLCALLBACK(int) vmR3HaltGlobal1Wait(PUVM pUVM)
 {
-    ASMAtomicUoWriteBool(&pUVM->vm.s.fWait, true);
+    ASMAtomicWriteBool(&pUVM->vm.s.fWait, true);
 
     PVM pVM = pUVM->pVM;
@@ -787 +790 @@
 static DECLCALLBACK(int) vmR3BootstrapWait(PUVM pUVM)
 {
-    ASMAtomicUoWriteBool(&pUVM->vm.s.fWait, true);
+    ASMAtomicWriteBool(&pUVM->vm.s.fWait, true);
 
     int rc = VINF_SUCCESS;
@@ -852 +855 @@
 static DECLCALLBACK(int) vmR3DefaultWait(PUVM pUVM)
 {
-    ASMAtomicUoWriteBool(&pUVM->vm.s.fWait, true);
+    ASMAtomicWriteBool(&pUVM->vm.s.fWait, true);
 
     PVM pVM = pUVM->pVM;