summary refs log tree commit diff
path: root/src/plugin/mod.rs
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-03-12 20:52:19 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-08 22:30:28 -0700
commit0159e5ada20d67402ad3fc49bf7f6ea9f9cbe493 (patch)
treea98cebbc32e299cb73b2718ec823e0f1546c56e8 /src/plugin/mod.rs
parenta7d4ea6dd0646c2ed3f066e91d3d8b2ca62b5bad (diff)
downloadcrosvm-0159e5ada20d67402ad3fc49bf7f6ea9f9cbe493.tar
crosvm-0159e5ada20d67402ad3fc49bf7f6ea9f9cbe493.tar.gz
crosvm-0159e5ada20d67402ad3fc49bf7f6ea9f9cbe493.tar.bz2
crosvm-0159e5ada20d67402ad3fc49bf7f6ea9f9cbe493.tar.lz
crosvm-0159e5ada20d67402ad3fc49bf7f6ea9f9cbe493.tar.xz
crosvm-0159e5ada20d67402ad3fc49bf7f6ea9f9cbe493.tar.zst
crosvm-0159e5ada20d67402ad3fc49bf7f6ea9f9cbe493.zip
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 <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: David Tolnay <dtolnay@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: David Tolnay <dtolnay@chromium.org>
Diffstat (limited to 'src/plugin/mod.rs')
-rw-r--r--src/plugin/mod.rs5
1 files changed, 2 insertions, 3 deletions
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,