Changeset 91363 in vbox

Timestamp:

Sep 24, 2021 1:08:32 PM (3 years ago)

Author:

vboxsync

Message:

FE/VBoxSDL+VirtualBox,Main/Console+Machine+VirtualBox.xidl: VMs which
crash while restoring from the 'Saved' state shouldn't lose their saved
state file. bugref:1484

A new machine state named 'AbortedSaved' has been added which a VM will
enter if it crashes when restoring from the 'Saved' state before the
'Running' state has been reached. A VM in the 'AbortedSaved' machine
state will have its saved state file preserved so that the VM can still be
restored once the cause of the failure to powerUp() and reach the
'Running' state has been resolved.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxAutostart/VBoxAutostartUtils.cpp (modified) (1 diff)
• Frontends/VBoxBalloonCtrl/VBoxModAPIMonitor.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (4 diffs)
• Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/globals/UICommon.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/manager/UIVirtualMachineItemLocal.cpp (modified) (3 diffs)
• Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/manager/details/UIMachinePreview.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/medium/UIMediumItem.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/medium/UIMediumManager.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UISession.h (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/settings/UISettingsDefs.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp (modified) (1 diff)
• Main/cbinding/tstCAPIGlue.c (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (32 diffs)
• Main/src-all/Global.cpp (modified) (1 diff)
• Main/src-client/ConsoleImpl.cpp (modified) (10 diffs)
• Main/src-server/MachineImpl.cpp (modified) (14 diffs)
• Main/src-server/MachineImplMoveVM.cpp (modified) (1 diff)
• Main/src-server/SnapshotImpl.cpp (modified) (3 diffs)
• ValidationKit/testdriver/vboxwrappers.py (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostartUtils.cpp

@@ -48 +48 @@
         case MachineState_Aborted:
             return "aborted";
+        case MachineState_AbortedSaved:
+            return "aborted-saved";
         case MachineState_Running:
             return "running";

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxModAPIMonitor.cpp

@@ -137 +137 @@
         case MachineState_Saved:
             return "saved";
+        case MachineState_Teleported:
+            return "teleported";
         case MachineState_Aborted:
             return "aborted";
-        case MachineState_Teleported:
-            return "teleported";
+        case MachineState_AbortedSaved:
+            return "aborted-saved";
         case MachineState_Running:
             return "running";

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -157 +157 @@
         case MachineState_Aborted:
             return "aborted";
+        case MachineState_AbortedSaved:
+            return "aborted-saved";
         case MachineState_Running:
             return "running";

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -480 +480 @@
                 if (     machineState == MachineState_Aborted
                          ||   machineState == MachineState_Teleported
-                         ||  (machineState == MachineState_Saved      && !m_fIgnorePowerOffEvents)
-                         ||  (machineState == MachineState_PoweredOff && !m_fIgnorePowerOffEvents)
+                         ||  (machineState == MachineState_Saved        && !m_fIgnorePowerOffEvents)
+                         ||  (machineState == MachineState_AbortedSaved && !m_fIgnorePowerOffEvents)
+                         ||  (machineState == MachineState_PoweredOff   && !m_fIgnorePowerOffEvents)
                          )
                 {
@@ -615 +616 @@
             case MachineState_Teleported:           return "Teleported";
             case MachineState_Aborted:              return "Aborted";
+            case MachineState_AbortedSaved:         return "Aborted-Saved";
             case MachineState_Running:              return "Running";
             case MachineState_Teleporting:          return "Teleporting";
@@ -1892 +1894 @@
         MachineState_T machineState;
         gpMachine->COMGETTER(State)(&machineState);
-        if (machineState == MachineState_Saved)
+        if (machineState == MachineState_Saved || machineState == MachineState_AbortedSaved)
         {
             CHECK_ERROR(gpMachine, DiscardSavedState(true /* fDeleteFile */));
@@ -3079 +3081 @@
      */
     if (   gpMachine
-        && machineState != MachineState_Saved)
+        && machineState != MachineState_Saved
+        && machineState != MachineState_AbortedSaved)
     {
         rc = gpMachine->DiscardSettings();

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

@@ -99 +99 @@
         case KMachineState_PoweredOff:             return QColor(Qt::gray);
         case KMachineState_Saved:                  return QColor(Qt::yellow);
+        case KMachineState_Teleported:             return QColor(Qt::red);
         case KMachineState_Aborted:                return QColor(Qt::darkRed);
-        case KMachineState_Teleported:             return QColor(Qt::red);
+        case KMachineState_AbortedSaved:           return QColor(Qt::yellow);
         case KMachineState_Running:                return QColor(Qt::green);
         case KMachineState_Paused:                 return QColor(Qt::darkGreen);
@@ -135 +136 @@
         case KMachineState_PoweredOff:             return UIIconPool::iconSet(":/state_powered_off_16px.png");
         case KMachineState_Saved:                  return UIIconPool::iconSet(":/state_saved_16px.png");
+        case KMachineState_Teleported:             return UIIconPool::iconSet(":/state_saved_16px.png");
         case KMachineState_Aborted:                return UIIconPool::iconSet(":/state_aborted_16px.png");
-        case KMachineState_Teleported:             return UIIconPool::iconSet(":/state_saved_16px.png");
+        case KMachineState_AbortedSaved:           return UIIconPool::iconSet(":/state_saved_16px.png");
         case KMachineState_Running:                return UIIconPool::iconSet(":/state_running_16px.png");
         case KMachineState_Paused:                 return UIIconPool::iconSet(":/state_paused_16px.png");
@@ -171 +173 @@
         case KMachineState_PoweredOff:             return QApplication::translate("UICommon", "Powered Off", "MachineState");
         case KMachineState_Saved:                  return QApplication::translate("UICommon", "Saved", "MachineState");
+        case KMachineState_Teleported:             return QApplication::translate("UICommon", "Teleported", "MachineState");
         case KMachineState_Aborted:                return QApplication::translate("UICommon", "Aborted", "MachineState");
-        case KMachineState_Teleported:             return QApplication::translate("UICommon", "Teleported", "MachineState");
+        case KMachineState_AbortedSaved:           return QApplication::translate("UICommon", "Aborted-Saved", "MachineState");
         case KMachineState_Running:                return QApplication::translate("UICommon", "Running", "MachineState");
         case KMachineState_Paused:                 return QApplication::translate("UICommon", "Paused", "MachineState");

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -1301 +1301 @@
                   || enmState == KMachineState_Teleported
                   || enmState == KMachineState_Aborted
+                  || enmState == KMachineState_AbortedSaved
                   , ("Machine must be PoweredOff/Saved/Teleported/Aborted (%d)", enmState));
     }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -2498 +2498 @@
                   || enmState == KMachineState_Teleported
                   || enmState == KMachineState_Aborted
+                  || enmState == KMachineState_AbortedSaved
                   , ("Machine must be PoweredOff/Saved/Teleported/Aborted (%d)", enmState));
     }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemLocal.cpp

@@ -97 +97 @@
             || m_enmMachineState == KMachineState_Teleported
             || m_enmMachineState == KMachineState_Aborted
+            || m_enmMachineState == KMachineState_AbortedSaved
            )
         {
@@ -184 +185 @@
 {
     return    accessible()
-           && machineState() == KMachineState_Saved;
+           && (   machineState() == KMachineState_Saved
+               || machineState() == KMachineState_AbortedSaved);
 }
 
@@ -193 +195 @@
                || machineState() == KMachineState_Saved
                || machineState() == KMachineState_Teleported
-               || machineState() == KMachineState_Aborted);
+               || machineState() == KMachineState_Aborted
+               || machineState() == KMachineState_AbortedSaved);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -100 +100 @@
            && enmState != KMachineState_Saved
            && enmState != KMachineState_Teleported
