Changeset 50220 in vbox for trunk

Timestamp:

Jan 24, 2014 1:46:27 PM (11 years ago)

Author:

vboxsync

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

91800

Message:

Main/HostPower: another shot at savestate-on-battery-low

Location:

trunk/src/VBox/Main

Files:

• include/HostPower.h (modified) (1 diff)
• src-server/HostPower.cpp (modified) (8 diffs)

trunk/src/VBox/Main/include/HostPower.h

@@ -38 +38 @@
     VirtualBox *mVirtualBox;
     std::vector<ComPtr<IInternalSessionControl> > mSessionControls;
-
-  private:
-    bool fSavestateOnBatteryLow;
 };
 

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

@@ -53 +53 @@
         case Reason_HostSuspend:
         {
-            LogFunc(("SUSPEND\n"));
+            LogFunc(("HOST SUSPEND\n"));
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
@@ -81 +81 @@
             }
 
-            LogFunc(("Suspended %d VMs\n", mSessionControls.size()));
-
+            LogRel(("Host suspending: Paused %d VMs\n", mSessionControls.size()));
             break;
         }
@@ -88 +87 @@
         case Reason_HostResume:
         {
-            LogFunc(("RESUME\n"));
+            LogFunc(("HOST RESUME\n"));
 
             size_t resumed = 0;
@@ -106 +105 @@
             }
 
-            LogFunc(("Resumed %d VMs\n", resumed));
+            LogRel(("Host resumed: Resumed %d VMs\n", resumed));
 
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
@@ -117 +116 @@
 
             mSessionControls.clear();
-
             break;
         }
@@ -123 +121 @@
         case Reason_HostBatteryLow:
         {
+            LogFunc(("BATTERY LOW\n"));
+
             Bstr value;
-            HRESULT hrc = mVirtualBox->GetExtraData(Bstr("VBoxInternal2/SavestateOnBatteryLow").raw(),
-                                                         value.asOutParam());
-            if (   SUCCEEDED(hrc)
-                && value != "0")
-            {
-                LogFunc(("BATTERY LOW -- savestate running VMs\n"));
-
-                mVirtualBox->getOpenedMachines(machines, &controls);
-                size_t saved = 0;
-
-                /* save running VMs */
-                for (VirtualBox::InternalControlList::const_iterator it = controls.begin();
-                     it != controls.end();
-                     ++it)
+            rc = mVirtualBox->GetExtraData(Bstr("VBoxInternal2/SavestateOnBatteryLow").raw(),
+                                           value.asOutParam());
+            int fGlobal = 0;
+            if (SUCCEEDED(rc))
+            {
+                if (value != "0")
+                    fGlobal = 1;
+                else if (value == "0")
+                    fGlobal = -1;
+            }
+
+            mVirtualBox->getOpenedMachines(machines, &controls);
+            size_t saved = 0;
+
+            /* save running VMs */
+            SessionMachinesList::const_iterator it2 = machines.begin();
+            for (VirtualBox::InternalControlList::const_iterator it = controls.begin();
+                 it != controls.end() && it2 != machines.end();
+                 ++it, ++it2)
+            {
+                ComPtr<SessionMachine> pMachine = *it2;
+                rc = pMachine->GetExtraData(Bstr("VBoxInternal2/SavestateOnBatteryLow").raw(),
+                                            value.asOutParam());
+                int fPerVM = 0;
+                if (SUCCEEDED(rc))
+                {
+                    /* per-VM overrides global */
+                    if (value != "0")
+                        fPerVM = 2;
+                    else if (value == "0")
+                        fPerVM = -2;
+                }
+
+                /* default is true */
+                if (fGlobal + fPerVM >= 0)
                 {
                     ComPtr<IInternalSessionControl> pControl = *it;
@@ -146 +167 @@
                     rc = pControl->SaveStateWithReason(Reason_HostBatteryLow, progress.asOutParam());
                     if (FAILED(rc))
+                    {
+                        LogRel(("SaveState '%s' failed with %Rhrc\n", pMachine->getName().c_str(), rc));
                         continue;
+                    }
 
                     /* Wait until the operation has been completed. */
@@ -160 +184 @@
 
                     if (SUCCEEDED(rc))
+                    {
+                        LogRel(("SaveState '%s' succeeded\n", pMachine->getName().c_str()));
                         ++saved;
+                    }
                 }
-                LogFunc(("Saved %d VMs\n", saved));
-            }
-            else
-            {
-                LogFunc(("BATTERY LOW -- no action\n"));
-            }
-
+                LogRel(("Battery Low: Saved %d VMs\n", saved));
+            }
             break;
         }