Changeset 35546 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Jan 13, 2011 4:02:08 PM (14 years ago)

Author:

vboxsync

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

69430

Message:

Devices/DevACPI: enforce disabling of S1/S4 power states

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -1282 +1282 @@
                 break;
             case 0x01:                  /* S1 */
-                LogRel(("Entering S1 power state (powered-on suspend)\n"));
-                return acpiSleep(s);
+                if (s->fS1Enabled)
+                {
+                    LogRel(("Entering S1 power state (powered-on suspend)\n"));
+                    return acpiSleep(s);
+                }
+                else
+                    LogRel(("Ignoring guest attempt to enter S1 power state (powered-on suspend)!\n"));
             case 0x04:                  /* S4 */
-                LogRel(("Entering S4 power state (suspend to disk)\n"));
-                return acpiPowerDown(s);/* Same behavior as S5 */
+                if (s->fS4Enabled)
+                {
+                    LogRel(("Entering S4 power state (suspend to disk)\n"));
+                    return acpiPowerDown(s);/* Same behavior as S5 */
+                }
+                else
+                    LogRel(("Ignoring guest attempt to enter S4 power state (suspend to disk)!\n"));
             case 0x05:                  /* S5 */
                 LogRel(("Entering S5 power state (power down)\n"));
@@ -2687 +2697 @@
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed to read \"PowerS1Enabled\""));
+                                N_("Configuration error: Failed to read \"PowerS4Enabled\""));
 
     /* query whether S1 power state should save the VM state */