From 0d573ae86c18b7950b789baae0ef5f68147aa8a1 Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Tue, 5 Oct 2021 13:46:56 +0200
Subject: [PATCH] vmm: memory_manager: Add file_offset to GuestRamMapping

This will help restoring the region with the correct file offset for the
memory mapping.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 vmm/src/memory_manager.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/vmm/src/memory_manager.rs b/vmm/src/memory_manager.rs
index e28c0fd0c..3c0dcda17 100644
--- a/vmm/src/memory_manager.rs
+++ b/vmm/src/memory_manager.rs
@@ -129,6 +129,8 @@ struct GuestRamMapping {
     zone_id: String,
     #[allow(dead_code)]
     virtio_mem: bool,
+    #[allow(dead_code)]
+    file_offset: u64,
 }
 
 pub struct MemoryManager {
@@ -703,12 +705,20 @@ impl MemoryManager {
                     false,
                     self.log_dirty,
                 )?;
+
+                let file_offset = if let Some(file_offset) = region.file_offset() {
+                    file_offset.start()
+                } else {
+                    0
+                };
+
                 self.guest_ram_mappings.push(GuestRamMapping {
                     gpa: region.start_addr().raw_value(),
                     size: region.len(),
                     slot,
                     zone_id: zone_id.clone(),
                     virtio_mem,
+                    file_offset,
                 });
                 self.allocator
                     .lock()
@@ -1188,6 +1198,7 @@ impl MemoryManager {
             slot,
             zone_id: DEFAULT_MEMORY_ZONE.to_string(),
             virtio_mem: false,
+            file_offset: 0,
         });
 
         self.add_region(Arc::clone(&region))?;