External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-23 06:05:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Move KVM clock saving to common Vm::restore() method

Browse Source 
Saving the KVM clock and restoring it is key for correct behaviour of
the VM when doing snapshot/restore or live migration. The clock is
restored to the KVM state as part of the Vm::resume() method prior to
that it must be extracted from the state object and stored for later use
by this method. This change simplifies the extraction and storage part
so that it is done in the same way for both snapshot/restore and live
migration.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-12-06 10:47:29 +00:00
parent 00bb1ea1d5
commit a29e53e436
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmm/src/lib.rs
View File

@ -826,10 +826,6 @@ impl Vmm {
MigratableError::MigrateReceive(anyhow!("Error deserialising snapshot: {}", e))
})?;
#[cfg(all(feature = "kvm", target_arch = "x86_64"))]
vm.load_clock_from_snapshot(&snapshot)
.map_err(|e| MigratableError::MigrateReceive(anyhow!("Error resume clock: {:?}", e)))?;
// Create VM
vm.restore(snapshot).map_err(|e| {
Response::error().write_to(socket).ok();

15
vmm/src/vm.rs
View File

@ -529,9 +529,6 @@ impl Vm {
reset_evt: EventFd,
seccomp_action: &SeccompAction,
hypervisor: Arc<dyn hypervisor::Hypervisor>,
#[cfg(all(feature = "kvm", target_arch = "x86_64"))] _saved_clock: Option<
hypervisor::ClockData,
>,
activate_evt: EventFd,
restoring: bool,
) -> Result<Self> {
@ -641,7 +638,7 @@ impl Vm {
memory_manager,
vm,
#[cfg(all(feature = "kvm", target_arch = "x86_64"))]
saved_clock: _saved_clock,
saved_clock: None,
#[cfg(any(target_arch = "aarch64", feature = "acpi"))]
numa_nodes,
seccomp_action: seccomp_action.clone(),
@ -792,8 +789,6 @@ impl Vm {
reset_evt,
seccomp_action,
hypervisor,
#[cfg(all(feature = "kvm", target_arch = "x86_64"))]
None,
activate_evt,
false,
)?;
@ -865,8 +860,6 @@ impl Vm {
reset_evt,
seccomp_action,
hypervisor,
#[cfg(all(feature = "kvm", target_arch = "x86_64"))]
vm_snapshot.clock,
activate_evt,
true,
)
@ -915,8 +908,6 @@ impl Vm {
reset_evt,
seccomp_action,
hypervisor,
#[cfg(all(feature = "kvm", target_arch = "x86_64"))]
None,
activate_evt,
true,
)
@ -2508,6 +2499,10 @@ impl Snapshottable for Vm {
MigratableError::Restore(anyhow!("Could not restore VM state: {:#?}", e))
})?;
#[cfg(all(feature = "kvm", target_arch = "x86_64"))]
self.load_clock_from_snapshot(&snapshot)
.map_err(|e| MigratableError::Restore(anyhow!("Error restoring clock: {:?}", e)))?;
if let Some(memory_manager_snapshot) = snapshot.snapshots.get(MEMORY_MANAGER_SNAPSHOT_ID) {
self.memory_manager
.lock()