Moved the shutdown command to kmain

SlyMarbo · SlyMarbo · commit 7e0a79704721 · 2022-02-11T08:44:37.000Z
This may make tests more reliable.

Signed-off-by: SlyMarbo &lt;the.sly.marbo@googlemail.com&gt;
diff --git a/kernel/src/main.rs b/kernel/src/main.rs
@@ -43,7 +43,6 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! {
     #[cfg(not(test))]
     kmain();
 
-    kernel::shutdown_qemu();
     kernel::halt_loop();
 }
 
@@ -63,6 +62,8 @@ fn kmain() {
     memory::pmm::debug();
     pci::init();
     pci::debug();
+
+    kernel::shutdown_qemu();
 }
 
 // Testing framework.

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! {`
`43`	`43`	`#[cfg(not(test))]`
`44`	`44`	`kmain();`
`45`	`45`
`46`		`- kernel::shutdown_qemu();`
`47`	`46`	`kernel::halt_loop();`
`48`	`47`	`}`
`49`	`48`
`@@ -63,6 +62,8 @@ fn kmain() {`
`63`	`62`	`memory::pmm::debug();`
`64`	`63`	`pci::init();`
`65`	`64`	`pci::debug();`
	`65`	`+`
	`66`	`+ kernel::shutdown_qemu();`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`// Testing framework.`