External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-06-30 23:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: x86_64: Rename load_firmware() to reflect its purpose

Browse Source 
This function only supports loading legacy, non-PVH firmware binaries.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-08-16 13:08:24 +01:00
parent 0d682e185f
commit 282a1001ef
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vmm/src/vm.rs
View File

@ -989,7 +989,7 @@ impl Vm {
} }
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
fn load_firmware( fn load_legacy_firmware(
mut firmware: File, mut firmware: File,
memory_manager: &Arc<Mutex<MemoryManager>>, memory_manager: &Arc<Mutex<MemoryManager>>,
) -> Result<EntryPoint> { ) -> Result<EntryPoint> {
@ -1055,7 +1055,9 @@ impl Vm {
) { ) {
Ok(entry_addr) => entry_addr, Ok(entry_addr) => entry_addr,
Err(e) => match e { Err(e) => match e {
Elf(InvalidElfMagicNumber) => return Self::load_firmware(kernel, &memory_manager), Elf(InvalidElfMagicNumber) => {
return Self::load_legacy_firmware(kernel, &memory_manager)
}
_ => { _ => {
return Err(Error::KernelLoad(e)); return Err(Error::KernelLoad(e));
} }