refactor: eliminate Queue::mark_memory_dirty

Just call initialize() again. It does some needless alignment checking,
but that's not really harmful.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

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

@@ -182,9 +182,9 @@ pub trait VirtioDevice: AsAny + Send {
     }
 
     /// Mark pages used by queues as dirty.
-    fn mark_queue_memory_dirty(&self, mem: &GuestMemoryMmap) -> Result<(), QueueError> {
-        for queue in self.queues() {
-            queue.mark_memory_dirty(mem)?
+    fn mark_queue_memory_dirty(&mut self, mem: &GuestMemoryMmap) -> Result<(), QueueError> {
+        for queue in self.queues_mut() {
+            queue.initialize(mem)?
         }
         Ok(())
     }

src/vmm/src/devices/virtio/queue.rs

@@ -369,14 +369,6 @@ impl Queue {
         Ok(())
     }
 
-    /// Mark memory used for queue objects as dirty.
-    pub fn mark_memory_dirty<M: GuestMemory>(&self, mem: &M) -> Result<(), QueueError> {
-        _ = self.get_slice_ptr(mem, self.desc_table_address, self.desc_table_size())?;
-        _ = self.get_slice_ptr(mem, self.avail_ring_address, self.avail_ring_size())?;
-        _ = self.get_slice_ptr(mem, self.used_ring_address, self.used_ring_size())?;
-        Ok(())
-    }
-
     /// Get AvailRing.idx
     #[inline(always)]
     pub fn avail_ring_idx_get(&self) -> u16 {

src/vmm/src/persist.rs

@@ -173,7 +173,7 @@ pub fn create_snapshot(
     // and the address validation was already performed on device activation.
     vmm.mmio_device_manager
         .for_each_virtio_device(|_, _, _, dev| {
-            let d = dev.lock().unwrap();
+            let mut d = dev.lock().unwrap();
             if d.is_activated() {
                 d.mark_queue_memory_dirty(vmm.vm.guest_memory())
             } else {