From b4eddce090f66eb61dfa6e7df34060071aded30e Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Mon, 14 Mar 2022 15:03:20 +0000 Subject: [PATCH] virtio-devices: net: Use "num_queues" for number of queues This improves consistency with other parts of the code. Signed-off-by: Rob Bradford --- virtio-devices/src/net.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/virtio-devices/src/net.rs b/virtio-devices/src/net.rs index d0f6069e4..010d3c08c 100644 --- a/virtio-devices/src/net.rs +++ b/virtio-devices/src/net.rs @@ -565,11 +565,11 @@ impl VirtioDevice for Net { ) -> ActivateResult { self.common.activate(&queues, &queue_evts, &interrupt_cb)?; - let queue_num = queues.len(); + let num_queues = queues.len(); let event_idx = self.common.feature_acked(VIRTIO_RING_F_EVENT_IDX.into()); - if self.common.feature_acked(VIRTIO_NET_F_CTRL_VQ.into()) && queue_num % 2 != 0 { - let mut cvq_queue = queues.remove(queue_num - 1); - let cvq_queue_evt = queue_evts.remove(queue_num - 1); + if self.common.feature_acked(VIRTIO_NET_F_CTRL_VQ.into()) && num_queues % 2 != 0 { + let mut cvq_queue = queues.remove(num_queues - 1); + let cvq_queue_evt = queue_evts.remove(num_queues - 1); cvq_queue.set_event_idx(event_idx);