Skip to content

Commit cfea0d1

Browse files
committed
xxx
1 parent 7240a4f commit cfea0d1

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

integration-test/bins/Cargo.lock

-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use alloc::boxed::Box;
2+
use alloc::vec::Vec;
23
use elf_rs::{ElfFile, ProgramHeaderEntry, ProgramType};
34
use log::{debug, info};
45
use multiboot2::{
5-
BootLoaderNameTag, CommandLineTag, MaybeDynSized, MemoryArea, MemoryAreaType, MemoryMapTag,
6-
ModuleTag, SmbiosTag,
6+
BootLoaderNameTag, CommandLineTag, EFIMemoryAreaType, MaybeDynSized, MemoryArea,
7+
MemoryAreaType, MemoryMapTag, ModuleTag, SmbiosTag,
78
};
89

910
fn get_free_mmap_areas(
@@ -92,9 +93,9 @@ pub fn load_module(mbi: &multiboot2::BootInformation) -> ! {
9293
MemoryAreaType::Reserved,
9394
)]))
9495
.add_module(ModuleTag::new(
95-
elf_mod.start as u32,
96-
elf_mod.end as u32,
97-
elf_mod.string.unwrap(),
96+
elf_mod.start_address() as u32,
97+
elf_mod.end_address() as u32,
98+
elf_mod.cmdline().unwrap(),
9899
))
99100
// Test that we can add SmbiosTag multiple times.
100101
.add_smbios(SmbiosTag::new(1, 1, &[1, 2, 3]))

0 commit comments

Comments
 (0)