From 3be01bd505dbb3cfd6306d69b8c50a5ac76d3912 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Wed, 16 Oct 2019 16:03:46 -0700 Subject: [PATCH] devices: vhost: simplify vhost imports Rather than using `use ::vhost::...` to disambiguate the imports, remove the conflicting `use virtio_sys::vhost` and add `virtio_sys::` to each location that used `vhost::...` previously. The `use ::vhost::...` syntax confuses rustfmt when run directly on these two files, causing it to rewrite the imports into something that doesn't actually compile. BUG=None TEST=rustfmt --check devices/src/virtio/vhost/net.rs TEST=rustfmt --check devices/src/virtio/vhost/vsock.rs Change-Id: I8483f5327a1e2b3ae4887f0b3cef20a917d7410e Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1865370 Reviewed-by: Dylan Reid Reviewed-by: Stephen Barber --- devices/src/virtio/vhost/net.rs | 14 +++++++------- devices/src/virtio/vhost/vsock.rs | 15 +++++++-------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/devices/src/virtio/vhost/net.rs b/devices/src/virtio/vhost/net.rs index 3f66b27c71..dfa90301a0 100644 --- a/devices/src/virtio/vhost/net.rs +++ b/devices/src/virtio/vhost/net.rs @@ -12,9 +12,9 @@ use std::thread; use net_sys; use net_util::{MacAddress, TapT}; -use ::vhost::NetT as VhostNetT; use sys_util::{error, warn, EventFd, GuestMemory}; -use virtio_sys::{vhost, virtio_net}; +use vhost::NetT as VhostNetT; +use virtio_sys::virtio_net; use super::worker::Worker; use super::{Error, Result}; @@ -77,10 +77,10 @@ where | 1 << virtio_net::VIRTIO_NET_F_HOST_TSO4 | 1 << virtio_net::VIRTIO_NET_F_HOST_UFO | 1 << virtio_net::VIRTIO_NET_F_MRG_RXBUF - | 1 << vhost::VIRTIO_RING_F_INDIRECT_DESC - | 1 << vhost::VIRTIO_RING_F_EVENT_IDX - | 1 << vhost::VIRTIO_F_NOTIFY_ON_EMPTY - | 1 << vhost::VIRTIO_F_VERSION_1; + | 1 << virtio_sys::vhost::VIRTIO_RING_F_INDIRECT_DESC + | 1 << virtio_sys::vhost::VIRTIO_RING_F_EVENT_IDX + | 1 << virtio_sys::vhost::VIRTIO_F_NOTIFY_ON_EMPTY + | 1 << virtio_sys::vhost::VIRTIO_F_VERSION_1; Ok(Net { workers_kill_evt: Some(kill_evt.try_clone().map_err(Error::CloneKillEventFd)?), @@ -231,10 +231,10 @@ where #[cfg(test)] pub mod tests { use super::*; - use ::vhost::net::fakes::FakeNet; use net_util::fakes::FakeTap; use std::result; use sys_util::{GuestAddress, GuestMemory, GuestMemoryError}; + use vhost::net::fakes::FakeNet; fn create_guest_memory() -> result::Result { let start_addr1 = GuestAddress(0x0); diff --git a/devices/src/virtio/vhost/vsock.rs b/devices/src/virtio/vhost/vsock.rs index ad10cc1e24..d9bcda7cf1 100644 --- a/devices/src/virtio/vhost/vsock.rs +++ b/devices/src/virtio/vhost/vsock.rs @@ -9,9 +9,8 @@ use std::thread; use data_model::{DataInit, Le64}; -use ::vhost::Vsock as VhostVsockHandle; use sys_util::{error, warn, EventFd, GuestMemory}; -use virtio_sys::vhost; +use vhost::Vsock as VhostVsockHandle; use super::worker::Worker; use super::{Error, Result}; @@ -37,12 +36,12 @@ impl Vsock { let kill_evt = EventFd::new().map_err(Error::CreateKillEventFd)?; let handle = VhostVsockHandle::new(mem).map_err(Error::VhostOpen)?; - let avail_features = 1 << vhost::VIRTIO_F_NOTIFY_ON_EMPTY - | 1 << vhost::VIRTIO_RING_F_INDIRECT_DESC - | 1 << vhost::VIRTIO_RING_F_EVENT_IDX - | 1 << vhost::VHOST_F_LOG_ALL - | 1 << vhost::VIRTIO_F_ANY_LAYOUT - | 1 << vhost::VIRTIO_F_VERSION_1; + let avail_features = 1 << virtio_sys::vhost::VIRTIO_F_NOTIFY_ON_EMPTY + | 1 << virtio_sys::vhost::VIRTIO_RING_F_INDIRECT_DESC + | 1 << virtio_sys::vhost::VIRTIO_RING_F_EVENT_IDX + | 1 << virtio_sys::vhost::VHOST_F_LOG_ALL + | 1 << virtio_sys::vhost::VIRTIO_F_ANY_LAYOUT + | 1 << virtio_sys::vhost::VIRTIO_F_VERSION_1; Ok(Vsock { worker_kill_evt: Some(kill_evt.try_clone().map_err(Error::CloneKillEventFd)?),