summary refs log tree commit diff
path: root/src/plugin/vcpu.rs
diff options
context:
space:
mode:
authorZach Reizner <zachr@google.com>2018-04-24 15:58:07 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-04-26 17:00:37 -0700
commit28be0c6812d62b54a3974dc55d8d83f34499298e (patch)
tree9880bf02163e31e41ee7996e2118738d626d4469 /src/plugin/vcpu.rs
parentda3f64c8fe01dae1eaf1e1fc192dfcd711dc1dbe (diff)
downloadcrosvm-28be0c6812d62b54a3974dc55d8d83f34499298e.tar
crosvm-28be0c6812d62b54a3974dc55d8d83f34499298e.tar.gz
crosvm-28be0c6812d62b54a3974dc55d8d83f34499298e.tar.bz2
crosvm-28be0c6812d62b54a3974dc55d8d83f34499298e.tar.lz
crosvm-28be0c6812d62b54a3974dc55d8d83f34499298e.tar.xz
crosvm-28be0c6812d62b54a3974dc55d8d83f34499298e.tar.zst
crosvm-28be0c6812d62b54a3974dc55d8d83f34499298e.zip
crosvm/plugin: fmt plugin module and remove negative error code
This is fixes the last remaining negative error code returned by a Rust
function.

TEST= cargo test --features plugin
BUG=None

Change-Id: Ideee89b0f0b1effecc9b5880bcf400c82d9b96f9
Reviewed-on: https://chromium-review.googlesource.com/1026938
Commit-Ready: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Dmitry Torokhov <dtor@chromium.org>
Diffstat (limited to 'src/plugin/vcpu.rs')
-rw-r--r--src/plugin/vcpu.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugin/vcpu.rs b/src/plugin/vcpu.rs
index bf40ccc..477cf61 100644
--- a/src/plugin/vcpu.rs
+++ b/src/plugin/vcpu.rs
@@ -115,8 +115,8 @@ fn set_vcpu_state(vcpu: &Vcpu, state_set: VcpuRequest_StateSet, state: &[u8]) ->
         }
         VcpuRequest_StateSet::MP => {
             vcpu.set_mp_state(&VcpuMpState::from_slice(state)
-                                    .ok_or(SysError::new(EINVAL))?
-                                    .0)
+                                   .ok_or(SysError::new(EINVAL))?
+                                   .0)
         }
     }
 }
@@ -302,7 +302,9 @@ impl PluginVcpu {
     /// to this VCPU.
     pub fn pre_run(&self, vcpu: &Vcpu) -> SysResult<()> {
         let request = {
-            let mut lock = self.per_vcpu_state.lock().map_err(|_| SysError::new(EDEADLK))?;
+            let mut lock = self.per_vcpu_state
+                .lock()
+                .map_err(|_| SysError::new(EDEADLK))?;
             lock.pause_request.take()
         };