diff options
author | Zach Reizner <zachr@google.com> | 2018-10-03 10:22:32 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-10-09 21:14:05 -0700 |
commit | 55a9e504beef368bd97e51ffd5a7fa6c034eb8ad (patch) | |
tree | 894d8685e2fdfa105ea35d1cb6cfceee06502c7a /kvm/tests/dirty_log.rs | |
parent | 046df60760f3b0691f23c27a7f24a96c9afe8c05 (diff) | |
download | crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.gz crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.bz2 crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.lz crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.xz crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.zst crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.zip |
cargo fmt all source code
Now that cargo fmt has landed, run it over everything at once to bring rust source to the standard formatting. TEST=cargo test BUG=None Change-Id: Ic95a48725e5a40dcbd33ba6d5aef2bd01e91865b Reviewed-on: https://chromium-review.googlesource.com/1259287 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: Zach Reizner <zachr@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'kvm/tests/dirty_log.rs')
-rw-r--r-- | kvm/tests/dirty_log.rs | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/kvm/tests/dirty_log.rs b/kvm/tests/dirty_log.rs index 7226220..269e465 100644 --- a/kvm/tests/dirty_log.rs +++ b/kvm/tests/dirty_log.rs @@ -4,13 +4,13 @@ #![cfg(any(target_arch = "x86", target_arch = "x86_64"))] -extern crate sys_util; -extern crate kvm_sys; extern crate kvm; +extern crate kvm_sys; +extern crate sys_util; use kvm::*; use kvm_sys::kvm_regs; -use sys_util::{GuestAddress, GuestMemory, SharedMemory, MemoryMapping}; +use sys_util::{GuestAddress, GuestMemory, MemoryMapping, SharedMemory}; #[test] fn test_run() { @@ -25,8 +25,8 @@ fn test_run() { let mut mem = SharedMemory::new(None).expect("failed to create shared memory"); mem.set_size(mem_size) .expect("failed to set shared memory size"); - let mmap = MemoryMapping::from_fd(&mem, mem_size as usize) - .expect("failed to create memory mapping"); + let mmap = + MemoryMapping::from_fd(&mem, mem_size as usize).expect("failed to create memory mapping"); mmap.write_slice(&code[..], load_addr.offset() as usize) .expect("Writing code to memory failed."); @@ -46,13 +46,14 @@ fn test_run() { vcpu_regs.rsi = 0x8000; vcpu_regs.rbx = 0x12; vcpu.set_regs(&vcpu_regs).expect("set regs failed"); - let slot = vm.add_device_memory(GuestAddress(0), - MemoryMapping::from_fd(&mem, mem_size as usize) - .expect("failed to create memory mapping"), - false, - true) - .expect("failed to register memory"); - + let slot = vm + .add_device_memory( + GuestAddress(0), + MemoryMapping::from_fd(&mem, mem_size as usize) + .expect("failed to create memory mapping"), + false, + true, + ).expect("failed to register memory"); loop { match vcpu.run().expect("run failed") { @@ -66,6 +67,8 @@ fn test_run() { .expect("failed to get dirty log"); // Tests the 9th page was written to. assert_eq!(dirty_log[1], 0x1); - assert_eq!(mmap.read_obj::<u64>(vcpu_regs.rsi as usize).unwrap(), - vcpu_regs.rbx); + assert_eq!( + mmap.read_obj::<u64>(vcpu_regs.rsi as usize).unwrap(), + vcpu_regs.rbx + ); } |