Changeset 55721 in vbox

Timestamp:

May 7, 2015 12:42:12 PM (9 years ago)

Author:

vboxsync

Message:

Main: Allow host-suspend/resume notifiers to be called several times successively.

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl.cpp (modified) (2 diffs)
• src-server/PerformanceImpl.cpp (modified) (2 diffs)

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

@@ -6201 +6201 @@
         case MachineState_TeleportingPausedVM:
         case MachineState_OnlineSnapshotting:
-
-        /* Remove any keys which are supposed to be removed on a suspend. */
-        if (   aReason == Reason_HostSuspend
-            || aReason == Reason_HostBatteryLow)
-            i_removeSecretKeysOnSuspend();
-
+            /* Remove any keys which are supposed to be removed on a suspend. */
+            if (   aReason == Reason_HostSuspend
+                || aReason == Reason_HostBatteryLow)
+            {
+                i_removeSecretKeysOnSuspend();
+                return S_OK;
+            }
             return setError(VBOX_E_INVALID_VM_STATE, tr("Already paused"));
 
@@ -6286 +6287 @@
         VMRESUMEREASON enmReason = VMRESUMEREASON_USER;
         if (aReason == Reason_HostResume)
+        {
+            /*
+             * Host resume may be called multiple times successively. We don't want to VMR3Resume->vmR3Resume->vmR3TrySetState()
+             * to assert on us, hence check for the VM state here and bail if it's already in the 'running' state.
+             * See @bugref{3495}.
+             */
             enmReason = VMRESUMEREASON_HOST_RESUME;
+            if (VMR3GetStateU(ptrVM.rawUVM()) == VMSTATE_RUNNING)
+                return S_OK;
+        }
         else if (aReason == Reason_Snapshot)
             enmReason = VMRESUMEREASON_STATE_SAVED;

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

@@ -670 +670 @@
 
     int rc = RTTimerLRStop(m.sampler);
-    AssertRC(rc);
+    if (   RT_FAILURE(rc)
+        && rc != VERR_TIMER_SUSPENDED)     /* calling suspendSampling() successively shouldn't assert. See @bugref{3495}. */
+        AssertMsgFailed(("PerformanceCollector::suspendSampling(): RTTimerLRStop returned %Rrc\n", rc));
 }
 
@@ -679 +681 @@
 
     int rc = RTTimerLRStart(m.sampler, 0);
-    AssertRC(rc);
+    if (   RT_FAILURE(rc)
+        && rc != VERR_TIMER_ACTIVE)     /* calling resumeSampling() successively shouldn't assert. See @bugref{3495}. */
+        AssertMsgFailed(("PerformanceCollector::resumeSampling(): RTTimerLRStart returned %Rrc\n", rc));
 }