From 65a39f43cb94d5b15f0bae7c634dca735cf3637e Mon Sep 17 00:00:00 2001
From: renlei4 <ren.lei4@zte.com.cn>
Date: Thu, 20 May 2021 19:07:41 +0800
Subject: [PATCH] vmm: support restore KVM clock in migration

In migration, vm object is created by new_from_migration with
NULL kvm clock. so vm.set_clock will not be called during vm resume.
If the guest using kvm-clock, the ticks will be stopped after migration.

As clock was already saved to snapshot, add a method to restore it before
vm resume in migration. after that, guest's kvm-clock works well.

Signed-off-by: Ren Lei <ren.lei4@zte.com.cn>
---
 vmm/src/lib.rs |  4 ++++
 vmm/src/vm.rs  | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/vmm/src/lib.rs b/vmm/src/lib.rs
index 296ab68df..324ab9636 100644
--- a/vmm/src/lib.rs
+++ b/vmm/src/lib.rs
@@ -776,6 +776,10 @@ 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();
diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs
index d3e76823b..4ba7776fe 100644
--- a/vmm/src/vm.rs
+++ b/vmm/src/vm.rs
@@ -1833,6 +1833,17 @@ impl Vm {
             .map(|state| *state)
     }
 
+    /// Load saved clock from snapshot
+    #[cfg(all(feature = "kvm", target_arch = "x86_64"))]
+    pub fn load_clock_from_snapshot(
+        &mut self,
+        snapshot: &Snapshot,
+    ) -> Result<Option<hypervisor::ClockData>> {
+        let vm_snapshot = get_vm_snapshot(snapshot).map_err(Error::Restore)?;
+        self.saved_clock = vm_snapshot.clock;
+        Ok(self.saved_clock)
+    }
+
     #[cfg(target_arch = "aarch64")]
     /// Add the vGIC section to the VM snapshot.
     fn add_vgic_snapshot_section(