diff --git a/virtio-devices/src/net.rs b/virtio-devices/src/net.rs index d51475759..b0eb6ba69 100644 --- a/virtio-devices/src/net.rs +++ b/virtio-devices/src/net.rs @@ -7,7 +7,7 @@ use super::net_util::{ build_net_config_space, build_net_config_space_with_mq, virtio_features_to_tap_offload, - CtrlVirtio, NetCtrlEpollHandler, VirtioNetConfig, + NetCtrl, NetCtrlEpollHandler, VirtioNetConfig, }; use super::Error as DeviceError; use super::{ @@ -512,7 +512,7 @@ impl VirtioDevice for Net { mem: mem.clone(), kill_evt, pause_evt, - ctrl_q: CtrlVirtio::new(cvq_queue, cvq_queue_evt), + ctrl_q: NetCtrl::new(cvq_queue, cvq_queue_evt), }; let paused = self.common.paused.clone(); diff --git a/virtio-devices/src/net_util.rs b/virtio-devices/src/net_util.rs index 8df11d455..643f94cc4 100644 --- a/virtio-devices/src/net_util.rs +++ b/virtio-devices/src/net_util.rs @@ -49,14 +49,14 @@ pub enum Error { NoStatusDescriptor, } -pub struct CtrlVirtio { +pub struct NetCtrl { pub queue_evt: EventFd, pub queue: Queue, } -impl std::clone::Clone for CtrlVirtio { +impl std::clone::Clone for NetCtrl { fn clone(&self) -> Self { - CtrlVirtio { + NetCtrl { queue_evt: self.queue_evt.try_clone().unwrap(), queue: self.queue.clone(), } @@ -72,9 +72,9 @@ pub struct ControlHeader { unsafe impl ByteValued for ControlHeader {} -impl CtrlVirtio { +impl NetCtrl { pub fn new(queue: Queue, queue_evt: EventFd) -> Self { - CtrlVirtio { queue_evt, queue } + NetCtrl { queue_evt, queue } } pub fn process_cvq(&mut self, mem: &GuestMemoryMmap) -> Result<()> { @@ -131,7 +131,7 @@ pub struct NetCtrlEpollHandler { pub mem: GuestMemoryAtomic, pub kill_evt: EventFd, pub pause_evt: EventFd, - pub ctrl_q: CtrlVirtio, + pub ctrl_q: NetCtrl, } impl NetCtrlEpollHandler { diff --git a/virtio-devices/src/vhost_user/net.rs b/virtio-devices/src/vhost_user/net.rs index ce743c81e..74f2dea4a 100644 --- a/virtio-devices/src/vhost_user/net.rs +++ b/virtio-devices/src/vhost_user/net.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use super::super::net_util::{ - build_net_config_space, CtrlVirtio, NetCtrlEpollHandler, VirtioNetConfig, + build_net_config_space, NetCtrl, NetCtrlEpollHandler, VirtioNetConfig, }; use super::super::{ ActivateError, ActivateResult, Queue, VirtioCommon, VirtioDevice, VirtioDeviceType, @@ -247,7 +247,7 @@ impl VirtioDevice for Net { mem: mem.clone(), kill_evt, pause_evt, - ctrl_q: CtrlVirtio::new(cvq_queue, cvq_queue_evt), + ctrl_q: NetCtrl::new(cvq_queue, cvq_queue_evt), }; let paused = self.common.paused.clone();