From d2d3abb13c90c6c0b2cf2aed4a3b0f9210b6095b Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Thu, 10 Oct 2019 18:00:44 +0200 Subject: [PATCH] vmm: Rename Booted vm state to Running Signed-off-by: Samuel Ortiz --- vmm/src/lib.rs | 6 +++--- vmm/src/vm.rs | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/vmm/src/lib.rs b/vmm/src/lib.rs index f9a576f2b..75f3653cb 100644 --- a/vmm/src/lib.rs +++ b/vmm/src/lib.rs @@ -231,7 +231,7 @@ impl Vmm { if let Some(ref mut vm) = self.vm { vm.pause() } else { - Err(VmError::VmNotBooted) + Err(VmError::VmNotRunning) } } @@ -239,7 +239,7 @@ impl Vmm { if let Some(ref mut vm) = self.vm { vm.resume() } else { - Err(VmError::VmNotBooted) + Err(VmError::VmNotRunning) } } @@ -247,7 +247,7 @@ impl Vmm { if let Some(ref mut vm) = self.vm.take() { vm.shutdown() } else { - Err(VmError::VmNotBooted) + Err(VmError::VmNotRunning) } } diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index bd25bf1bf..886c1e341 100755 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -213,8 +213,8 @@ pub enum Error { /// VM is not created VmNotCreated, - /// VM is not bootted - VmNotBooted, + /// VM is not running + VmNotRunning, /// Cannot clone EventFd. EventFdClone(io::Error), @@ -439,7 +439,7 @@ pub struct VmInfo<'a> { #[derive(Clone, Debug, Deserialize, Serialize)] pub enum VmState { Created, - Booted, + Running, Shutdown, Paused, } @@ -843,9 +843,9 @@ impl Vm { vcpu_thread.thread().unpark(); } - // And we're back to Booted state. + // And we're back to the Running state. let mut state = self.state.try_write().map_err(|_| Error::PoisonedState)?; - *state = VmState::Booted; + *state = VmState::Running; Ok(()) } @@ -965,7 +965,7 @@ impl Vm { } let mut state = self.state.try_write().map_err(|_| Error::PoisonedState)?; - *state = VmState::Booted; + *state = VmState::Running; Ok(()) }