External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

arch: x86_64: Make unit tests pass

Browse Source 
With the adoption for rust-vmm linux-loader crate some small changes
were needed to update the unit tests to reflect this change:

* configure_system now takes an extra parameter
* the e820 entry structure comes from the linux-loader crate

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2019-07-16 10:29:23 +01:00 committed by Samuel Ortiz
parent 224f77500c
commit 18d52869c5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/src/x86_64/mod.rs
View File

@ -185,7 +185,7 @@ fn add_e820_entry(
#[cfg(test)]
mod tests {
use super::*;
use arch_gen::x86::bootparam::e820entry;
use linux_loader::loader::bootparam::e820entry;
#[test]
fn regions_lt_4gb() {
@ -217,7 +217,7 @@ mod tests {
fn test_system_configuration() {
let no_vcpus = 4;
let gm = GuestMemoryMmap::new(&vec![(GuestAddress(0), 0x10000)]).unwrap();
let config_err = configure_system(&gm, GuestAddress(0), 0, 1);
let config_err = configure_system(&gm, GuestAddress(0), 0, 1, None);
assert!(config_err.is_err());
assert_eq!(
config_err.unwrap_err(),
@ -230,19 +230,19 @@ mod tests {
let mem_size = 128 << 20;
let arch_mem_regions = arch_memory_regions(mem_size);
let gm = GuestMemoryMmap::new(&arch_mem_regions).unwrap();
configure_system(&gm, GuestAddress(0), 0, no_vcpus).unwrap();
configure_system(&gm, GuestAddress(0), 0, no_vcpus, None).unwrap();
// Now assigning some memory that is equal to the start of the 32bit memory hole.
let mem_size = 3328 << 20;
let arch_mem_regions = arch_memory_regions(mem_size);
let gm = GuestMemoryMmap::new(&arch_mem_regions).unwrap();
configure_system(&gm, GuestAddress(0), 0, no_vcpus).unwrap();
configure_system(&gm, GuestAddress(0), 0, no_vcpus, None).unwrap();
// Now assigning some memory that falls after the 32bit memory hole.
let mem_size = 3330 << 20;
let arch_mem_regions = arch_memory_regions(mem_size);
let gm = GuestMemoryMmap::new(&arch_mem_regions).unwrap();
configure_system(&gm, GuestAddress(0), 0, no_vcpus).unwrap();
configure_system(&gm, GuestAddress(0), 0, no_vcpus, None).unwrap();
}
#[test]