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

tests: Fix aarch64 clippy issues in integration tests

Browse Source 
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-04-13 12:38:14 +01:00
parent 4338486c6f
commit 719c9b8233
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration.rs
View File

@ -8,6 +8,7 @@
// related warnings for our quality workflow to pass. // related warnings for our quality workflow to pass.
#![allow(dead_code)] #![allow(dead_code)]
#[cfg(target_arch = "x86_64")]
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
@ -417,7 +418,7 @@ enum FwType {
RustHypervisorFirmware, RustHypervisorFirmware,
} }
fn fw_path(fw_type: FwType) -> String { fn fw_path(_fw_type: FwType) -> String {
let mut workload_path = dirs::home_dir().unwrap(); let mut workload_path = dirs::home_dir().unwrap();
workload_path.push("workloads"); workload_path.push("workloads");
@ -426,7 +427,7 @@ fn fw_path(fw_type: FwType) -> String {
fw_path.push("CLOUDHV_EFI.fd"); fw_path.push("CLOUDHV_EFI.fd");
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
{ {
match fw_type { match _fw_type {
FwType::Ovmf => fw_path.push(OVMF_NAME), FwType::Ovmf => fw_path.push(OVMF_NAME),
FwType::RustHypervisorFirmware => fw_path.push("hypervisor-fw"), FwType::RustHypervisorFirmware => fw_path.push("hypervisor-fw"),
} }
@ -7501,14 +7502,15 @@ mod live_migration {
let r = std::panic::catch_unwind(|| { let r = std::panic::catch_unwind(|| {
// Perform same checks to validate VM has been properly migrated // Perform same checks to validate VM has been properly migrated
assert_eq!(guest.get_cpu_count().unwrap_or_default(), 6); assert_eq!(guest.get_cpu_count().unwrap_or_default(), 6);
#[cfg(target_arch = "x86_64")]
if numa { if numa {
#[cfg(target_arch = "x86_64")]
assert!(guest.get_total_memory().unwrap_or_default() > 6_720_000); assert!(guest.get_total_memory().unwrap_or_default() > 6_720_000);
#[cfg(target_arch = "aarch64")]
assert!(guest.get_total_memory().unwrap_or_default() > 3_840_000);
} else { } else {
assert!(guest.get_total_memory().unwrap_or_default() > 3_840_000); assert!(guest.get_total_memory().unwrap_or_default() > 3_840_000);
} }
#[cfg(target_arch = "aarch64")]
assert!(guest.get_total_memory().unwrap_or_default() > 3_840_000);
guest.check_devices_common(None, Some(&console_text)); guest.check_devices_common(None, Some(&console_text));
// Perform NUMA related checks // Perform NUMA related checks