-           && enmState != KMachineState_Aborted;
+           && enmState != KMachineState_Aborted
+           && enmState != KMachineState_AbortedSaved;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIMachinePreview.cpp

@@ -246 +246 @@
                 /* If machine is in SAVED/RESTORING state: */
                 case KMachineState_Saved:
+                case KMachineState_AbortedSaved:
                 case KMachineState_Restoring:
                 {

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp

@@ -146 +146 @@
             continue;
         if (comMachine.GetState() != KMachineState_PoweredOff &&
-            comMachine.GetState() != KMachineState_Aborted)
+            comMachine.GetState() != KMachineState_Aborted &&
+            comMachine.GetState() != KMachineState_AbortedSaved)
             return false;
     }

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -445 +445 @@
         return;
     bool fMediumIsModifiable = true;
-    if (state != KMachineState_Aborted && state != KMachineState_PoweredOff)
+    if (state != KMachineState_Aborted && state != KMachineState_PoweredOff && state != KMachineState_AbortedSaved)
         fMediumIsModifiable = false;
     m_pDetailsWidget->enableDisableMediumModificationWidgets(fMediumIsModifiable);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -517 +517 @@
         case KMachineState_Teleported:
         case KMachineState_Aborted:
+        case KMachineState_AbortedSaved:
         {
             /* If not in 'manual-override' mode: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -927 +927 @@
         /* Processing pseudo resize-event to synchronize frame-buffer with stored framebuffer size.
          * On X11 this will be additional done when the machine state was 'saved'. */
-        if (machine().GetState() == KMachineState_Saved)
+        if (machine().GetState() == KMachineState_Saved || machine().GetState() == KMachineState_AbortedSaved)
             size = guestScreenSizeHint();
 #endif /* VBOX_WS_X11 */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -175 +175 @@
         && !((   m_machineState == KMachineState_PoweredOff
               || m_machineState == KMachineState_Aborted
+              || m_machineState == KMachineState_AbortedSaved
               || m_machineState == KMachineState_Teleported)
              && machine().GetTeleporterEnabled()))

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -162 +162 @@
     UIVisualStateType requestedVisualState() const;
 
