External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-04 04:25:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm:AArch64: add load_firmware method

Browse Source 
Later, we will load standalone firmware. So, refactor load_kernel
by abstracting load_firmware method.

Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
This commit is contained in:
Jianyong Wu 2022-08-23 15:14:45 +08:00 committed by Rob Bradford
parent c38d167523
commit 2054c8699a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vmm/src/vm.rs
View File

@ -952,6 +952,15 @@ impl Vm {
Ok(cmdline) Ok(cmdline)
} }
#[cfg(target_arch = "aarch64")]
fn load_firmware(&self, mut firmware: &File) -> Result<()> {
let uefi_flash = self.device_manager.lock().as_ref().unwrap().uefi_flash();
let mem = uefi_flash.memory();
arch::aarch64::uefi::load_uefi(mem.deref(), arch::layout::UEFI_START, &mut firmware)
.map_err(Error::UefiLoad)?;
Ok(())
}
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
fn load_kernel(&mut self) -> Result<EntryPoint> { fn load_kernel(&mut self) -> Result<EntryPoint> {
let guest_memory = self.memory_manager.lock().as_ref().unwrap().guest_memory(); let guest_memory = self.memory_manager.lock().as_ref().unwrap().guest_memory();
@ -963,30 +972,21 @@ impl Vm {
&mut kernel, &mut kernel,
None, None,
) { ) {
Ok(entry_addr) => entry_addr, Ok(entry_addr) => entry_addr.kernel_load,
// Try to load the binary as kernel PE file at first. // Try to load the binary as kernel PE file at first.
// If failed, retry to load it as UEFI binary. // If failed, retry to load it as UEFI binary.
// As the UEFI binary is formatless, it must be the last option to try. // As the UEFI binary is formatless, it must be the last option to try.
Err(linux_loader::loader::Error::Pe(InvalidImageMagicNumber)) => { Err(linux_loader::loader::Error::Pe(InvalidImageMagicNumber)) => {
let uefi_flash = self.device_manager.lock().as_ref().unwrap().uefi_flash(); self.load_firmware(kernel)?;
let mem = uefi_flash.memory(); arch::layout::UEFI_START
arch::aarch64::uefi::load_uefi(mem.deref(), arch::layout::UEFI_START, &mut kernel)
.map_err(Error::UefiLoad)?;
// The entry point offset in UEFI image is always 0.
return Ok(EntryPoint {
entry_addr: arch::layout::UEFI_START,
});
} }
Err(e) => { Err(e) => {
return Err(Error::KernelLoad(e)); return Err(Error::KernelLoad(e));
} }
}; };
let entry_point_addr: GuestAddress = entry_addr.kernel_load;
Ok(EntryPoint { Ok(EntryPoint {
entry_addr: entry_point_addr, entry_addr: entry_addr,
}) })
} }