mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-01 02:55:45 +00:00
vmm: x86_64: Use more general name for payload handling
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
6988da79d2
commit
485900eeb4
@ -474,7 +474,7 @@ pub struct Vm {
|
|||||||
hypervisor: Arc<dyn hypervisor::Hypervisor>,
|
hypervisor: Arc<dyn hypervisor::Hypervisor>,
|
||||||
stop_on_boot: bool,
|
stop_on_boot: bool,
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
load_kernel_handle: Option<thread::JoinHandle<Result<EntryPoint>>>,
|
load_payload_handle: Option<thread::JoinHandle<Result<EntryPoint>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Vm {
|
impl Vm {
|
||||||
@ -511,8 +511,8 @@ impl Vm {
|
|||||||
.map_err(Error::KernelFile)?;
|
.map_err(Error::KernelFile)?;
|
||||||
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
let load_kernel_handle = if !restoring {
|
let load_payload_handle = if !restoring {
|
||||||
Self::load_kernel_async(&kernel, &memory_manager, &config)?
|
Self::load_payload_async(&kernel, &memory_manager, &config)?
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
@ -622,7 +622,7 @@ impl Vm {
|
|||||||
hypervisor,
|
hypervisor,
|
||||||
stop_on_boot,
|
stop_on_boot,
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
load_kernel_handle,
|
load_payload_handle,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1079,7 +1079,7 @@ impl Vm {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
fn load_kernel_async(
|
fn load_payload_async(
|
||||||
kernel: &Option<File>,
|
kernel: &Option<File>,
|
||||||
memory_manager: &Arc<Mutex<MemoryManager>>,
|
memory_manager: &Arc<Mutex<MemoryManager>>,
|
||||||
config: &Arc<Mutex<VmConfig>>,
|
config: &Arc<Mutex<VmConfig>>,
|
||||||
@ -1098,7 +1098,7 @@ impl Vm {
|
|||||||
let memory_manager = memory_manager.clone();
|
let memory_manager = memory_manager.clone();
|
||||||
|
|
||||||
std::thread::Builder::new()
|
std::thread::Builder::new()
|
||||||
.name("kernel_loader".into())
|
.name("payload_loader".into())
|
||||||
.spawn(move || {
|
.spawn(move || {
|
||||||
let cmdline = Self::generate_cmdline(&config)?;
|
let cmdline = Self::generate_cmdline(&config)?;
|
||||||
Self::load_kernel(kernel, cmdline, memory_manager)
|
Self::load_kernel(kernel, cmdline, memory_manager)
|
||||||
@ -2080,7 +2080,7 @@ impl Vm {
|
|||||||
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
fn entry_point(&mut self) -> Result<Option<EntryPoint>> {
|
fn entry_point(&mut self) -> Result<Option<EntryPoint>> {
|
||||||
self.load_kernel_handle
|
self.load_payload_handle
|
||||||
.take()
|
.take()
|
||||||
.map(|handle| handle.join().map_err(Error::KernelLoadThreadJoin)?)
|
.map(|handle| handle.join().map_err(Error::KernelLoadThreadJoin)?)
|
||||||
.transpose()
|
.transpose()
|
||||||
|
Loading…
Reference in New Issue
Block a user