External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-21 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Factorize the vm boot and shutdown code

Browse Source 
So that the API handling state machine is cleaner and easier to read.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2019-10-01 17:03:38 +02:00
parent 43b3642955
commit f9daf2e247
2 changed files with 37 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
vmm/src/lib.rs
View File

@ -231,6 +231,34 @@ impl Vmm {
})
}
fn vm_boot(&mut self) -> result::Result<(), VmError> {
// Create a new VM is we don't have one yet.
if self.vm.is_none() {
let exit_evt = self.exit_evt.try_clone().map_err(VmError::EventFdClone)?;
let reset_evt = self.reset_evt.try_clone().map_err(VmError::EventFdClone)?;
if let Some(ref vm_config) = self.vm_config {
let vm = Vm::new(Arc::clone(vm_config), exit_evt, reset_evt)?;
self.vm = Some(vm);
}
}
// Now we can boot the VM.
if let Some(ref mut vm) = self.vm {
vm.boot()
} else {
Err(VmError::VmNotCreated)
}
}
fn vm_shutdown(&mut self) -> result::Result<(), VmError> {
if let Some(ref mut vm) = self.vm {
vm.shutdown()
} else {
Err(VmError::VmNotBooted)
}
}
fn vm_reboot(&mut self) -> result::Result<(), VmError> {
// Without ACPI, a reset is equivalent to a shutdown
#[cfg(not(feature = "acpi"))]
@ -358,56 +386,17 @@ impl Vmm {
continue;
}
// Create a new VM is we don't have one yet.
if self.vm.is_none() {
let exit_evt = self
.exit_evt
.try_clone()
.map_err(Error::EventFdClone)?;
let reset_evt = self
.reset_evt
.try_clone()
.map_err(Error::EventFdClone)?;
if let Some(ref vm_config) = self.vm_config {
match Vm::new(
Arc::clone(vm_config),
exit_evt,
reset_evt,
) {
Ok(vm) => {
self.vm = Some(vm);
}
Err(e) => {
sender
.send(Err(ApiError::VmCreate(e)))
.map_err(Error::ApiResponseSend)?;
continue;
}
}
}
}
// Now let's boot it.
let response = if let Some(ref mut vm) = self.vm {
match vm.boot() {
Ok(_) => Ok(ApiResponsePayload::Empty),
Err(e) => Err(ApiError::VmBoot(e)),
}
} else {
Err(ApiError::VmNotCreated)
let response = match self.vm_boot() {
Ok(_) => Ok(ApiResponsePayload::Empty),
Err(e) => Err(ApiError::VmBoot(e)),
};
sender.send(response).map_err(Error::ApiResponseSend)?;
}
ApiRequest::VmShutdown(sender) => {
let response = if let Some(ref mut vm) = self.vm {
match vm.shutdown() {
Ok(_) => Ok(ApiResponsePayload::Empty),
Err(e) => Err(ApiError::VmShutdown(e)),
}
} else {
Err(ApiError::VmNotBooted)
let response = match self.vm_shutdown() {
Ok(_) => Ok(ApiResponsePayload::Empty),
Err(e) => Err(ApiError::VmShutdown(e)),
};
sender.send(response).map_err(Error::ApiResponseSend)?;

3
vmm/src/vm.rs
View File

@ -213,6 +213,9 @@ pub enum Error {
/// VM is not created
VmNotCreated,
/// VM is not bootted
VmNotBooted,
/// Cannot clone EventFd.
EventFdClone(io::Error),
}