-    bool isSaved() const { return machineState() == KMachineState_Saved; }
+    bool isSaved() const { return machineState() == KMachineState_Saved ||
+                                  machineState() == KMachineState_AbortedSaved; }
     bool isTurnedOff() const { return machineState() == KMachineState_PoweredOff ||
                                       machineState() == KMachineState_Saved ||
                                       machineState() == KMachineState_Teleported ||
-                                      machineState() == KMachineState_Aborted; }
+                                      machineState() == KMachineState_Aborted ||
+                                      machineState() == KMachineState_AbortedSaved; }
     bool isPaused() const { return machineState() == KMachineState_Paused ||
                                    machineState() == KMachineState_TeleportingPausedVM; }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -396 +396 @@
 
             /* If previous machine-state was NOT SAVED => normalize window to the optimal-size: */
-            if (machine().GetState() != KMachineState_Saved)
+            if (machine().GetState() != KMachineState_Saved && machine().GetState() != KMachineState_AbortedSaved)
                 normalizeGeometry(false /* adjust position */, shouldResizeToGuestDisplay());
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp

@@ -33 +33 @@
                                               ConfigurationAccessLevel_Full :
                                               ConfigurationAccessLevel_Partial_PoweredOff;
+        case KMachineState_AbortedSaved:
         case KMachineState_Saved:      return ConfigurationAccessLevel_Partial_Saved;
         case KMachineState_Running:

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

@@ -1470 +1470 @@
                                         || enmState == KMachineState_Saved
                                         || enmState == KMachineState_Aborted
+                                        || enmState == KMachineState_AbortedSaved
                                         || enmState == KMachineState_Running
                                         || enmState == KMachineState_Paused;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp

@@ -95 +95 @@
             uUuid = machine.GetId();
             fEnabled = machine.GetSessionState() == KSessionState_Unlocked;
-            fInSaveState = machine.GetState() == KMachineState_Saved;
+            fInSaveState = machine.GetState() == KMachineState_Saved || machine.GetState() == KMachineState_AbortedSaved;
         }
         else

trunk/src/VBox/Main/cbinding/tstCAPIGlue.c

@@ -74 +74 @@
         case MachineState_Teleported:          return "Teleported";
         case MachineState_Aborted:             return "Aborted";
+        case MachineState_AbortedSaved:        return "Aborted-Saved";
         case MachineState_Running:             return "Running";
         case MachineState_Paused:              return "Paused";
@@ -181 +182 @@
                 || state == MachineState_Teleported
                 || state == MachineState_Aborted
+                || state == MachineState_AbortedSaved
                )
                 g_fStop = 1;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -653 +653 @@
     +-> PoweredOff --+-->[powerUp()]--> Starting --+      | +-----[resume()]-----+
     |                |                             |      | V                    |
-    |   Aborted -----+                             +--> Running --[pause()]--> Paused
+    |   Aborted <----+                             +--> Running --[pause()]--> Paused
     |                                              |      ^ |                   ^ |
-    |   Saved -----------[powerUp()]--> Restoring -+      | |                   | |
+    |  AbortedSaved <-----------[failure]-----<----+      | |                   | |
+    |       |                                      |      | |                   | |
+    |       +-------------+                        |      | |                   | |
+    |                     V                        |      | |                   | |
+    |   Saved --------[powerUp()]-----> Restoring -+      | |                   | |
     |     ^                                               | |                   | |
     |     |     +-----------------------------------------+-|-------------------+ +
@@ -666 +670 @@
       </pre>
 
-      Note that states to the right from PoweredOff, Aborted and Saved in the
-      above diagram are called <i>online VM states</i>. These states
-      represent the virtual machine which is being executed in a dedicated
-      process (usually with a GUI window attached to it where you can see the
-      activity of the virtual machine and interact with it). There are two
-      special pseudo-states, FirstOnline and LastOnline, that can be used in
-      relational expressions to detect if the given machine state is online or
-      not:
+      Note that states to the right of PoweredOff, Aborted, AbortedSaved, and
+      Saved in the above diagram are called <i>online VM states</i>. These
+      states represent the virtual machine which is being executed in a
+      dedicated process (usually with a GUI window attached to it where you can
+      see the activity of the virtual machine and interact with it). There are
+      two special pseudo-states, FirstOnline and LastOnline, that can be used
+      in relational expressions to detect if the given machine state is online
+      or not:
 
       <pre>
@@ -708 +712 @@
       virtual machine execution and therefore are shown separately. The states
       shown on these diagrams are called <i>offline VM states</i> (this includes
-      PoweredOff, Aborted and Saved too).
+      PoweredOff, Aborted, AbortedSaved and Saved too).
 
       The first diagram shows what happens when a lengthy setup operation is
@@ -785 +789 @@
       </desc>
     </const>
