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

cloud-hypervisor: Add the --memory option

Browse Source 
You guessed it: To specify the amount of memory for the VM.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2019-03-11 17:48:35 +01:00
parent 59b5e53c40
commit 25f4063da6
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.rs
View File

@ -31,6 +31,12 @@ fn main() {
.help("Number of virtual CPUs") .help("Number of virtual CPUs")
.takes_value(true), .takes_value(true),
) )
.arg(
Arg::with_name("memory")
.long("memory")
.help("Amount of RAM (in MB)")
.takes_value(true),
)
.get_matches(); .get_matches();
let kernel_arg = cmd_arguments let kernel_arg = cmd_arguments
@ -45,10 +51,15 @@ fn main() {
vcpus = cpus.parse::<u8>().unwrap(); vcpus = cpus.parse::<u8>().unwrap();
} }
println!("VM [{} vCPUS]", vcpus); let mut memory = DEFAULT_MEMORY;
if let Some(mem) = cmd_arguments.value_of("memory") {
memory = mem.parse::<u64>().unwrap();
}
println!("VM [{} vCPUS {} MB of memory]", vcpus, memory);
println!("Booting {:?}...", kernel_path); println!("Booting {:?}...", kernel_path);
let vm_config = VmConfig::new(kernel_path, vcpus).unwrap(); let vm_config = VmConfig::new(kernel_path, vcpus, memory).unwrap();
vmm::boot_kernel(vm_config).unwrap(); vmm::boot_kernel(vm_config).unwrap();
} }

8
vmm/src/vm.rs
View File

@ -31,6 +31,7 @@ use vmm_sys_util::EventFd;
const VCPU_RTSIG_OFFSET: i32 = 0; const VCPU_RTSIG_OFFSET: i32 = 0;
pub const DEFAULT_VCPUS: u8 = 1; pub const DEFAULT_VCPUS: u8 = 1;
pub const DEFAULT_MEMORY: GuestUsize = 512;
const DEFAULT_CMDLINE: &str = "console=ttyS0 reboot=k panic=1 pci=off nomodules \ const DEFAULT_CMDLINE: &str = "console=ttyS0 reboot=k panic=1 pci=off nomodules \
i8042.noaux i8042.nomux i8042.nopnp i8042.dumbkbd"; i8042.noaux i8042.nomux i8042.nopnp i8042.dumbkbd";
const CMDLINE_OFFSET: GuestAddress = GuestAddress(0x20000); const CMDLINE_OFFSET: GuestAddress = GuestAddress(0x20000);
@ -168,9 +169,10 @@ pub struct VmConfig<'a> {
} }
impl<'a> VmConfig<'a> { impl<'a> VmConfig<'a> {
pub fn new(kernel_path: &'a Path, vcpus: u8) -> Result<Self> { pub fn new(kernel_path: &'a Path, vcpus: u8, memory_size: GuestUsize) -> Result<Self> {
Ok(VmConfig { Ok(VmConfig {
kernel_path, kernel_path,
memory_size,
vcpu_count: vcpus, vcpu_count: vcpus,
..Default::default() ..Default::default()
}) })
@ -187,8 +189,8 @@ impl<'a> Default for VmConfig<'a> {
kernel_path: Path::new(""), kernel_path: Path::new(""),
cmdline: Some(cmdline), cmdline: Some(cmdline),
cmdline_addr: CMDLINE_OFFSET, cmdline_addr: CMDLINE_OFFSET,
memory_size: 512, memory_size: DEFAULT_MEMORY,
vcpu_count: 1, vcpu_count: DEFAULT_VCPUS,
} }
} }
} }