RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 15:48:12 +00:00
Code Issues Activity Actions

Kernel: Move QEMU shutdown code to the x86 subdirectory

Browse source 
QEMU VM shutdown code is really x86 specific, so let's ensure we only
use it when compiling a Kernel for x86 machines.
This commit is contained in:
Liav A 2022-09-02 09:45:30 +03:00 • committed by Linus Groh
parent d3601aedc5
commit 4555cac639
4 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Kernel/Panic.cpp
View file

@ -6,7 +6,9 @@
#include <AK/Format.h>
#include <Kernel/Arch/Processor.h>
#include <Kernel/Arch/x86/IO.h>
#if ARCH(I386) || ARCH(X86_64)
# include <Kernel/Arch/x86/common/QEMUShutdown.h>
#endif
#include <Kernel/CommandLine.h>
#include <Kernel/KSyms.h>
#include <Kernel/Panic.h>
@ -16,11 +18,11 @@ namespace Kernel {
[[noreturn]] static void __shutdown()
{
// Note: This will invoke QEMU Shutdown, but for other platforms (or emulators),
// this has no effect on the system, so we still need to halt afterwards.
// We also try the Bochs/Old QEMU shutdown method, if the first didn't work.
IO::out16(0x604, 0x2000);
IO::out16(0xb004, 0x2000);
#if ARCH(I386) || ARCH(X86_64)
qemu_shutdown();
#endif
// Note: If we failed to invoke platform shutdown, we need to halt afterwards
// to ensure no further execution on any CPU still happens.
Processor::halt();
}