Changeset 27789 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 29, 2010 12:57:20 PM (15 years ago)

Author:

vboxsync

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

59443

Message:

VM.cpp: Fixed bug in vmR3LiveDoStep1Cleanup where it didn't pass the right number for cTransitions to vmR3TrySetState.

File:

• trunk/src/VBox/VMM/VM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VM.cpp

@@ -1513 +1513 @@
     NOREF(pVCpu);
 
-    int rc = vmR3TrySetState(pVM, "vmR3LiveDoStep1Cleanup", 6,
+    int rc = vmR3TrySetState(pVM, "vmR3LiveDoStep1Cleanup", 8,
                              VMSTATE_OFF,               VMSTATE_OFF_LS,                     /* 1 */
                              VMSTATE_FATAL_ERROR,       VMSTATE_FATAL_ERROR_LS,             /* 2 */
@@ -3184 +3184 @@
          */
         if (cTransitions == 1)
+        {
             LogRel(("%s: %s -> %s failed, because the VM state is actually %s\n",
                     pszWho, VMR3GetStateName(enmStateOld), VMR3GetStateName(enmStateNew), VMR3GetStateName(enmStateCur)));
+            VMSetError(pVM, VERR_VM_INVALID_VM_STATE, RT_SRC_POS,
+                       N_("%s failed because the VM state is %s instead of %s"),
+                       pszWho, VMR3GetStateName(enmStateCur), VMR3GetStateName(enmStateOld));
+            AssertMsgFailed(("%s: %s -> %s failed, because the VM state is actually %s\n",
+                             pszWho, VMR3GetStateName(enmStateOld), VMR3GetStateName(enmStateNew), VMR3GetStateName(enmStateCur)));
+        }
         else
         {
@@ -3199 +3206 @@
             }
             LogRel((" failed, because the VM state is actually %s\n", VMR3GetStateName(enmStateCur)));
+            VMSetError(pVM, VERR_VM_INVALID_VM_STATE, RT_SRC_POS,
+                       N_("%s failed because the current VM state, %s, was not found in the state transition table"),
+                       pszWho, VMR3GetStateName(enmStateCur), VMR3GetStateName(enmStateOld));
+            AssertMsgFailed(("%s - state=%s, see release log for full details. Check the cTransitions passed us.\n",
+                             pszWho, VMR3GetStateName(enmStateCur)));
         }
-
-        VMSetError(pVM, VERR_VM_INVALID_VM_STATE, RT_SRC_POS,
-                   N_("%s failed because the VM state is %s instead of %s"),
-                   VMR3GetStateName(enmStateCur), VMR3GetStateName(enmStateOld));
-        AssertMsgFailed(("%s: %s -> %s failed, state is actually %s\n",
-                         pszWho, VMR3GetStateName(enmStateOld), VMR3GetStateName(enmStateNew), VMR3GetStateName(enmStateCur)));
     }