Changeset 91363 in vbox for trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

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.

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (4 diffs)

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();