TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-09 12:31:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix QEMU boot problem (#32)

Browse Source 
* Fix QEMU boot problem

Implement the fix described by @subinacl and @felixthian in the main code.
This commit is contained in:
Scott Little 2020-05-29 10:31:22 -05:00 committed by GitHub
parent d16668512f
commit b709c462d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
init/src/boot_16.cpp
View File

@ -12,10 +12,20 @@
#include "boot_32.hpp" #include "boot_32.hpp"
#include "gdt_types.hpp" #include "gdt_types.hpp"
#include "e820_types.hpp" #include "e820_types.hpp"
#include "vesa_types.hpp" #include "vesa_types.hpp"
#include "early_memory.hpp" #include "early_memory.hpp"
/*
*
* This is required for QEMU boot.
* See https://github.com/wichtounet/thor-os/issues/24
*
*/
void __attribute__ ((noreturn)) rm_main();
void __attribute__ ((noreturn)) foo(){ rm_main(); }
e820::bios_e820_entry bios_e820_entries[e820::MAX_E820_ENTRIES]; e820::bios_e820_entry bios_e820_entries[e820::MAX_E820_ENTRIES];
gdt::task_state_segment_t tss; // TODO Remove this (causes relocation errors for now) gdt::task_state_segment_t tss; // TODO Remove this (causes relocation errors for now)