External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-22 03:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Refactor kernel command line generation

Browse Source 
This allows the same code for generating the kernel command line to be
used on both aarch64 and x86_64 when the latter starts loading the
kernel in asynchronously.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-04-28 15:33:45 +01:00
parent f1276c58d2
commit 1d1a087fc5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vmm/src/vm.rs
View File

@ -967,14 +967,17 @@ impl Vm {
Ok(arch::InitramfsConfig { address, size })
}
fn get_cmdline(&mut self) -> Result<Cmdline> {
fn generate_cmdline(
config: &Arc<Mutex<VmConfig>>,
#[cfg(target_arch = "aarch64")] device_manager: &Arc<Mutex<DeviceManager>>,
) -> Result<Cmdline> {
let mut cmdline = Cmdline::new(arch::CMDLINE_MAX_SIZE);
cmdline
.insert_str(self.config.lock().unwrap().cmdline.args.clone())
.insert_str(&config.lock().unwrap().cmdline.args)
.map_err(Error::CmdLineInsertStr)?;
#[cfg(target_arch = "aarch64")]
for entry in self.device_manager.lock().unwrap().cmdline_additions() {
for entry in device_manager.lock().unwrap().cmdline_additions() {
cmdline.insert_str(entry).map_err(Error::CmdLineInsertStr)?;
}
Ok(cmdline)
@ -1022,7 +1025,7 @@ impl Vm {
fn load_kernel(&mut self) -> Result<EntryPoint> {
use linux_loader::loader::{elf::Error::InvalidElfMagicNumber, Error::Elf};
info!("Loading kernel");
let cmdline = self.get_cmdline()?;
let cmdline = Self::generate_cmdline(&self.config)?;
let guest_memory = self.memory_manager.lock().as_ref().unwrap().guest_memory();
let mem = guest_memory.memory();
let mut kernel = self.kernel.as_ref().unwrap();
@ -1133,7 +1136,7 @@ impl Vm {
#[cfg(target_arch = "aarch64")]
fn configure_system(&mut self, _rsdp_addr: GuestAddress) -> Result<()> {
let cmdline = self.get_cmdline()?;
let cmdline = Self::generate_cmdline(&self.config, &self.device_manager)?;
let vcpu_mpidrs = self.cpu_manager.lock().unwrap().get_mpidrs();
let vcpu_topology = self.cpu_manager.lock().unwrap().get_vcpu_topology();
let mem = self.memory_manager.lock().unwrap().boot_guest_memory();
@ -1884,7 +1887,7 @@ impl Vm {
}
TdvfSectionType::PayloadParam => {
info!("Copying payload parameters to guest memory");
let cmdline = self.get_cmdline()?;
let cmdline = Self::generate_cmdline(&self.config)?;
mem.write_slice(cmdline.as_str().as_bytes(), GuestAddress(section.address))
.unwrap();
}