External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-02 16:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Use new CpuManager accessor to get boot vCPUs

Browse Source 
When initialising the ACPI tables and configuring the VM use the new
accessor on the CpuManager to get the number of boot vCPUs.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2019-11-25 14:16:55 +00:00
parent df0907845a
commit 7543e00a07
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmm/src/vm.rs
View File

@ -512,7 +512,7 @@ impl Vm {
&cmdline_cstring,
)
.map_err(|_| Error::CmdLine)?;
let vcpu_count = self.config.cpus.cpu_count;
let boot_vcpus = self.cpu_manager.lock().unwrap().boot_vcpus();
#[allow(unused_mut, unused_assignments)]
let mut rsdp_addr: Option<GuestAddress> = None;
@ -532,7 +532,7 @@ impl Vm {
use crate::config::ConsoleOutputMode;
crate::acpi::create_acpi_tables(
&mem,
vcpu_count,
boot_vcpus,
self.config.serial.mode != ConsoleOutputMode::Off,
start_of_device_area,
end_of_range,
@ -547,7 +547,7 @@ impl Vm {
&mem,
arch::layout::CMDLINE_START,
cmdline_cstring.to_bytes().len() + 1,
vcpu_count,
boot_vcpus,
Some(hdr),
rsdp_addr,
)
@ -566,7 +566,7 @@ impl Vm {
&mem,
arch::layout::CMDLINE_START,
cmdline_cstring.to_bytes().len() + 1,
vcpu_count,
boot_vcpus,
None,
rsdp_addr,
)