External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-15 21:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: net: Use consistent nomenclature for control queue

Browse Source 
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-03-14 15:05:59 +00:00
parent b4eddce090
commit 2ed0338da8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virtio-devices/src/net.rs
View File

@ -568,18 +568,18 @@ impl VirtioDevice for Net {
let num_queues = queues.len(); let num_queues = queues.len();
let event_idx = self.common.feature_acked(VIRTIO_RING_F_EVENT_IDX.into()); let event_idx = self.common.feature_acked(VIRTIO_RING_F_EVENT_IDX.into());
if self.common.feature_acked(VIRTIO_NET_F_CTRL_VQ.into()) && num_queues % 2 != 0 { 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 mut ctrl_queue = queues.remove(num_queues - 1);
let cvq_queue_evt = queue_evts.remove(num_queues - 1); let ctrl_queue_evt = queue_evts.remove(num_queues - 1);
cvq_queue.set_event_idx(event_idx); ctrl_queue.set_event_idx(event_idx);
let (kill_evt, pause_evt) = self.common.dup_eventfds(); let (kill_evt, pause_evt) = self.common.dup_eventfds();
let mut ctrl_handler = NetCtrlEpollHandler { let mut ctrl_handler = NetCtrlEpollHandler {
kill_evt, kill_evt,
pause_evt, pause_evt,
ctrl_q: CtrlQueue::new(self.taps.clone()), ctrl_q: CtrlQueue::new(self.taps.clone()),
queue: cvq_queue, queue: ctrl_queue,
queue_evt: cvq_queue_evt, queue_evt: ctrl_queue_evt,
access_platform: self.common.access_platform.clone(), access_platform: self.common.access_platform.clone(),
}; };