External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-03 11:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: x86_64: Split payload loading into it's own function

Browse Source 
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-08-16 12:33:03 +01:00
parent 2856074d12
commit 763ea7da42
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
vmm/src/vm.rs
View File

@ -1076,6 +1076,26 @@ impl Vm {
}
}
#[cfg(target_arch = "x86_64")]
fn load_payload(
payload: &PayloadConfig,
memory_manager: Arc<Mutex<MemoryManager>>,
) -> Result<EntryPoint> {
let kernel = payload
.kernel
.as_ref()
.map(File::open)
.transpose()
.map_err(Error::KernelFile)?;
if let Some(kernel) = kernel {
let cmdline = Self::generate_cmdline(payload)?;
Self::load_kernel(kernel, cmdline, memory_manager)
} else {
Err(Error::InvalidPayload)
}
}
#[cfg(target_arch = "x86_64")]
fn load_payload_async(
memory_manager: &Arc<Mutex<MemoryManager>>,
@ -1098,21 +1118,7 @@ impl Vm {
std::thread::Builder::new()
.name("payload_loader".into())
.spawn(move || {
let kernel = payload
.kernel
.as_ref()
.map(File::open)
.transpose()
.map_err(Error::KernelFile)?;
if let Some(kernel) = kernel {
let cmdline = Self::generate_cmdline(&payload)?;
Self::load_kernel(kernel, cmdline, memory_manager)
} else {
Err(Error::InvalidPayload)
}
})
.spawn(move || Self::load_payload(&payload, memory_manager))
.map_err(Error::KernelLoadThreadSpawn)
})
.transpose()