From 0159e5ada20d67402ad3fc49bf7f6ea9f9cbe493 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 12 Mar 2019 20:52:19 -0700 Subject: edition: Update crosvm crate to 2018 edition Separated out of CL:1513058 to make it possible to land parts individually while the affected crate has no other significant CLs pending. This avoids repeatedly introducing non-textual conflicts with new code that adds `use` statements. TEST=cargo check TEST=cargo check --all-features TEST=cargo check --target aarch64-unknown-linux-gnu Change-Id: If27a414db82bd6005d8067af24639f309d3b5e2e Reviewed-on: https://chromium-review.googlesource.com/1519691 Commit-Ready: ChromeOS CL Exonerator Bot Tested-by: David Tolnay Tested-by: kokoro Reviewed-by: David Tolnay --- src/plugin/mod.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/plugin/mod.rs') diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs index 4ec7a41..052b057 100644 --- a/src/plugin/mod.rs +++ b/src/plugin/mod.rs @@ -33,10 +33,9 @@ use sys_util::{ PollToken, Result as SysResult, SignalFd, SignalFdError, SIGRTMIN, }; -use Config; - use self::process::*; use self::vcpu::*; +use crate::Config; const MAX_DATAGRAM_SIZE: usize = 4096; const MAX_VCPU_DATAGRAM_SIZE: usize = 0x40000; @@ -381,7 +380,7 @@ pub fn run_vcpus( } vcpu_plugin.io_write(port as u64, &data[..size], &vcpu); } - VcpuExit::MmioRead { address, mut size } => { + VcpuExit::MmioRead { address, size } => { let mut data = [0; 8]; vcpu_plugin.mmio_read( address as u64, -- cgit 1.4.1