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: Fix clippy warnings on AArch64

Browse Source 
Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
Michael Zhao 2021-06-24 14:52:18 +08:00 committed by Bo Chen
parent 5768dcc320
commit 239e39ddbc
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vmm/src/cpu.rs
View File

@ -1837,11 +1837,10 @@ mod tests {
let hv = hypervisor::new().unwrap();
let vm = hv.create_vm().unwrap();
let vcpu = vm.create_vcpu(0, None).unwrap();
let mut regions = Vec::new();
regions.push((
let regions = vec![(
GuestAddress(layout::RAM_64BIT_START),
(layout::FDT_MAX_SIZE + 0x1000) as usize,
));
)];
let mem = GuestMemoryMmap::from_ranges(&regions).expect("Cannot initialize memory");
let res = setup_regs(&vcpu, 0, 0x0, &mem);
@ -1896,7 +1895,7 @@ mod tests {
"Failed to get core register: Exec format error (os error 8)"
);
let res = vcpu.set_core_registers(&mut state);
let res = vcpu.set_core_registers(&state);
assert!(res.is_err());
assert_eq!(
format!("{}", res.unwrap_err()),
@ -1936,7 +1935,7 @@ mod tests {
id: MPIDR_EL1,
addr: 0x00,
});
let res = vcpu.set_system_registers(&mut state);
let res = vcpu.set_system_registers(&state);
assert!(res.is_err());
assert_eq!(
format!("{}", res.unwrap_err()),

6
vmm/src/interrupt.rs
View File

@ -469,8 +469,7 @@ mod tests {
let _ = vm.create_vcpu(0, None).unwrap();
let gic = create_gic(&vm, 1).expect("Cannot create gic");
let mut gicr_typer = Vec::new();
gicr_typer.push(123);
let gicr_typer = vec![123];
let res = get_redist_regs(gic.device(), &gicr_typer);
assert!(res.is_ok());
let state = res.unwrap();
@ -487,8 +486,7 @@ mod tests {
let _ = vm.create_vcpu(0, None).unwrap();
let gic = create_gic(&vm, 1).expect("Cannot create gic");
let mut gicr_typer = Vec::new();
gicr_typer.push(123);
let gicr_typer = vec![123];
let res = get_icc_regs(gic.device(), &gicr_typer);
assert!(res.is_ok());
let state = res.unwrap();

16
vmm/src/vm.rs
View File

@ -2461,10 +2461,10 @@ mod tests {
#[cfg(test)]
mod tests {
use super::*;
use crate::{GuestMemoryMmap, GuestRegionMmap};
use crate::GuestMemoryMmap;
use arch::aarch64::fdt::create_fdt;
use arch::aarch64::gic::kvm::create_gic;
use arch::aarch64::{layout, DeviceInfoForFdt};
use arch::aarch64::layout;
use arch::{DeviceType, MmioDeviceInfo};
use vm_memory::GuestAddress;
@ -2472,11 +2472,10 @@ mod tests {
#[test]
fn test_create_fdt_with_devices() {
let mut regions = Vec::new();
regions.push((
let regions = vec![(
GuestAddress(layout::RAM_64BIT_START),
(layout::FDT_MAX_SIZE + 0x1000) as usize,
));
)];
let mem = GuestMemoryMmap::from_ranges(&regions).expect("Cannot initialize memory");
let dev_info: HashMap<(DeviceType, std::string::String), MmioDeviceInfo> = [
@ -2489,15 +2488,12 @@ mod tests {
),
(
(DeviceType::Virtio(1), "virtio".to_string()),
MmioDeviceInfo {
addr: 0x00 + LEN,
irq: 34,
},
MmioDeviceInfo { addr: LEN, irq: 34 },
),
(
(DeviceType::Rtc, "rtc".to_string()),
MmioDeviceInfo {
addr: 0x00 + 2 * LEN,
addr: 2 * LEN,
irq: 35,
},
),