-    <const name="Running"                   value="5">
+    <const name="AbortedSaved"              value="5">
+      <desc>
+        A machine in the @c Saved stated has terminated abnormally before
+        reaching the @c Running state. Similar to the @c Aborted state,
+        this may indicate a crash of the VM process in host execution
+        context, or the VM process has been terminated externally.
+      </desc>
+    </const>
+
+    <const name="Running"                   value="6">
       <desc>
         The machine is currently being executed.
@@ -797 +810 @@
       </desc>
     </const>
-    <const name="Paused"                    value="6">
+    <const name="Paused"                    value="7">
       <desc>
         Execution of the machine has been paused.
@@ -809 +822 @@
       </desc>
     </const>
-    <const name="Stuck"                     value="7">
+    <const name="Stuck"                     value="8">
       <desc>
         Execution of the machine has reached the "Guru Meditation"
@@ -820 +833 @@
       </desc>
     </const>
-    <const name="Teleporting"               value="8">
+    <const name="Teleporting"               value="9">
       <desc>
         The machine is about to be teleported to a different host or process.
@@ -828 +841 @@
       </desc>
     </const>
-    <const name="LiveSnapshotting"          value="9">
+    <const name="LiveSnapshotting"          value="10">
       <desc>
         A live snapshot is being taken. The machine is running normally, but
@@ -837 +850 @@
       </desc>
     </const>
-    <const name="Starting"                  value="10">
+    <const name="Starting"                  value="11">
       <desc>
         Machine is being started after powering it on from a
@@ -843 +856 @@
       </desc>
     </const>
-    <const name="Stopping"                  value="11">
+    <const name="Stopping"                  value="12">
       <desc>
         Machine is being normally stopped powering it off, or after the guest OS
@@ -849 +862 @@
       </desc>
     </const>
-    <const name="Saving"                    value="12">
+    <const name="Saving"                    value="13">
       <desc>
         Machine is saving its execution state to a file.
       </desc>
     </const>
-    <const name="Restoring"                 value="13">
+    <const name="Restoring"                 value="14">
       <desc>
         Execution state of the machine is being restored from a file
-        after powering it on from the saved execution state.
-      </desc>
-    </const>
-    <const name="TeleportingPausedVM"       value="14">
+        after powering it on from either the @c Saved or @c AbortedSaved
+        execution state.
+      </desc>
+    </const>
+    <const name="TeleportingPausedVM"       value="15">
       <desc>
         The machine is being teleported to another host or process, but it is
@@ -867 +881 @@
       </desc>
     </const>
-    <const name="TeleportingIn"             value="15">
+    <const name="TeleportingIn"             value="16">
       <desc>
         Teleporting the machine state in from another host or process.
       </desc>
     </const>
-    <const name="DeletingSnapshotOnline"    value="16">
+    <const name="DeletingSnapshotOnline"    value="17">
       <desc>
         Like @c DeletingSnapshot, but the merging of media is ongoing in
@@ -878 +892 @@
       </desc>
     </const>
-    <const name="DeletingSnapshotPaused"    value="17">
+    <const name="DeletingSnapshotPaused"    value="18">
       <desc>
         Like @c DeletingSnapshotOnline, but the machine was paused when the
@@ -884 +898 @@
       </desc>
     </const>
-    <const name="OnlineSnapshotting"        value="18">
+    <const name="OnlineSnapshotting"        value="19">
       <desc>
         Like @c LiveSnapshotting, but the machine was paused when the
@@ -890 +904 @@
       </desc>
     </const>
-    <const name="RestoringSnapshot"         value="19">
+    <const name="RestoringSnapshot"         value="20">
       <desc>
         A machine snapshot is being restored; this typically does not take long.
       </desc>
     </const>
-    <const name="DeletingSnapshot"          value="20">
+    <const name="DeletingSnapshot"          value="21">
       <desc>
         A machine snapshot is being deleted; this can take a long time since this
@@ -902 +916 @@
       </desc>
     </const>
-    <const name="SettingUp"                 value="21">
+    <const name="SettingUp"                 value="22">
       <desc>
         Lengthy setup operation is in progress.
       </desc>
     </const>
-    <const name="Snapshotting"              value="22">
+    <const name="Snapshotting"              value="23">
       <desc>
         Taking an (offline) snapshot.
@@ -913 +927 @@
     </const>
 
-    <const name="FirstOnline" value="5" wsmap="suppress"> <!-- Running -->
+    <const name="FirstOnline" value="6" wsmap="suppress"> <!-- Running -->
       <desc>
         Pseudo-state: first online state (for use in relational expressions).
       </desc>
     </const>
-    <const name="LastOnline" value="18" wsmap="suppress"> <!-- OnlineSnapshotting -->
+    <const name="LastOnline" value="19" wsmap="suppress"> <!-- OnlineSnapshotting -->
       <desc>
         Pseudo-state: last online state (for use in relational expressions).
@@ -924 +938 @@
     </const>
 
