kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: make clock data independent of hypervisor

Browse Source 
As MSHV also implements set/get_clock data, this patch
removes the KVM feature guard and make it x86_64 only and
both for KVM and MSHV.

Signed-off-by: Muminul Islam <muislam@microsoft.com>
This commit is contained in:
Muminul Islam
2024-04-24 16:44:53 -07:00
committed by Bo Chen
parent 4847f5c4f6
commit 030d84eb08
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vmm/src/vm.rs
View File

@@ -30,7 +30,7 @@ use crate::igvm::igvm_loader;
use crate::memory_manager::{ use crate::memory_manager::{
Error as MemoryManagerError, MemoryManager, MemoryManagerSnapshotData, Error as MemoryManagerError, MemoryManager, MemoryManagerSnapshotData,
}; };
#[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(target_arch = "x86_64")]
use crate::migration::get_vm_snapshot; use crate::migration::get_vm_snapshot;
#[cfg(all(target_arch = "x86_64", feature = "guest_debug"))] #[cfg(all(target_arch = "x86_64", feature = "guest_debug"))]
use crate::migration::url_to_file; use crate::migration::url_to_file;
@@ -457,7 +457,7 @@ pub struct Vm {
#[cfg_attr(any(not(feature = "kvm"), target_arch = "aarch64"), allow(dead_code))] #[cfg_attr(any(not(feature = "kvm"), target_arch = "aarch64"), allow(dead_code))]
// The hypervisor abstracted virtual machine. // The hypervisor abstracted virtual machine.
vm: Arc<dyn hypervisor::Vm>, vm: Arc<dyn hypervisor::Vm>,
#[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(target_arch = "x86_64")]
saved_clock: Option<hypervisor::ClockData>, saved_clock: Option<hypervisor::ClockData>,
numa_nodes: NumaNodes, numa_nodes: NumaNodes,
#[cfg_attr(any(not(feature = "kvm"), target_arch = "aarch64"), allow(dead_code))] #[cfg_attr(any(not(feature = "kvm"), target_arch = "aarch64"), allow(dead_code))]
@@ -671,7 +671,7 @@ impl Vm {
.transpose() .transpose()
.map_err(Error::InitramfsFile)?; .map_err(Error::InitramfsFile)?;
#[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(target_arch = "x86_64")]
let saved_clock = if let Some(snapshot) = snapshot.as_ref() { let saved_clock = if let Some(snapshot) = snapshot.as_ref() {
let vm_snapshot = get_vm_snapshot(snapshot).map_err(Error::Restore)?; let vm_snapshot = get_vm_snapshot(snapshot).map_err(Error::Restore)?;
vm_snapshot.clock vm_snapshot.clock
@@ -696,7 +696,7 @@ impl Vm {
cpu_manager, cpu_manager,
memory_manager, memory_manager,
vm, vm,
#[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(target_arch = "x86_64")]
saved_clock, saved_clock,
numa_nodes, numa_nodes,
hypervisor, hypervisor,
@@ -2468,7 +2468,7 @@ impl Pausable for Vm {
.valid_transition(new_state) .valid_transition(new_state)
.map_err(|e| MigratableError::Pause(anyhow!("Invalid transition: {:?}", e)))?; .map_err(|e| MigratableError::Pause(anyhow!("Invalid transition: {:?}", e)))?;
#[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(target_arch = "x86_64")]
{ {
let mut clock = self let mut clock = self
.vm .vm
@@ -2506,7 +2506,7 @@ impl Pausable for Vm {
.map_err(|e| MigratableError::Resume(anyhow!("Invalid transition: {:?}", e)))?; .map_err(|e| MigratableError::Resume(anyhow!("Invalid transition: {:?}", e)))?;
self.cpu_manager.lock().unwrap().resume()?; self.cpu_manager.lock().unwrap().resume()?;
#[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(target_arch = "x86_64")]
{ {
if let Some(clock) = &self.saved_clock { if let Some(clock) = &self.saved_clock {
self.vm.set_clock(clock).map_err(|e| { self.vm.set_clock(clock).map_err(|e| {
@@ -2525,7 +2525,7 @@ impl Pausable for Vm {
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct VmSnapshot { pub struct VmSnapshot {
#[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(target_arch = "x86_64")]
pub clock: Option<hypervisor::ClockData>, pub clock: Option<hypervisor::ClockData>,
#[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(all(feature = "kvm", target_arch = "x86_64"))]
pub common_cpuid: Vec<hypervisor::arch::x86::CpuIdEntry>, pub common_cpuid: Vec<hypervisor::arch::x86::CpuIdEntry>,
@@ -2580,7 +2580,7 @@ impl Snapshottable for Vm {
}; };
let vm_snapshot_state = VmSnapshot { let vm_snapshot_state = VmSnapshot {
#[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(target_arch = "x86_64")]
clock: self.saved_clock, clock: self.saved_clock,
#[cfg(all(feature = "kvm", target_arch = "x86_64"))] #[cfg(all(feature = "kvm", target_arch = "x86_64"))]
common_cpuid, common_cpuid,