diff options
-rw-r--r-- | devices/Cargo.toml | 1 | ||||
-rw-r--r-- | devices/src/ioapic.rs | 2 | ||||
-rw-r--r-- | devices/src/virtio/vhost/net.rs | 4 | ||||
-rw-r--r-- | devices/src/virtio/vhost/vsock.rs | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/devices/Cargo.toml b/devices/Cargo.toml index cd554c9..62b570e 100644 --- a/devices/Cargo.toml +++ b/devices/Cargo.toml @@ -2,6 +2,7 @@ name = "devices" version = "0.1.0" authors = ["The Chromium OS Authors"] +edition = "2018" [features] gpu = ["gpu_buffer", "gpu_display", "gpu_renderer"] diff --git a/devices/src/ioapic.rs b/devices/src/ioapic.rs index d2afb9c..61829b6 100644 --- a/devices/src/ioapic.rs +++ b/devices/src/ioapic.rs @@ -5,9 +5,9 @@ // Implementation of an intel 82093AA Input/Output Advanced Programmable Interrupt Controller // See https://pdos.csail.mit.edu/6.828/2016/readings/ia32/ioapic.pdf for a specification. +use crate::split_irqchip_common::*; use crate::BusDevice; use bit_field::*; -use split_irqchip_common::*; #[bitfield] #[derive(Clone, Copy, PartialEq)] diff --git a/devices/src/virtio/vhost/net.rs b/devices/src/virtio/vhost/net.rs index 2ecef9d..ba5f56d 100644 --- a/devices/src/virtio/vhost/net.rs +++ b/devices/src/virtio/vhost/net.rs @@ -12,8 +12,8 @@ use std::thread; use net_sys; use net_util::{MacAddress, TapT}; +use ::vhost::NetT as VhostNetT; use sys_util::{EventFd, GuestMemory}; -use vhost::NetT as VhostNetT; use virtio_sys::{vhost, virtio_net}; use super::super::{Queue, VirtioDevice, TYPE_NET}; @@ -220,10 +220,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<GuestMemory, GuestMemoryError> { let start_addr1 = GuestAddress(0x0); diff --git a/devices/src/virtio/vhost/vsock.rs b/devices/src/virtio/vhost/vsock.rs index ff4e575..1ffd078 100644 --- a/devices/src/virtio/vhost/vsock.rs +++ b/devices/src/virtio/vhost/vsock.rs @@ -9,8 +9,8 @@ use std::thread; use byteorder::{ByteOrder, LittleEndian}; +use ::vhost::Vsock as VhostVsockHandle; use sys_util::{EventFd, GuestMemory}; -use vhost::Vsock as VhostVsockHandle; use virtio_sys::vhost; use super::super::{Queue, VirtioDevice, TYPE_VSOCK}; |