fixup! feat(virtio-mem): implement dynamic slots

Author: Manciukic

src/vmm/src/devices/virtio/mem/device.rs

@@ -523,9 +523,9 @@ impl VirtioMem {
                 };
                 match self.range_state(&slot_range) {
                     BlockRangeState::Mixed | BlockRangeState::Plugged => {
-                        hp_region.update_slot(&self.vm, slot.slot, true)
+                        hp_region.update_slot(&self.vm, &slot, true)
                     }
-                    BlockRangeState::Unplugged => hp_region.update_slot(&self.vm, slot.slot, false),
+                    BlockRangeState::Unplugged => hp_region.update_slot(&self.vm, &slot, false),
                 }
                 .map_err(VirtioMemError::UpdateKvmSlot)
             })

src/vmm/src/vstate/memory.rs

@@ -57,8 +57,6 @@ pub enum MemoryError {
     FileMetadata(std::io::Error),
     /// Memory region is not aligned
     Unaligned,
-    /// Memory slot is invalid: {0}
-    InvalidSlot(u32),
     /// Error protecting memory slot: {0}
     Mprotect(std::io::Error),
 }
@@ -307,19 +305,23 @@ impl GuestRegionMmapExt {
     }
 
     /// (un)plug a slot from an Hotpluggable memory region
-    pub(crate) fn update_slot(&self, vm: &Vm, slot: u32, plug: bool) -> Result<(), VmError> {
+    pub(crate) fn update_slot(
+        &self,
+        vm: &Vm,
+        mem_slot: &GuestMemorySlot<'_>,
+        plug: bool,
+    ) -> Result<(), VmError> {
         // This function can only be called on hotpluggable regions!
         assert!(self.region_type == GuestRegionType::Hotpluggable);
 
-        let mem_slot = self.mem_slot(slot).ok_or(MemoryError::InvalidSlot(slot))?;
         let mut bitmap_guard = self.plugged.lock().unwrap();
-        let prev = bitmap_guard.replace((slot - self.slot_from) as usize, plug);
+        let prev = bitmap_guard.replace((mem_slot.slot - self.slot_from) as usize, plug);
         // do not do anything if the state is what we're trying to set
         if prev == plug {
             return Ok(());
         }
 
-        let mut kvm_region = kvm_userspace_memory_region::from(&mem_slot);
+        let mut kvm_region = kvm_userspace_memory_region::from(mem_slot);
         if plug {
             // make it accessible _before_ adding it to KVM
             mem_slot.protect(false)?;