-    <const name="FirstTransient" value="8" wsmap="suppress"> <!-- Teleporting -->
+    <const name="FirstTransient" value="9" wsmap="suppress"> <!-- Teleporting -->
       <desc>
         Pseudo-state: first transient state (for use in relational expressions).
       </desc>
     </const>
-    <const name="LastTransient" value="22" wsmap="suppress"> <!-- Snapshotting -->
+    <const name="LastTransient" value="23" wsmap="suppress"> <!-- Snapshotting -->
       <desc>
         Pseudo-state: last transient state (for use in relational expressions).
@@ -6534 +6548 @@
       <desc>
         Full path to the file that stores the execution state of
-        the machine when it is in the <link to="MachineState_Saved"/> state.
+        the machine when it is in either the <link to="MachineState_Saved"/>
+        or <link to="MachineState_AbortedSaved"/> state.
         <note>
-          When the machine is not in the Saved state, this attribute is
-          an empty string.
+          When the machine is not in the Saved or AbortedSaved state, this
+          attribute is an empty string.
         </note>
       </desc>
@@ -8426 +8441 @@
         <ul>
           <li>With "UnregisterOnly", the machine will only be unregistered, but no additional
-            cleanup will be performed. The call will fail if the machine is in "Saved" state
-            or has any snapshots or any media attached (see <link to="IMediumAttachment" />).
-            It is the responsibility of the caller to delete all such configuration in this mode.
-            In this mode, the API behaves like the former @c IVirtualBox::unregisterMachine() API
-            which it replaces.</li>
+            cleanup will be performed. The call will fail if the machine has any snapshots or
+            any media attached (see <link to="IMediumAttachment" />).  It is the responsibility
+            of the caller to delete all such configuration in this mode.  In this mode, the API
+            behaves like the former @c IVirtualBox::unregisterMachine() API which it replaces.</li>
           <li>With "DetachAllReturnNone", the call will succeed even if the machine is in "Saved"
             state or if it has snapshots or media attached. All media attached to the current machine
@@ -8508 +8522 @@
           <li>If <link to="#unregister" /> had been previously called with a @a cleanupMode
             argument other than "UnregisterOnly", this will delete all saved state files that
-            the machine had in use; possibly one if the machine was in "Saved" state and one
-            for each online snapshot that the machine had.</li>
+            the machine had in use; possibly one if the machine was in either the "Saved" or
+            "AbortedSaved" state and one for each online snapshot that the machine had.</li>
           <li>On each medium object passed in the @a aMedia array, this will call
             <link to="IMedium::close" />. If that succeeds, this will attempt to delete the
@@ -9180 +9194 @@
 
         After this operation completes, the machine will go to the
-        Saved state. Next time it is powered up, this state will
+        Saved state. The next time it is powered up this state will
         be restored and the machine will continue its execution from
         the place where it was saved.
@@ -9222 +9236 @@
         Associates the given saved state file to the virtual machine.
 
-        On success, the machine will go to the Saved state. Next time it is
-        powered up, it will be restored from the adopted saved state and
+        On success, the machine will go to the Saved state. The next time it is
+        powered up it will be restored from the adopted saved state and
         continue execution from the place where the saved state file was
         created.
@@ -9250 +9264 @@
       <desc>
         Forcibly resets the machine to "Powered Off" state if it is
-        currently in the "Saved" state (previously created by <link to="#saveState"/>).
-        Next time the machine is powered up, a clean boot will occur.
+        currently in the "Saved" state previously created by <link to="#saveState"/>)
+        or in the "AbortedSaved" state.  The next time the machine is powered up
+        a clean boot will occur.
         <note>
           This operation is equivalent to resetting or powering off
@@ -9265 +9280 @@
         <link to="#stateFilePath" /> attribute.
         <result name="VBOX_E_INVALID_VM_STATE">
-          Virtual machine not in state Saved.
+          Virtual machine not in either the Saved or AbortedSaved state.
         </result>
       </desc>
@@ -9281 +9296 @@
 
         This method can be called for a PoweredOff, Saved (see
-        <link to="#saveState"/>), Running or
+        <link to="#saveState"/>), AbortedSaved, Running or
         Paused virtual machine. When the machine is PoweredOff, an
         offline snapshot is created. When the machine is Running a live
@@ -9474 +9489 @@
 
         If the given snapshot is an online snapshot, the machine will go to
-        the <link to="MachineState_Saved">saved state</link>, so that the
+        the <link to="MachineState_Saved">Saved</link> state, so that the
         next time it is powered on, the execution state will be restored
         from the state of the snapshot.
@@ -9483 +9498 @@
 
         <note>
-          If the machine state is <link to="MachineState_Saved">Saved</link>
-          prior to this operation, the saved state file will be implicitly
+          If the machine is in the <link to="MachineState_Saved">Saved</link>
+          state prior to this operation, the saved state file will be implicitly
           deleted (as if <link to="IMachine::discardSavedState"/> were
           called).
@@ -9854 +9869 @@
         powered on).
 
