Merge branch 'master' of ssh://github.com/86Box/86Box into version/4.1

src/acpi.c

@@ -46,6 +46,8 @@ int        acpi_enabled        = 0;
 
 static double cpu_to_acpi;
 
+static int    acpi_power_on    = 0;
+
 #ifdef ENABLE_ACPI_LOG
 int acpi_do_log = ENABLE_ACPI_LOG;
 
@@ -1656,6 +1658,12 @@ acpi_reset(void *priv)
             dev->regs.gpi_val |= 0x00000004;
     }
 
+    if (acpi_power_on) {
+        /* Power on always generates a resume event. */
+        dev->regs.pmsts |= 0x8100;
+        acpi_power_on = 0;
+    }
+
     acpi_rtc_status = 0;
 
     acpi_update_irq(dev);
@@ -1762,10 +1770,9 @@ acpi_init(const device_t *info)
 
     acpi_reset(dev);
 
-    /* Power on always generates a resume event. */
-    dev->regs.pmsts |= 0x8100;
+    acpi_enabled  = 1;
+    acpi_power_on = 1;
 
-    acpi_enabled = 1;
     return dev;
 }