Changeset 41096 in vbox

Timestamp:

Apr 30, 2012 10:28:59 AM (13 years ago)

Author:

vboxsync

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

77685

Message:

VBoxManage: don't unpause a VM if 'controlvm savestate' failed and the VM was paused before

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (5 diffs)

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

@@ -174 +174 @@
         {
             /* first pause so we don't trigger a live save which needs more time/resources */
+            bool fPaused = false;
             rc = console->Pause();
             if (FAILED(rc))
             {
+                bool fError = true;
                 if (rc == VBOX_E_INVALID_VM_STATE)
                 {
@@ -184 +186 @@
                     /* the error code was lost by the previous instruction */
                     rc = VBOX_E_INVALID_VM_STATE;
+                    RTPrintf("machineState = %d (%d)\n", machineState, MachineState_Paused);
                     if (machineState != MachineState_Paused)
                     {
@@ -189 +192 @@
                                    machineState, machineStateToName(machineState, false));
                     }
-                }
-                break;
+                    else
+                    {
+                        fError = false;
+                        fPaused = true;
+                    }
+                }
+                if (fError)
+                    break;
             }
 
@@ -197 +206 @@
             if (FAILED(rc))
             {
-                console->Resume();
+                if (!fPaused)
+                    console->Resume();
                 break;
             }
@@ -204 +214 @@
             CHECK_PROGRESS_ERROR(progress, ("Failed to save machine state"));
             if (FAILED(rc))
-                console->Resume();
+            {
+                if (!fPaused)
+                    console->Resume();
+            }
         }
         else if (!strcmp(a->argv[1], "acpipowerbutton"))