From 01420f5195905980674dc66b1c48debafe224081 Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Tue, 5 Oct 2021 11:37:39 +0200
Subject: [PATCH] vmm: memory_manager: Add virtio_mem to GuestRamMapping

This will help identify if the range belongs to a virtio-mem region or
not.

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

diff --git a/vmm/src/memory_manager.rs b/vmm/src/memory_manager.rs
index 8e168c5ed..e28c0fd0c 100644
--- a/vmm/src/memory_manager.rs
+++ b/vmm/src/memory_manager.rs
@@ -35,6 +35,7 @@ use virtio_devices::BlocksState;
 use vm_allocator::GsiApic;
 use vm_allocator::SystemAllocator;
 use vm_device::BusDevice;
+use vm_memory::bitmap::AtomicBitmap;
 use vm_memory::guest_memory::FileOffset;
 use vm_memory::{
     mmap::MmapRegionError, Address, Bytes, Error as MmapError, GuestAddress, GuestAddressSpace,
@@ -126,6 +127,8 @@ struct GuestRamMapping {
     size: u64,
     #[allow(dead_code)]
     zone_id: String,
+    #[allow(dead_code)]
+    virtio_mem: bool,
 }
 
 pub struct MemoryManager {
@@ -676,17 +679,22 @@ impl MemoryManager {
         let mut list = Vec::new();
 
         for (zone_id, memory_zone) in self.memory_zones.iter() {
-            let mut regions = memory_zone.regions().clone();
+            let mut regions: Vec<(Arc<vm_memory::GuestRegionMmap<AtomicBitmap>>, bool)> =
+                memory_zone
+                    .regions()
+                    .iter()
+                    .map(|r| (r.clone(), false))
+                    .collect();
 
             if let Some(virtio_mem_zone) = memory_zone.virtio_mem_zone() {
-                regions.push(virtio_mem_zone.region().clone());
+                regions.push((virtio_mem_zone.region().clone(), true));
             }
 
             list.push((zone_id.clone(), regions));
         }
 
         for (zone_id, regions) in list {
-            for region in regions {
+            for (region, virtio_mem) in regions {
                 let slot = self.create_userspace_mapping(
                     region.start_addr().raw_value(),
                     region.len() as u64,
@@ -700,6 +708,7 @@ impl MemoryManager {
                     size: region.len(),
                     slot,
                     zone_id: zone_id.clone(),
+                    virtio_mem,
                 });
                 self.allocator
                     .lock()
@@ -1178,6 +1187,7 @@ impl MemoryManager {
             size: region.len(),
             slot,
             zone_id: DEFAULT_MEMORY_ZONE.to_string(),
+            virtio_mem: false,
         });
 
         self.add_region(Arc::clone(&region))?;