kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: cpu: Pass CpusConfig to simplify the new() prototype

Browse Source 
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz
2020-03-16 18:14:15 +01:00
committed by Rob Bradford
parent b584ec3fb3
commit 0646a90626
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vmm/src/vm.rs
View File

@@ -314,7 +314,6 @@ impl Vm {
let memory_manager = MemoryManager::new(fd.clone(), &config.lock().unwrap().memory.clone())
.map_err(Error::MemoryManager)?;
let guest_memory = memory_manager.lock().unwrap().guest_memory();
let device_manager = DeviceManager::new(
fd.clone(),
config.clone(),
@@ -325,21 +324,17 @@ impl Vm {
)
.map_err(Error::DeviceManager)?;
let on_tty = unsafe { libc::isatty(libc::STDIN_FILENO as i32) } != 0;
let boot_vcpus = config.lock().unwrap().cpus.boot_vcpus;
let max_vcpus = config.lock().unwrap().cpus.max_vcpus;
let cpu_manager = cpu::CpuManager::new(
boot_vcpus,
max_vcpus,
&config.lock().unwrap().cpus.clone(),
&device_manager,
guest_memory,
memory_manager.lock().unwrap().guest_memory(),
&kvm,
fd,
reset_evt,
)
.map_err(Error::CpuManager)?;
let on_tty = unsafe { libc::isatty(libc::STDIN_FILENO as i32) } != 0;
Ok(Vm {
kernel,
initramfs,