Changeset 864 in vbox

Timestamp:

Feb 13, 2007 1:10:48 PM (18 years ago)

Author:

vboxsync

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

18569

Message:

Added VMSTATE_SUSPENDED_NOSAVE state handling.

Location:

trunk/src/VBox/VMM

Files:

• VM.cpp (modified) (5 diffs)
• VMEmt.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VM.cpp

@@ -976 +976 @@
      * Validate input.
      */
+    if (pVM->enmVMState == VMSTATE_SUSPENDED_NOSAVE)
+    {
+        LogRel(("VMM: vmR3Save: saving the VM state is not allowed at this moment\n"));
+        return VERR_VM_SAVE_STATE_NOT_ALLOWED;
+    }
+
     if (pVM->enmVMState != VMSTATE_SUSPENDED)
     {
@@ -1159 +1165 @@
     if (    pVM->enmVMState != VMSTATE_RUNNING
         &&  pVM->enmVMState != VMSTATE_SUSPENDED
+        &&  pVM->enmVMState != VMSTATE_SUSPENDED_NOSAVE
         &&  pVM->enmVMState != VMSTATE_LOAD_FAILURE
         &&  pVM->enmVMState != VMSTATE_GURU_MEDITATION)
@@ -1613 +1620 @@
         return VERR_INVALID_PARAMETER;
     if (    pVM->enmVMState != VMSTATE_RUNNING
-        &&  pVM->enmVMState != VMSTATE_SUSPENDED)
+        &&  pVM->enmVMState != VMSTATE_SUSPENDED
+        &&  pVM->enmVMState != VMSTATE_SUSPENDED_NOSAVE)
     {
         AssertMsgFailed(("Invalid VM state %d\n", pVM->enmVMState));
@@ -1664 +1672 @@
      */
     VMSTATE enmVMState = pVM->enmVMState;
-    Assert(enmVMState == VMSTATE_SUSPENDED || enmVMState == VMSTATE_RUNNING);
+    Assert(enmVMState == VMSTATE_SUSPENDED || enmVMState == VMSTATE_SUSPENDED_NOSAVE || enmVMState == VMSTATE_RUNNING);
     vmR3SetState(pVM, VMSTATE_RESETTING);
     vmR3CheckIntegrity(pVM);
@@ -2055 +2063 @@
         case VMSTATE_SAVING:            return "SAVING";
         case VMSTATE_SUSPENDED:         return "SUSPENDED";
+        case VMSTATE_SUSPENDED_NOSAVE:  return "SUSPENDED_NOSAVE";
         case VMSTATE_RESETTING:         return "RESETTING";
         case VMSTATE_GURU_MEDITATION:   return "GURU_MEDIATION";

trunk/src/VBox/VMM/VMEmt.cpp

@@ -73 +73 @@
 
         /*
-         * Pending requests which needs servicing?
+         * Pending requests which need servicing?
          *
          * We check for state changes in addition to status codes when
@@ -180 +180 @@
 
         /*
-         * Pending requests which needs servicing?
+         * Pending requests which need servicing?
          *
          * We check for state changes in addition to status codes when