Changeset 91363 in vbox for trunk/src/VBox/Main/src-client

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/Main/src-client/ConsoleImpl.cpp (modified) (10 diffs)

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: