diff --git a/nel_os_bootloader/run-qemu.sh b/nel_os_bootloader/run-qemu.sh index 6be38ca..0336363 100755 --- a/nel_os_bootloader/run-qemu.sh +++ b/nel_os_bootloader/run-qemu.sh @@ -8,9 +8,11 @@ EFI_BINARY="$1" qemu-system-x86_64 -enable-kvm \ -m 4G \ -serial mon:stdio \ + -nographic \ -no-reboot \ -drive if=pflash,format=raw,readonly=on,file=OVMF_CODE.fd \ -drive if=pflash,format=raw,readonly=on,file=OVMF_VARS.fd \ -cdrom nel_os.iso \ -boot d \ + -cpu host \ -s diff --git a/nel_os_kernel/src/main.rs b/nel_os_kernel/src/main.rs index 5ebfa51..08e023d 100644 --- a/nel_os_kernel/src/main.rs +++ b/nel_os_kernel/src/main.rs @@ -9,7 +9,6 @@ pub mod cpuid; pub mod graphics; pub mod logging; pub mod memory; -pub mod paging; pub mod serial; use alloc::vec; @@ -23,7 +22,8 @@ use x86_64::{registers::control::Cr3, structures::paging::OffsetPageTable, VirtA use crate::{ constant::{BANNER, KERNEL_STACK_SIZE, PKG_VERSION}, graphics::{FrameBuffer, FRAME_BUFFER}, - memory::BitmapMemoryTable, + memory::memory::BitmapMemoryTable, + memory::paging, }; #[repr(C, align(16))] diff --git a/nel_os_kernel/src/memory.rs b/nel_os_kernel/src/memory/memory.rs similarity index 100% rename from nel_os_kernel/src/memory.rs rename to nel_os_kernel/src/memory/memory.rs diff --git a/nel_os_kernel/src/memory/mod.rs b/nel_os_kernel/src/memory/mod.rs new file mode 100644 index 0000000..84eb999 --- /dev/null +++ b/nel_os_kernel/src/memory/mod.rs @@ -0,0 +1,2 @@ +pub mod memory; +pub mod paging; diff --git a/nel_os_kernel/src/paging.rs b/nel_os_kernel/src/memory/paging.rs similarity index 100% rename from nel_os_kernel/src/paging.rs rename to nel_os_kernel/src/memory/paging.rs