Skip to content

Commit a4a40cc

Browse files
committed
multiboot2: memory bug fix
1 parent 5094319 commit a4a40cc

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

integration-test/bins/multiboot2_chainloader/src/main.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,9 @@ core::arch::global_asm!(include_str!("start.S"), options(att_syntax));
1818
/// convention.
1919
#[no_mangle]
2020
fn rust_entry(multiboot_magic: u32, multiboot_hdr: *const u32) -> ! {
21-
loop {
22-
23-
}
2421
init_environment();
2522
log::debug!("multiboot_hdr={multiboot_hdr:x?}, multiboot_magic=0x{multiboot_magic:x?}");
2623
let mbi = multiboot::get_mbi(multiboot_magic, multiboot_hdr as u32).unwrap();
2724
let module_iter = mbi.modules().expect("Should provide modules");
28-
panic!("foo");
2925
loader::load_module(module_iter);
3026
}

integration-test/bins/multiboot2_payload/src/integrationtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fn print_memory_map(mbi: &BootInformation) -> anyhow::Result<()> {
4343
.ok_or("Should have memory map")
4444
.map_err(anyhow::Error::msg)?;
4545
println!("Memory Map:");
46-
memmap.memory_areas().for_each(|e| {
46+
memmap.memory_areas().iter().for_each(|e| {
4747
println!(
4848
" 0x{:010x} - 0x{:010x} ({:.3} MiB {:?})",
4949
e.start_address(),

0 commit comments

Comments
 (0)