Changeset 56583 in vbox

Timestamp:

Jun 22, 2015 5:03:22 PM (9 years ago)

Author:

vboxsync

Message:

Main/ConsoleImpl: LogRel nit and todo has been addressed.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (2 diffs)

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

@@ -6252 +6252 @@
             if (VMR3GetStateU(ptrVM.rawUVM()) != VMSTATE_SUSPENDED)
             {
-                LogRel(("Ignoring host-resume VM resume request, VM is not currently suspended\n"));
+                LogRel(("Ignoring VM resume request, VM is currently not suspended\n"));
                 return S_OK;
             }
             if (VMR3GetSuspendReason(ptrVM.rawUVM()) != VMSUSPENDREASON_HOST_SUSPEND)
             {
-                LogRel(("Ignoring host-resume VM resume request, VM was not suspended due to host-suspend\n"));
+                LogRel(("Ignoring VM resume request, VM was not suspended due to host-suspend\n"));
                 return S_OK;
             }
@@ -6266 +6266 @@
         {
             /*
-             * Any other reason to resume the VM is ignored when the VM was suspended due to a host suspend.
+             * Any other reason to resume the VM throws an error when the VM was suspended due to a host suspend.
              * See @bugref{7836}.
              */
-            /** @todo we need to return an error code when trying to resume a VM (using
-             *        "Reason_Unspecified") when the VM has been paused due to
-             *        host-suspend. */
             if (   VMR3GetStateU(ptrVM.rawUVM()) == VMSTATE_SUSPENDED
                 && VMR3GetSuspendReason(ptrVM.rawUVM()) == VMSUSPENDREASON_HOST_SUSPEND)
-            {
-                LogRel(("Ignoring VM resume request, VM was paused in response to a host-suspend\n"));
                 return setError(VBOX_E_INVALID_VM_STATE, tr("VM is paused due to host power management"));
-            }
 
             enmReason = aReason == Reason_Snapshot ? VMRESUMEREASON_STATE_SAVED : VMRESUMEREASON_USER;