aboutsummaryrefslogtreecommitdiffstats
path: root/src/threads
diff options
context:
space:
mode:
authorFilip Strömbäck <filip.stromback@liu.se>2018-04-18 16:59:40 +0200
committerFilip Strömbäck <filip.stromback@liu.se>2018-04-18 16:59:40 +0200
commitfaedf3ab0659cff849034d85d7c58551afb2d5eb (patch)
tree32dd8744f31314c167521a14f58a353e2068d1ed /src/threads
parentdb66a7426d91c3513dad0ba2bb795aa6164c5be1 (diff)
downloadpintos-rs-faedf3ab0659cff849034d85d7c58551afb2d5eb.tar.gz
Fixed compilation issues on the latest GCC and QEMU.
Signed-off-by: Filip Strömbäck <filip.stromback@liu.se>
Diffstat (limited to 'src/threads')
-rw-r--r--src/threads/init.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/threads/init.c b/src/threads/init.c
index 16be95d..ee05db1 100644
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -410,10 +410,16 @@ hard_power_off (void)
ACPI shutdown should use:
outw(PM1a_CNT, SLP_TYPa | SLP_EN );
Gathering of the corect values for the parameters is not easy.
- This works for QEMU and Bochs. It's not portable.
+ This works for QEMU and Bochs. It's not portable (and does not work in the latest QEMU).
*/
outw(0xB004, 0x2000);
+ /* Even more recent versions of QEMU needs other measures for shutdown.
+ * See: https://wiki.osdev.org/Shutdown
+ * Exit code is the value to outb * 2 + 1, so we can not exit cleanly...
+ */
+ outb(0xF4, 0x30);
+
/* This is APM Shutdown */
for (p = s; *p != '\0'; p++)
outb (0x8900, *p);