diff options
| author | johannst <johannes.stoelp@gmail.com> | 2021-05-31 21:54:45 +0200 |
|---|---|---|
| committer | johannst <johannes.stoelp@gmail.com> | 2021-05-31 21:54:45 +0200 |
| commit | 0695821a1da52cdaf74f17ff722c46b62d211438 (patch) | |
| tree | 03cda1be7686273ceca26c474048525666746d57 | |
| parent | 1942d3d2ed006dc0492c441e096696ee647ea086 (diff) | |
| download | mini-kvm-rs-0695821a1da52cdaf74f17ff722c46b62d211438.tar.gz mini-kvm-rs-0695821a1da52cdaf74f17ff722c46b62d211438.zip | |
examples: use UserMem::load + fix typo
| -rw-r--r-- | examples/long_mode.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/examples/long_mode.rs b/examples/long_mode.rs index c926e79..67c014a 100644 --- a/examples/long_mode.rs +++ b/examples/long_mode.rs @@ -76,7 +76,7 @@ fn setup_long_mode_4level_paging(mem: &mut UserMem) -> PhysAddr { // | (16K) | | (16K) | // 0x8000 +-------+ <----- +-------+ 0x4000 // - // PML4 : Pamge Map Level 4 + // PML4 : Page Map Level 4 // PDP : Page Directory Pointer // PD : Page Directory // PT : Page Table @@ -84,10 +84,7 @@ fn setup_long_mode_4level_paging(mem: &mut UserMem) -> PhysAddr { // PML4, PDP, PD will contain a single entry at index 0. // PT will contain 4 page table entries (PTE) at index {0,1,2,3} -> 4 * 4K = 16K. - let mut w = |addr: PhysAddr, val: u64| { - let addr = addr.0 as usize; - mem.as_mut()[addr..addr + 8].copy_from_slice(&val.to_le_bytes()); - }; + let mut w = |addr: PhysAddr, val: u64| mem.load(addr, &val.to_le_bytes()); // PML4E[0] refers to PDPE[0:4095]. w(PhysAddr(0x0000), PAGE_ENTRY_PRESENT | PAGE_RENTRY_RW | 0x1000); |