refactor(queue): remove mem from pop_or_enable_notification method

`mem` parameter was not used for anything.

Signed-off-by: Egor Lazarchuk <[email protected]>

Author: ShadowCurse

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

@@ -411,7 +411,7 @@ impl VirtioBlock {
         let queue = &mut self.queues[queue_index];
         let mut used_any = false;
 
-        while let Some(head) = queue.pop_or_enable_notification(mem) {
+        while let Some(head) = queue.pop_or_enable_notification() {
             self.metrics.remaining_reqs_count.add(queue.len().into());
             let processing_result = match Request::parse(&head, mem, self.disk.nsectors) {
                 Ok(request) => {

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

@@ -389,7 +389,7 @@ impl Net {
         let mem = self.device_state.mem().unwrap();
 
         let queue = &mut self.queues[RX_INDEX];
-        let head_descriptor = queue.pop_or_enable_notification(mem).ok_or_else(|| {
+        let head_descriptor = queue.pop_or_enable_notification().ok_or_else(|| {
             self.metrics.no_rx_avail_buffer.inc();
             FrontendError::EmptyQueue
         })?;
@@ -594,7 +594,7 @@ impl Net {
         let mut used_any = false;
         let tx_queue = &mut self.queues[TX_INDEX];
 
-        while let Some(head) = tx_queue.pop_or_enable_notification(mem) {
+        while let Some(head) = tx_queue.pop_or_enable_notification() {
             self.metrics
                 .tx_remaining_reqs_count
                 .add(tx_queue.len().into());

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

@@ -527,10 +527,7 @@ impl Queue {
 
     /// Try to pop the first available descriptor chain from the avail ring.
     /// If no descriptor is available, enable notifications.
-    pub fn pop_or_enable_notification<M: GuestMemory>(
-        &mut self,
-        _mem: &M,
-    ) -> Option<DescriptorChain> {
+    pub fn pop_or_enable_notification(&mut self) -> Option<DescriptorChain> {
         if !self.uses_notif_suppression {
             return self.pop();
         }
@@ -1363,7 +1360,7 @@ mod tests {
 
         // Walk the last chain again (three descriptors) using pop_or_enable_notification().
         let d = q
-            .pop_or_enable_notification(m)
+            .pop_or_enable_notification()
             .unwrap()
             .next_descriptor()
             .unwrap()
@@ -1375,13 +1372,13 @@ mod tests {
         // There are no more descriptors, but notification suppression is disabled.
         // Calling pop_or_enable_notification() should simply return None.
         assert_eq!(q.avail_event(m), 0);
-        assert!(q.pop_or_enable_notification(m).is_none());
+        assert!(q.pop_or_enable_notification().is_none());
         assert_eq!(q.avail_event(m), 0);
 
         // There are no more descriptors and notification suppression is enabled. Calling
         // pop_or_enable_notification() should enable notifications.
         q.enable_notif_suppression();
-        assert!(q.pop_or_enable_notification(m).is_none());
+        assert!(q.pop_or_enable_notification().is_none());
         assert_eq!(q.avail_event(m), 2);
     }
 
@@ -1458,7 +1455,7 @@ mod tests {
         // driver sets available index to suspicious value.
         vq.avail.idx.set(6);
 
-        q.pop_or_enable_notification(m);
+        q.pop_or_enable_notification();
     }
 
     #[test]