External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-22 11:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

hypervisor: cpu: Rename state getter and setter

Browse Source 
vcpu.{set_}cpu_state() is a stutter.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2020-07-03 10:54:36 +02:00 committed by Rob Bradford
parent a3342bdb25
commit 618722cdca
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hypervisor/src/cpu.rs
View File

@ -286,12 +286,13 @@ pub trait Vcpu: Send + Sync {
#[cfg(any(target_arch = "arm", target_arch = "aarch64"))] #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
fn get_one_reg(&self, reg_id: u64) -> Result<u64>; fn get_one_reg(&self, reg_id: u64) -> Result<u64>;
/// ///
/// Retrieve the current cpu states. This function is necessary to snapshot the VM /// Retrieve the vCPU state.
/// This function is necessary to snapshot the VM
/// ///
fn cpu_state(&self) -> Result<CpuState>; fn state(&self) -> Result<CpuState>;
/// ///
/// Setting the FPU state this. /// Set the vCPU state.
/// This function is required when restoring the VM /// This function is required when restoring the VM
/// ///
fn set_cpu_state(&self, state: &CpuState) -> Result<()>; fn set_state(&self, state: &CpuState) -> Result<()>;
} }

14
hypervisor/src/kvm/mod.rs
View File

@ -638,9 +638,9 @@ impl cpu::Vcpu for KvmVcpu {
/// let vm = hv.create_vm().expect("new VM fd creation failed"); /// let vm = hv.create_vm().expect("new VM fd creation failed");
/// vm.enable_split_irq().unwrap(); /// vm.enable_split_irq().unwrap();
/// let vcpu = vm.create_vcpu(0).unwrap(); /// let vcpu = vm.create_vcpu(0).unwrap();
/// let state = vcpu.cpu_state().unwrap(); /// let state = vcpu.state().unwrap();
/// ``` /// ```
fn cpu_state(&self) -> cpu::Result<CpuState> { fn state(&self) -> cpu::Result<CpuState> {
let mp_state = self.get_mp_state()?; let mp_state = self.get_mp_state()?;
let regs = self.get_regs()?; let regs = self.get_regs()?;
let sregs = self.get_sregs()?; let sregs = self.get_sregs()?;
@ -665,7 +665,7 @@ impl cpu::Vcpu for KvmVcpu {
}) })
} }
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
fn cpu_state(&self) -> cpu::Result<CpuState> { fn state(&self) -> cpu::Result<CpuState> {
unimplemented!(); unimplemented!();
} }
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
@ -705,10 +705,10 @@ impl cpu::Vcpu for KvmVcpu {
/// let vm = hv.create_vm().expect("new VM fd creation failed"); /// let vm = hv.create_vm().expect("new VM fd creation failed");
/// vm.enable_split_irq().unwrap(); /// vm.enable_split_irq().unwrap();
/// let vcpu = vm.create_vcpu(0).unwrap(); /// let vcpu = vm.create_vcpu(0).unwrap();
/// let state = vcpu.cpu_state().unwrap(); /// let state = vcpu.state().unwrap();
/// vcpu.set_cpu_state(&state).unwrap(); /// vcpu.set_state(&state).unwrap();
/// ``` /// ```
fn set_cpu_state(&self, state: &CpuState) -> cpu::Result<()> { fn set_state(&self, state: &CpuState) -> cpu::Result<()> {
self.set_mp_state(state.mp_state)?; self.set_mp_state(state.mp_state)?;
self.set_regs(&state.regs)?; self.set_regs(&state.regs)?;
self.set_sregs(&state.sregs)?; self.set_sregs(&state.sregs)?;
@ -723,7 +723,7 @@ impl cpu::Vcpu for KvmVcpu {
} }
#[allow(unused_variables)] #[allow(unused_variables)]
#[cfg(target_arch = "aarch64")] #[cfg(target_arch = "aarch64")]
fn set_cpu_state(&self, state: &CpuState) -> cpu::Result<()> { fn set_state(&self, state: &CpuState) -> cpu::Result<()> {
Ok(()) Ok(())
} }
} }

4
vmm/src/cpu.rs
View File

@ -403,7 +403,7 @@ const VCPU_SNAPSHOT_ID: &str = "vcpu";
impl Pausable for Vcpu { impl Pausable for Vcpu {
fn pause(&mut self) -> std::result::Result<(), MigratableError> { fn pause(&mut self) -> std::result::Result<(), MigratableError> {
self.saved_state = self.saved_state =
Some(self.fd.cpu_state().map_err(|e| { Some(self.fd.state().map_err(|e| {
MigratableError::Pause(anyhow!("Could not get vCPU state {:?}", e)) MigratableError::Pause(anyhow!("Could not get vCPU state {:?}", e))
})?); })?);
@ -412,7 +412,7 @@ impl Pausable for Vcpu {
fn resume(&mut self) -> std::result::Result<(), MigratableError> { fn resume(&mut self) -> std::result::Result<(), MigratableError> {
if let Some(vcpu_state) = &self.saved_state { if let Some(vcpu_state) = &self.saved_state {
self.fd.set_cpu_state(vcpu_state).map_err(|e| { self.fd.set_state(vcpu_state).map_err(|e| {
MigratableError::Pause(anyhow!("Could not set the vCPU state {:?}", e)) MigratableError::Pause(anyhow!("Could not set the vCPU state {:?}", e))
})?; })?;
} }