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 layout constant for kernel command line

Browse Source 
Remove the unnecessary field on CmdlineConfig and switch to using the
common offset.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2019-09-27 17:06:53 +01:00 committed by Sebastien Boeuf
parent 1bc47507b7
commit a0455167d0
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmm/src/config.rs
View File

@ -12,13 +12,11 @@ use std::net::AddrParseError;
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use std::path::PathBuf; use std::path::PathBuf;
use std::result; use std::result;
use vm_memory::GuestAddress;
use vm_virtio::vhost_user::VhostUserConfig; use vm_virtio::vhost_user::VhostUserConfig;
pub const DEFAULT_VCPUS: &str = "1"; pub const DEFAULT_VCPUS: &str = "1";
pub const DEFAULT_MEMORY: &str = "size=512M"; pub const DEFAULT_MEMORY: &str = "size=512M";
pub const DEFAULT_RNG_SOURCE: &str = "/dev/urandom"; pub const DEFAULT_RNG_SOURCE: &str = "/dev/urandom";
const CMDLINE_OFFSET: GuestAddress = GuestAddress(0x20000);
/// Errors associated with VM configuration parameters. /// Errors associated with VM configuration parameters.
#[derive(Debug)] #[derive(Debug)]
@ -190,7 +188,6 @@ impl KernelConfig {
#[derive(Clone)] #[derive(Clone)]
pub struct CmdlineConfig { pub struct CmdlineConfig {
pub args: Cmdline, pub args: Cmdline,
pub offset: GuestAddress,
} }
impl CmdlineConfig { impl CmdlineConfig {
@ -201,10 +198,7 @@ impl CmdlineConfig {
let mut args = Cmdline::new(arch::CMDLINE_MAX_SIZE); let mut args = Cmdline::new(arch::CMDLINE_MAX_SIZE);
args.insert_str(cmdline_str).unwrap(); args.insert_str(cmdline_str).unwrap();
Ok(CmdlineConfig { Ok(CmdlineConfig { args })
args,
offset: CMDLINE_OFFSET,
})
} }
} }

6
vmm/src/vm.rs
View File

@ -704,7 +704,7 @@ impl Vm {
linux_loader::loader::load_cmdline( linux_loader::loader::load_cmdline(
mem.deref(), mem.deref(),
self.config.cmdline.offset, arch::layout::CMDLINE_START,
&cmdline_cstring, &cmdline_cstring,
) )
.map_err(|_| Error::CmdLine)?; .map_err(|_| Error::CmdLine)?;
@ -715,7 +715,7 @@ impl Vm {
Some(hdr) => { Some(hdr) => {
arch::configure_system( arch::configure_system(
&mem, &mem,
self.config.cmdline.offset, arch::layout::CMDLINE_START,
cmdline_cstring.to_bytes().len() + 1, cmdline_cstring.to_bytes().len() + 1,
vcpu_count, vcpu_count,
Some(hdr), Some(hdr),
@ -735,7 +735,7 @@ impl Vm {
None => { None => {
arch::configure_system( arch::configure_system(
&mem, &mem,
self.config.cmdline.offset, arch::layout::CMDLINE_START,
cmdline_cstring.to_bytes().len() + 1, cmdline_cstring.to_bytes().len() + 1,
vcpu_count, vcpu_count,
None, None,