Changeset 56551 in vbox

Timestamp:

Jun 19, 2015 9:32:20 AM (10 years ago)

Author:

vboxsync

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

101175

Message:

Main/src-client: Don't resume a VM on host-resume unless it was previously paused due to a host-suspend.

Location:

trunk/src/VBox

Files:

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

-              r56470
+              r56551
              * to assert on us, hence check for the VM state here and bail if it's already in the 'running' state.
              * See @bugref{3495}.
+             *
+             * Also, don't resume the VM unless it was paused previously due to a host-suspend operation.
+             * See @bugref{7836}.
              */
             enmReason = VMRESUMEREASON_HOST_RESUME;
+            if (VMR3GetStateU(ptrVM.rawUVM()) == VMSTATE_RUNNING)
+            VMSTATE enmVMState = VMR3GetStateU(ptrVM.rawUVM());
+            if (   enmVMState == VMSTATE_RUNNING
+                || (   enmVMState == VMSTATE_SUSPENDED
+                    && VMR3GetSuspendReason(ptrVM.rawUVM()) != VMSUSPENDREASON_HOST_SUSPEND))
+            {
                 return S_OK;
+            }
+        }
         else if (aReason == Reason_Snapshot)

Note: See TracChangeset for help on using the changeset viewer.