-        If the machine is in the <link to="MachineState_Saved"/> state,
-        it will continue its execution the point where the state has
-        been saved.
+        If the machine is in the <link to="MachineState_Saved"/> state or the
+        <link to="MachineState_AbortedSaved"/> state it will continue its
+        execution from the point where the state was saved.
 
         If the machine <link to="IMachine::teleporterEnabled"/> property is
@@ -10117 +10132 @@
 
         <result name="VBOX_E_INVALID_VM_STATE">
-          Virtual machine in Saved state or currently changing state.
+          Virtual machine is in the Saved or AbortedSaved state or currently changing state.
         </result>
         <result name="VBOX_E_FILE_ERROR">
@@ -10150 +10165 @@
         shared folders and stops sharing it.
         <result name="VBOX_E_INVALID_VM_STATE">
-          Virtual machine in Saved state or currently changing state.
+          Virtual machine is in the Saved or AbortedSaved state or currently changing state.
         </result>
         <result name="VBOX_E_FILE_ERROR">
@@ -16377 +16392 @@
       because when restoring it, the VM will be running.
 
-      If the machine was in <link to="MachineState_Saved">saved</link> saved,
-      the snapshot receives a copy of the execution state file
-      (<link to="IMachine::stateFilePath"/>).
+      If the machine was in the <link to="MachineState_Saved">Saved</link> or
+      <link to="MachineState_AbortedSaved">AbortedSaved</link> state, the snapshot
+      receives a copy of the execution state file (<link to="IMachine::stateFilePath"/>).
 
       Otherwise, if the machine was not running (<link to="MachineState_PoweredOff"/>

trunk/src/VBox/Main/src-all/Global.cpp

@@ -590 +590 @@
         case MachineState_Teleported:           return "Teleported";
         case MachineState_Aborted:              return "Aborted";
+        case MachineState_AbortedSaved:         return "Aborted-Saved";
         case MachineState_Running:              return "Running";
         case MachineState_Paused:               return "Paused";

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -1581 +1581 @@
 HRESULT Console::i_loadDataFromSavedState()
 {
-    if (mMachineState != MachineState_Saved || mSavedStateDataLoaded)
+    if ((mMachineState != MachineState_Saved && mMachineState != MachineState_AbortedSaved) || mSavedStateDataLoaded)
         return S_OK;
 
@@ -2182 +2182 @@
         /* extra nice error message for a common case */
         case MachineState_Saved:
+        case MachineState_AbortedSaved:
             return setError(VBOX_E_INVALID_VM_STATE, tr("Cannot power down a saved virtual machine"));
         case MachineState_Stopping:
@@ -2965 +2966 @@
 
     /// @todo see @todo in AttachUSBDevice() about the Paused state
-    if (mMachineState == MachineState_Saved)
+    if (mMachineState == MachineState_Saved || mMachineState == MachineState_AbortedSaved)
         return setError(VBOX_E_INVALID_VM_STATE,
-                        tr("Cannot create a transient shared folder on the machine in the saved state"));
+                        tr("Cannot create a transient shared folder on a machine in a saved state (machine state: %s)"),
+                        Global::stringifyMachineState(mMachineState));
     if (   mMachineState != MachineState_PoweredOff
         && mMachineState != MachineState_Teleported
@@ -3036 +3038 @@
 
     /// @todo see @todo in AttachUSBDevice() about the Paused state
-    if (mMachineState == MachineState_Saved)
+    if (mMachineState == MachineState_Saved || mMachineState == MachineState_AbortedSaved)
         return setError(VBOX_E_INVALID_VM_STATE,
-                        tr("Cannot remove a transient shared folder from the machine in the saved state"));
+                        tr("Cannot remove a transient shared folder from a machine in a saved state (machine state: %s)"),
+                        Global::stringifyMachineState(mMachineState));;
     if (   mMachineState != MachineState_PoweredOff
         && mMachineState != MachineState_Teleported
@@ -7705 +7708 @@
         pPowerupProgress.createObject();
         Bstr progressDesc;
-        if (mMachineState == MachineState_Saved)
+        if (mMachineState == MachineState_Saved || mMachineState == MachineState_AbortedSaved)
             progressDesc = tr("Restoring virtual machine");
         else if (fTeleporterEnabled)
@@ -7717 +7720 @@
          * Saved VMs will have to prove that their saved states seem kosher.
          */
-        if (mMachineState == MachineState_Saved)
+        if (mMachineState == MachineState_Saved || mMachineState == MachineState_AbortedSaved)
         {
             rc = mMachine->COMGETTER(StateFilePath)(savedStateFile.asOutParam());
@@ -7784 +7787 @@
         task->mSharedFolders = sharedFolders;
         task->mStartPaused = aPaused;
-        if (mMachineState == MachineState_Saved)
+        if (mMachineState == MachineState_Saved || mMachineState == MachineState_AbortedSaved)
             try { task->mSavedStateFile = savedStateFile; }
             catch (std::bad_alloc &) { throw rc = E_OUTOFMEMORY; }
@@ -7928 +7931 @@
         }
         else if (   mMachineState == MachineState_Saved
+                 || mMachineState == MachineState_AbortedSaved
                  || !fTeleporterEnabled)
         {
@@ -8042 +8046 @@
          * since we've already started the thread and it is now responsible for
          * any error reporting and appropriate state change! */
-        if (mMachineState == MachineState_Saved)
+        if (mMachineState == MachineState_Saved || mMachineState == MachineState_AbortedSaved)
             i_setMachineState(MachineState_Restoring);
         else if (fTeleporterEnabled)
@@ -8964 +8968 @@
                 case MachineState_Restoring:
                     /* failed to load the saved state file, but be patient: set
-                     * back to Saved (to preserve the saved state file) */
-                    that->i_setMachineState(MachineState_Saved);
+                     * to AbortedSaved (to preserve the saved state file) */
+                    that->i_setMachineState(MachineState_AbortedSaved);
                     break;
                 case MachineState_TeleportingIn:

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -8096 +8096 @@
                         && mData->mMachineState != MachineState_Teleported
                         && mData->mMachineState != MachineState_Saved
+                        && mData->mMachineState != MachineState_AbortedSaved
                         && mData->mMachineState != MachineState_PoweredOff
                        )
@@ -8128 +8129 @@
                         && mData->mMachineState != MachineState_Teleported
                         && mData->mMachineState != MachineState_Saved
+                        && mData->mMachineState != MachineState_AbortedSaved
                         && mData->mMachineState != MachineState_PoweredOff
                         && !Global::IsOnline(mData->mMachineState)
@@ -8636 +8638 @@
      */
 
-    /* set the machine state to Aborted or Saved when appropriate */
-    if (config.fAborted)
+    /* set the machine state to either Aborted-Saved, Aborted, or Saved if appropriate */
+    if (config.fAborted && !mSSData->strStateFilePath.isEmpty())
+    {
+        /* no need to use i_setMachineState() during init() */
+        mData->mMachineState = MachineState_AbortedSaved;
+    }
+    else if (config.fAborted)
     {
         mSSData->strStateFilePath.setNull();
@@ -10001 +10008 @@
 
     if (    mData->mMachineState == MachineState_Saved
+         || mData->mMachineState == MachineState_AbortedSaved
          || mData->mMachineState == MachineState_Restoring
             // when doing certain snapshot operations we may or may not have
@@ -10027 +10035 @@
 
     config.timeLastStateChange = mData->mLastStateChange;
-    config.fAborted = (mData->mMachineState == MachineState_Aborted);
+    config.fAborted = (mData->mMachineState == MachineState_Aborted || mData->mMachineState == MachineState_AbortedSaved);
     /// @todo Live Migration:        config.fTeleported = (mData->mMachineState == MachineState_Teleported);
 
@@ -10544 +10552 @@
             mData->pMachineConfigFile->timeLastStateChange = mData->mLastStateChange;
 
-            mData->pMachineConfigFile->fAborted = (mData->mMachineState == MachineState_Aborted);
+            mData->pMachineConfigFile->fAborted = (mData->mMachineState == MachineState_Aborted
+                                                || mData->mMachineState == MachineState_AbortedSaved);
 /// @todo live migration             mData->pMachineConfigFile->fTeleported = (mData->mMachineState == MachineState_Teleported);
         }
@@ -12664 +12673 @@
         Log1WarningThisFunc(("ABNORMAL client termination! (wasBusy=%d)\n", Global::IsOnlineOrTransient(lastState)));
 
-        /* reset the state to Aborted */
-        if (mData->mMachineState != MachineState_Aborted)
+        /*
+         * Move the VM to the 'Aborted' machine state unless we are restoring a
+         * VM that was in the 'Saved' machine state.  In that case, if the VM
+         * fails before reaching either the 'Restoring' machine state or the
+         * 'Running' machine state then we set the machine state to
+         * 'AbortedSaved' in order to preserve the saved state file so that the
+         * VM can be restored in the future.
+         */
+        if (mData->mMachineState == MachineState_Saved || mData->mMachineState == MachineState_Restoring)
+            i_setMachineState(MachineState_AbortedSaved);
+        else if (mData->mMachineState != MachineState_Aborted)
             i_setMachineState(MachineState_Aborted);
     }
@@ -13090 +13108 @@
     if (FAILED(rc)) return rc;
 
-    if (mData->mMachineState != MachineState_Saved)
+    if (   mData->mMachineState != MachineState_Saved
+        && mData->mMachineState != MachineState_AbortedSaved)
         return setError(VBOX_E_INVALID_VM_STATE,
-            tr("Cannot delete the machine state as the machine is not in the saved state (machine state: %s)"),
+            tr("Cannot discard the saved state as the machine is not in the Saved or Aborted-Saved state (machine state: %s)"),
             Global::stringifyMachineState(mData->mMachineState));
 
@@ -14615 +14634 @@
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("aMachineState=%s\n", Global::stringifyMachineState(aMachineState) ));
 
     AutoCaller autoCaller(this);
@@ -14636 +14654 @@
     /* detect some state transitions */
 
-    if (   (   oldMachineState == MachineState_Saved
-            && aMachineState   == MachineState_Restoring)
+    if (   (   (   oldMachineState == MachineState_Saved
+                || oldMachineState == MachineState_AbortedSaved
+               )
+                && aMachineState   == MachineState_Restoring
+            )
         || (   (   oldMachineState == MachineState_PoweredOff
                 || oldMachineState == MachineState_Teleported
@@ -14672 +14693 @@
                  || aMachineState == MachineState_Teleported
                  || aMachineState == MachineState_Aborted
+                 || aMachineState == MachineState_AbortedSaved
                 )
             )
@@ -14685 +14707 @@
     if (oldMachineState == MachineState_Restoring)
     {
-        if (aMachineState != MachineState_Saved)
+        if (aMachineState != MachineState_Saved && aMachineState != MachineState_AbortedSaved)
         {
             /*
              *  delete the saved state file once the machine has finished
              *  restoring from it (note that Console sets the state from
-             *  Restoring to Saved if the VM couldn't restore successfully,
+             *  Restoring to AbortedSaved if the VM couldn't restore successfully,
              *  to give the user an ability to fix an error and retry --
              *  we keep the saved state file in this case)
@@ -14699 +14721 @@
     else if (   oldMachineState == MachineState_Saved
              && (   aMachineState == MachineState_PoweredOff
-                 || aMachineState == MachineState_Aborted
                  || aMachineState == MachineState_Teleported
                 )
             )
     {
-        /*
-         *  delete the saved state after SessionMachine::ForgetSavedState() is called
-         *  or if the VM process (owning a direct VM session) crashed while the
-         *  VM was Saved
-         */
-
-        /// @todo (dmik)
-        //      Not sure that deleting the saved state file just because of the
-        //      client death before it attempted to restore the VM is a good
-        //      thing. But when it crashes we need to go to the Aborted state
-        //      which cannot have the saved state file associated... The only
-        //      way to fix this is to make the Aborted condition not a VM state
-        //      but a bool flag: i.e., when a crash occurs, set it to true and
-        //      change the state to PoweredOff or Saved depending on the
-        //      saved state presence.
-
+        /* delete the saved state after SessionMachine::ForgetSavedState() is called */
         deleteSavedState = true;
         mData->mCurrentStateModified = TRUE;
         stsFlags |= SaveSTS_CurStateModified;
     }
+    /* failure to reach the restoring state should always go to MachineState_AbortedSaved */
+    Assert(!(oldMachineState == MachineState_Saved && aMachineState == MachineState_Aborted));
 
     if (   aMachineState == MachineState_Starting
@@ -14765 +14773 @@
             || aMachineState == MachineState_Teleported
             || aMachineState == MachineState_Aborted
+            || aMachineState == MachineState_AbortedSaved
             || aMachineState == MachineState_Saved))
     {

trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp

@@ -245 +245 @@
         return hrc;
 
-    if (machineState == MachineState_Saved)
+    if (machineState == MachineState_Saved || machineState == MachineState_AbortedSaved)
     {
         m_pMachine->COMGETTER(StateFilePath)(bstr_stateFilePath.asOutParam());

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -1770 +1770 @@
                 i_composeSavedStateFilename(task.m_strStateFilePath);
         }
-        else if (task.m_machineStateBackup == MachineState_Saved)
+        else if (task.m_machineStateBackup == MachineState_Saved || task.m_machineStateBackup == MachineState_AbortedSaved)
             // taking an offline snapshot from machine in "saved" state: use existing state file
             task.m_strStateFilePath = mSSData->strStateFilePath;
@@ -2305 +2305 @@
         /* Delete the saved state file if the machine was Saved prior to this
          * operation */
-        if (task.m_machineStateBackup == MachineState_Saved)
+        if (task.m_machineStateBackup == MachineState_Saved || task.m_machineStateBackup == MachineState_AbortedSaved)
         {
             Assert(!mSSData->strStateFilePath.isEmpty());
@@ -2679 +2679 @@
         && mData->mMachineState != MachineState_Teleported
         && mData->mMachineState != MachineState_Aborted
+        && mData->mMachineState != MachineState_AbortedSaved
         && mData->mMachineState != MachineState_Running
         && mData->mMachineState != MachineState_Paused)

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -85 +85 @@
     if eState == vboxcon.MachineState_Teleported: return 'Teleported';
     if eState == vboxcon.MachineState_Aborted: return 'Aborted';
+    if eState == vboxcon.MachineState_AbortedSaved: return 'Aborted-Saved';
     if eState == vboxcon.MachineState_Running: return 'Running';
     if eState == vboxcon.MachineState_Paused: return 'Paused';