xxx

rust-osdev · Aug 24, 2024 · cfea0d1 · cfea0d1
1 parent 7240a4f
commit cfea0d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 21 deletions.
diff --git a/integration-test/bins/Cargo.lock b/integration-test/bins/Cargo.lock
diff --git a/integration-test/bins/multiboot2_chainloader/src/loader.rs b/integration-test/bins/multiboot2_chainloader/src/loader.rs
@@ -1,9 +1,10 @@
 use alloc::boxed::Box;
+use alloc::vec::Vec;
 use elf_rs::{ElfFile, ProgramHeaderEntry, ProgramType};
 use log::{debug, info};
 use multiboot2::{
-    BootLoaderNameTag, CommandLineTag, MaybeDynSized, MemoryArea, MemoryAreaType, MemoryMapTag,
-    ModuleTag, SmbiosTag,
+    BootLoaderNameTag, CommandLineTag, EFIMemoryAreaType, MaybeDynSized, MemoryArea,
+    MemoryAreaType, MemoryMapTag, ModuleTag, SmbiosTag,
 };
 
 fn get_free_mmap_areas(
@@ -92,9 +93,9 @@ pub fn load_module(mbi: &multiboot2::BootInformation) -> ! {
             MemoryAreaType::Reserved,
         )]))
         .add_module(ModuleTag::new(
-            elf_mod.start as u32,
-            elf_mod.end as u32,
-            elf_mod.string.unwrap(),
+            elf_mod.start_address() as u32,
+            elf_mod.end_address() as u32,
+            elf_mod.cmdline().unwrap(),
         ))
         // Test that we can add SmbiosTag multiple times.
         .add_smbios(SmbiosTag::new(1, 1, &[1, 2, 3]))