From 633426a8fc20a5eef402e159d53228aae13bbaa5 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 12 Apr 2019 12:18:35 -0700 Subject: edition: Fill in macro imports Macros were previously imported through `#[macro_use] extern crate`, which is basically a glob import of all macros from the crate. As of 2018 edition of Rust, `extern crate` is no longer required and macros are imported individually like any other item from a dependency. This CL fills in all the appropriate macro imports that will allow us to remove our use of `extern crate` in a subsequent CL. TEST=cargo check --all-features --tests TEST=kokoro Change-Id: If2ec08b06b743abf5f62677c6a9927c3d5d90a54 Reviewed-on: https://chromium-review.googlesource.com/1565546 Commit-Ready: David Tolnay Commit-Ready: ChromeOS CL Exonerator Bot Tested-by: David Tolnay Tested-by: kokoro Reviewed-by: David Tolnay --- devices/src/i8042.rs | 2 +- devices/src/ioapic.rs | 1 + devices/src/pci/ac97.rs | 2 +- devices/src/pci/ac97_bus_master.rs | 4 +++- devices/src/pci/pci_configuration.rs | 1 + devices/src/pic.rs | 1 + devices/src/pit.rs | 2 +- devices/src/pl030.rs | 2 +- devices/src/proxy.rs | 2 +- devices/src/register_space/register.rs | 1 + devices/src/serial.rs | 2 +- devices/src/usb/host_backend/context.rs | 2 +- devices/src/usb/host_backend/host_backend_device_provider.rs | 2 +- devices/src/usb/host_backend/host_device.rs | 1 + devices/src/usb/host_backend/hotplug.rs | 1 + devices/src/usb/host_backend/usb_endpoint.rs | 1 + devices/src/usb/host_backend/utils.rs | 1 + devices/src/usb/log.rs | 2 +- devices/src/usb/xhci/command_ring_controller.rs | 2 +- devices/src/usb/xhci/device_slot.rs | 2 +- devices/src/usb/xhci/intr_resample_handler.rs | 2 +- devices/src/usb/xhci/ring_buffer_controller.rs | 2 +- devices/src/usb/xhci/ring_buffer_stop_cb.rs | 1 + devices/src/usb/xhci/transfer_ring_controller.rs | 2 +- devices/src/usb/xhci/xhci.rs | 2 +- devices/src/usb/xhci/xhci_controller.rs | 2 +- devices/src/usb/xhci/xhci_transfer.rs | 2 +- devices/src/utils/async_job_queue.rs | 2 +- devices/src/utils/event_loop.rs | 2 +- devices/src/virtio/balloon.rs | 3 ++- devices/src/virtio/block.rs | 4 ++-- devices/src/virtio/gpu/backend.rs | 2 +- devices/src/virtio/gpu/mod.rs | 4 +++- devices/src/virtio/input/evdev.rs | 2 +- devices/src/virtio/input/event_source.rs | 1 + devices/src/virtio/input/mod.rs | 2 +- devices/src/virtio/net.rs | 2 +- devices/src/virtio/p9.rs | 4 +++- devices/src/virtio/queue.rs | 2 +- devices/src/virtio/rng.rs | 2 +- devices/src/virtio/tpm.rs | 2 +- devices/src/virtio/vhost/net.rs | 2 +- devices/src/virtio/vhost/vsock.rs | 2 +- devices/src/virtio/virtio_pci_common_config.rs | 2 +- devices/src/virtio/wl.rs | 4 +++- 45 files changed, 55 insertions(+), 36 deletions(-) (limited to 'devices') diff --git a/devices/src/i8042.rs b/devices/src/i8042.rs index 7feae8c..1f8a837 100644 --- a/devices/src/i8042.rs +++ b/devices/src/i8042.rs @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -use sys_util::EventFd; +use sys_util::{error, EventFd}; use crate::BusDevice; diff --git a/devices/src/ioapic.rs b/devices/src/ioapic.rs index 61829b6..d8b3808 100644 --- a/devices/src/ioapic.rs +++ b/devices/src/ioapic.rs @@ -8,6 +8,7 @@ use crate::split_irqchip_common::*; use crate::BusDevice; use bit_field::*; +use sys_util::warn; #[bitfield] #[derive(Clone, Copy, PartialEq)] diff --git a/devices/src/pci/ac97.rs b/devices/src/pci/ac97.rs index 13cb47c..4bbe090 100644 --- a/devices/src/pci/ac97.rs +++ b/devices/src/pci/ac97.rs @@ -6,7 +6,7 @@ use std::os::unix::io::RawFd; use audio_streams::StreamSource; use resources::SystemAllocator; -use sys_util::{EventFd, GuestMemory}; +use sys_util::{error, EventFd, GuestMemory}; use crate::pci::ac97_bus_master::Ac97BusMaster; use crate::pci::ac97_mixer::Ac97Mixer; diff --git a/devices/src/pci/ac97_bus_master.rs b/devices/src/pci/ac97_bus_master.rs index d4b6f73..b1245b9 100644 --- a/devices/src/pci/ac97_bus_master.rs +++ b/devices/src/pci/ac97_bus_master.rs @@ -15,7 +15,9 @@ use std::time::Instant; use audio_streams::{PlaybackBuffer, PlaybackBufferStream, StreamControl, StreamSource}; use data_model::{VolatileMemory, VolatileSlice}; use sync::Mutex; -use sys_util::{self, set_rt_prio_limit, set_rt_round_robin, EventFd, GuestAddress, GuestMemory}; +use sys_util::{ + self, error, set_rt_prio_limit, set_rt_round_robin, warn, EventFd, GuestAddress, GuestMemory, +}; use crate::pci::ac97_mixer::Ac97Mixer; use crate::pci::ac97_regs::*; diff --git a/devices/src/pci/pci_configuration.rs b/devices/src/pci/pci_configuration.rs index f04284a..1cfa6bb 100644 --- a/devices/src/pci/pci_configuration.rs +++ b/devices/src/pci/pci_configuration.rs @@ -5,6 +5,7 @@ use std::fmt::{self, Display}; use crate::pci::PciInterruptPin; +use sys_util::warn; // The number of 32bit registers in the config space, 256 bytes. const NUM_CONFIGURATION_REGISTERS: usize = 64; diff --git a/devices/src/pic.rs b/devices/src/pic.rs index a55a336..7fbd4af 100644 --- a/devices/src/pic.rs +++ b/devices/src/pic.rs @@ -13,6 +13,7 @@ // emotional context, this file refers to them instead as "primary" and "secondary" PITs. use crate::BusDevice; +use sys_util::{debug, warn}; #[repr(usize)] #[derive(Debug, Clone, Copy, PartialEq)] diff --git a/devices/src/pit.rs b/devices/src/pit.rs index 2012b91..0bcf0a6 100644 --- a/devices/src/pit.rs +++ b/devices/src/pit.rs @@ -13,7 +13,7 @@ use std::time::Duration; use bit_field::BitField1; use bit_field::*; use sync::Mutex; -use sys_util::{Error as SysError, EventFd, Fd, PollContext, PollToken}; +use sys_util::{error, warn, Error as SysError, EventFd, Fd, PollContext, PollToken}; #[cfg(not(test))] use sys_util::Clock; diff --git a/devices/src/pl030.rs b/devices/src/pl030.rs index 35fbba4..b5338ac 100644 --- a/devices/src/pl030.rs +++ b/devices/src/pl030.rs @@ -3,7 +3,7 @@ // found in the LICENSE file. use std::time::{SystemTime, UNIX_EPOCH}; -use sys_util::EventFd; +use sys_util::{warn, EventFd}; use crate::BusDevice; diff --git a/devices/src/proxy.rs b/devices/src/proxy.rs index 9880f14..dc64212 100644 --- a/devices/src/proxy.rs +++ b/devices/src/proxy.rs @@ -13,7 +13,7 @@ use std::{self, io}; use io_jail::{self, Minijail}; use libc::pid_t; use msg_socket::{MsgOnSocket, MsgReceiver, MsgSender, MsgSocket}; -use sys_util::net::UnixSeqpacket; +use sys_util::{error, net::UnixSeqpacket}; use crate::BusDevice; diff --git a/devices/src/register_space/register.rs b/devices/src/register_space/register.rs index 4325344..f7d416e 100644 --- a/devices/src/register_space/register.rs +++ b/devices/src/register_space/register.rs @@ -10,6 +10,7 @@ use std::sync::{Arc, MutexGuard}; use sync::Mutex; use data_model::DataInit; +use sys_util::error; /// Type of offset in the register space. pub type RegisterOffset = u64; diff --git a/devices/src/serial.rs b/devices/src/serial.rs index 078c91b..7cb7611 100644 --- a/devices/src/serial.rs +++ b/devices/src/serial.rs @@ -5,7 +5,7 @@ use std::collections::VecDeque; use std::io; -use sys_util::{EventFd, Result}; +use sys_util::{error, EventFd, Result}; use crate::BusDevice; diff --git a/devices/src/usb/host_backend/context.rs b/devices/src/usb/host_backend/context.rs index 4acd752..bf4a13d 100644 --- a/devices/src/usb/host_backend/context.rs +++ b/devices/src/usb/host_backend/context.rs @@ -7,7 +7,7 @@ use crate::utils::{EventHandler, EventLoop}; use std::os::raw::c_short; use std::os::unix::io::RawFd; use std::sync::{Arc, Weak}; -use sys_util::WatchingEvents; +use sys_util::{error, WatchingEvents}; use usb_util::hotplug::UsbHotplugHandler; use usb_util::libusb_context::{LibUsbContext, LibUsbPollfdChangeHandler}; use usb_util::libusb_device::LibUsbDevice; diff --git a/devices/src/usb/host_backend/host_backend_device_provider.rs b/devices/src/usb/host_backend/host_backend_device_provider.rs index de80521..8aca33e 100644 --- a/devices/src/usb/host_backend/host_backend_device_provider.rs +++ b/devices/src/usb/host_backend/host_backend_device_provider.rs @@ -17,7 +17,7 @@ use std::mem; use std::os::unix::io::{AsRawFd, RawFd}; use std::time::Duration; use sys_util::net::UnixSeqpacket; -use sys_util::WatchingEvents; +use sys_util::{error, WatchingEvents}; use vm_control::{UsbControlCommand, UsbControlResult, UsbControlSocket}; const SOCKET_TIMEOUT_MS: u64 = 2000; diff --git a/devices/src/usb/host_backend/host_device.rs b/devices/src/usb/host_backend/host_device.rs index 00cd876..235edbf 100644 --- a/devices/src/usb/host_backend/host_device.rs +++ b/devices/src/usb/host_backend/host_device.rs @@ -15,6 +15,7 @@ use crate::usb::xhci::xhci_transfer::{XhciTransfer, XhciTransferState, XhciTrans use crate::utils::AsyncJobQueue; use crate::utils::FailHandle; use std::collections::HashMap; +use sys_util::{error, warn}; use usb_util::device_handle::DeviceHandle; use usb_util::error::Error as LibUsbError; use usb_util::libusb_device::LibUsbDevice; diff --git a/devices/src/usb/host_backend/hotplug.rs b/devices/src/usb/host_backend/hotplug.rs index ab1c66d..673acce 100644 --- a/devices/src/usb/host_backend/hotplug.rs +++ b/devices/src/usb/host_backend/hotplug.rs @@ -5,6 +5,7 @@ use std::sync::Arc; use crate::usb::xhci::usb_hub::UsbHub; +use sys_util::error; use usb_util::hotplug::{HotplugEvent, UsbHotplugHandler}; use usb_util::libusb_device::LibUsbDevice; diff --git a/devices/src/usb/host_backend/usb_endpoint.rs b/devices/src/usb/host_backend/usb_endpoint.rs index f562110..329d6ff 100644 --- a/devices/src/usb/host_backend/usb_endpoint.rs +++ b/devices/src/usb/host_backend/usb_endpoint.rs @@ -14,6 +14,7 @@ use crate::usb::xhci::xhci_transfer::{ }; use crate::utils::AsyncJobQueue; use crate::utils::FailHandle; +use sys_util::error; use usb_util::device_handle::DeviceHandle; use usb_util::types::{EndpointDirection, EndpointType, ENDPOINT_DIRECTION_OFFSET}; use usb_util::usb_transfer::{ diff --git a/devices/src/usb/host_backend/utils.rs b/devices/src/usb/host_backend/utils.rs index d88a1a5..6ae0388 100644 --- a/devices/src/usb/host_backend/utils.rs +++ b/devices/src/usb/host_backend/utils.rs @@ -10,6 +10,7 @@ use super::error::*; use crate::usb::xhci::xhci_transfer::{XhciTransfer, XhciTransferState}; use crate::utils::AsyncJobQueue; use crate::utils::FailHandle; +use sys_util::{error, warn}; use usb_util::device_handle::DeviceHandle; use usb_util::usb_transfer::{TransferStatus, UsbTransfer, UsbTransferBuffer}; diff --git a/devices/src/usb/log.rs b/devices/src/usb/log.rs index b8fea64..4cb906b 100644 --- a/devices/src/usb/log.rs +++ b/devices/src/usb/log.rs @@ -8,7 +8,7 @@ macro_rules! usb_debug { ($($args:tt)+) => { // Set true to enable logging. if false { - debug!($($args)*); + sys_util::debug!($($args)*); } }; } diff --git a/devices/src/usb/xhci/command_ring_controller.rs b/devices/src/usb/xhci/command_ring_controller.rs index ea34ca0..c8c059f 100644 --- a/devices/src/usb/xhci/command_ring_controller.rs +++ b/devices/src/usb/xhci/command_ring_controller.rs @@ -18,7 +18,7 @@ use crate::utils::EventLoop; use std::fmt::{self, Display}; use std::sync::Arc; use sync::Mutex; -use sys_util::{Error as SysError, EventFd, GuestAddress, GuestMemory}; +use sys_util::{error, warn, Error as SysError, EventFd, GuestAddress, GuestMemory}; #[derive(Debug)] pub enum Error { diff --git a/devices/src/usb/xhci/device_slot.rs b/devices/src/usb/xhci/device_slot.rs index b9bb1ac..129c849 100644 --- a/devices/src/usb/xhci/device_slot.rs +++ b/devices/src/usb/xhci/device_slot.rs @@ -19,7 +19,7 @@ use std::mem::size_of; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; use sync::Mutex; -use sys_util::{GuestAddress, GuestMemory, GuestMemoryError}; +use sys_util::{error, GuestAddress, GuestMemory, GuestMemoryError}; #[derive(Debug)] pub enum Error { diff --git a/devices/src/usb/xhci/intr_resample_handler.rs b/devices/src/usb/xhci/intr_resample_handler.rs index 1eb11a6..91dd46a 100644 --- a/devices/src/usb/xhci/intr_resample_handler.rs +++ b/devices/src/usb/xhci/intr_resample_handler.rs @@ -6,7 +6,7 @@ use super::interrupter::Interrupter; use crate::utils::{EventHandler, EventLoop}; use std::sync::Arc; use sync::Mutex; -use sys_util::{EventFd, WatchingEvents}; +use sys_util::{error, EventFd, WatchingEvents}; /// Interrupt Resample handler handles resample event. It will reassert interrupt if needed. pub struct IntrResampleHandler { diff --git a/devices/src/usb/xhci/ring_buffer_controller.rs b/devices/src/usb/xhci/ring_buffer_controller.rs index f375178..5084fab 100644 --- a/devices/src/usb/xhci/ring_buffer_controller.rs +++ b/devices/src/usb/xhci/ring_buffer_controller.rs @@ -9,7 +9,7 @@ use std::fmt::{self, Display}; use std::sync::{Arc, MutexGuard}; use sync::Mutex; -use sys_util::{Error as SysError, EventFd, GuestAddress, GuestMemory, WatchingEvents}; +use sys_util::{error, Error as SysError, EventFd, GuestAddress, GuestMemory, WatchingEvents}; use super::ring_buffer::RingBuffer; diff --git a/devices/src/usb/xhci/ring_buffer_stop_cb.rs b/devices/src/usb/xhci/ring_buffer_stop_cb.rs index b1cb6e8..3eca928 100644 --- a/devices/src/usb/xhci/ring_buffer_stop_cb.rs +++ b/devices/src/usb/xhci/ring_buffer_stop_cb.rs @@ -4,6 +4,7 @@ use crate::utils::FailHandle; use std::sync::{Arc, Mutex}; +use sys_util::error; /// RingBufferStopCallback wraps a callback. The callback will be invoked when last instance of /// RingBufferStopCallback and its clones is dropped. diff --git a/devices/src/usb/xhci/transfer_ring_controller.rs b/devices/src/usb/xhci/transfer_ring_controller.rs index dec2108..5bf6024 100644 --- a/devices/src/usb/xhci/transfer_ring_controller.rs +++ b/devices/src/usb/xhci/transfer_ring_controller.rs @@ -8,7 +8,7 @@ use crate::usb::xhci::ring_buffer_controller::{ use crate::utils::EventLoop; use std::sync::Arc; use sync::Mutex; -use sys_util::{EventFd, GuestMemory}; +use sys_util::{error, EventFd, GuestMemory}; use super::interrupter::Interrupter; use super::usb_hub::UsbPort; diff --git a/devices/src/usb/xhci/xhci.rs b/devices/src/usb/xhci/xhci.rs index 0b66197..df57e68 100644 --- a/devices/src/usb/xhci/xhci.rs +++ b/devices/src/usb/xhci/xhci.rs @@ -15,7 +15,7 @@ use crate::utils::{Error as UtilsError, EventLoop, FailHandle}; use std::fmt::{self, Display}; use std::sync::Arc; use sync::Mutex; -use sys_util::{EventFd, GuestAddress, GuestMemory}; +use sys_util::{error, EventFd, GuestAddress, GuestMemory}; #[derive(Debug)] pub enum Error { diff --git a/devices/src/usb/xhci/xhci_controller.rs b/devices/src/usb/xhci/xhci_controller.rs index 66834b8..3f2db74 100644 --- a/devices/src/usb/xhci/xhci_controller.rs +++ b/devices/src/usb/xhci/xhci_controller.rs @@ -17,7 +17,7 @@ use std::mem; use std::os::unix::io::RawFd; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; -use sys_util::{EventFd, GuestMemory}; +use sys_util::{error, EventFd, GuestMemory}; const XHCI_BAR0_SIZE: u64 = 0x10000; diff --git a/devices/src/usb/xhci/xhci_transfer.rs b/devices/src/usb/xhci/xhci_transfer.rs index 421c5b1..2973aa7 100644 --- a/devices/src/usb/xhci/xhci_transfer.rs +++ b/devices/src/usb/xhci/xhci_transfer.rs @@ -15,7 +15,7 @@ use std::fmt::{self, Display}; use std::mem; use std::sync::{Arc, Weak}; use sync::Mutex; -use sys_util::{Error as SysError, EventFd, GuestMemory}; +use sys_util::{error, Error as SysError, EventFd, GuestMemory}; use usb_util::types::UsbRequestSetup; use usb_util::usb_transfer::TransferStatus; diff --git a/devices/src/utils/async_job_queue.rs b/devices/src/utils/async_job_queue.rs index 103d705..76ae8c7 100644 --- a/devices/src/utils/async_job_queue.rs +++ b/devices/src/utils/async_job_queue.rs @@ -7,7 +7,7 @@ use super::{EventHandler, EventLoop}; use std::mem; use std::sync::Arc; use sync::Mutex; -use sys_util::{EventFd, WatchingEvents}; +use sys_util::{error, EventFd, WatchingEvents}; /// Async Job Queue can schedule async jobs. pub struct AsyncJobQueue { diff --git a/devices/src/utils/event_loop.rs b/devices/src/utils/event_loop.rs index 34aec61..d91aec9 100644 --- a/devices/src/utils/event_loop.rs +++ b/devices/src/utils/event_loop.rs @@ -9,7 +9,7 @@ use std::os::unix::io::{AsRawFd, RawFd}; use std::sync::{Arc, Weak}; use std::thread; use sync::Mutex; -use sys_util::{EpollContext, EpollEvents, EventFd, PollToken, WatchingEvents}; +use sys_util::{error, warn, EpollContext, EpollEvents, EventFd, PollToken, WatchingEvents}; /// A fail handle will do the clean up when we cannot recover from some error. pub trait FailHandle: Send + Sync { diff --git a/devices/src/virtio/balloon.rs b/devices/src/virtio/balloon.rs index e9f36f6..baff7ab 100644 --- a/devices/src/virtio/balloon.rs +++ b/devices/src/virtio/balloon.rs @@ -14,7 +14,8 @@ use std::thread; use byteorder::{ByteOrder, LittleEndian, ReadBytesExt, WriteBytesExt}; use sys_util::{ - self, net::UnixSeqpacket, EventFd, GuestAddress, GuestMemory, PollContext, PollToken, + self, error, info, net::UnixSeqpacket, warn, EventFd, GuestAddress, GuestMemory, PollContext, + PollToken, }; use super::{ diff --git a/devices/src/virtio/block.rs b/devices/src/virtio/block.rs index 023e1df..0a22e32 100644 --- a/devices/src/virtio/block.rs +++ b/devices/src/virtio/block.rs @@ -18,8 +18,8 @@ use sync::Mutex; use sys_util::Error as SysError; use sys_util::Result as SysResult; use sys_util::{ - EventFd, FileSetLen, FileSync, GuestAddress, GuestMemory, GuestMemoryError, PollContext, - PollToken, PunchHole, TimerFd, WriteZeroes, + error, info, warn, EventFd, FileSetLen, FileSync, GuestAddress, GuestMemory, GuestMemoryError, + PollContext, PollToken, PunchHole, TimerFd, WriteZeroes, }; use data_model::{DataInit, Le16, Le32, Le64}; diff --git a/devices/src/virtio/gpu/backend.rs b/devices/src/virtio/gpu/backend.rs index b0289ae..93e3ce6 100644 --- a/devices/src/virtio/gpu/backend.rs +++ b/devices/src/virtio/gpu/backend.rs @@ -14,7 +14,7 @@ use std::usize; use data_model::*; use msg_socket::{MsgReceiver, MsgSender}; -use sys_util::{GuestAddress, GuestMemory}; +use sys_util::{error, GuestAddress, GuestMemory}; use gpu_buffer::{Buffer, Device, Flags, Format}; use gpu_display::*; diff --git a/devices/src/virtio/gpu/mod.rs b/devices/src/virtio/gpu/mod.rs index 1cf6e6b..a91b5b9 100644 --- a/devices/src/virtio/gpu/mod.rs +++ b/devices/src/virtio/gpu/mod.rs @@ -23,7 +23,9 @@ use std::time::Duration; use data_model::*; -use sys_util::{Error, EventFd, GuestAddress, GuestMemory, PollContext, PollToken}; +use sys_util::{ + debug, error, warn, Error, EventFd, GuestAddress, GuestMemory, PollContext, PollToken, +}; use gpu_buffer::Device; use gpu_display::*; diff --git a/devices/src/virtio/input/evdev.rs b/devices/src/virtio/input/evdev.rs index 34fedb9..6301dfa 100644 --- a/devices/src/virtio/input/evdev.rs +++ b/devices/src/virtio/input/evdev.rs @@ -5,7 +5,7 @@ use std::os::unix::io::AsRawFd; use data_model::Le32; -use sys_util::{ioctl_with_mut_ref, ioctl_with_ptr, ioctl_with_ref}; +use sys_util::{ioctl_ior_nr, ioctl_iow_nr, ioctl_with_mut_ref, ioctl_with_ptr, ioctl_with_ref}; use super::constants::*; use super::virtio_input_absinfo; diff --git a/devices/src/virtio/input/event_source.rs b/devices/src/virtio/input/event_source.rs index 48ed192..56bb54a 100644 --- a/devices/src/virtio/input/event_source.rs +++ b/devices/src/virtio/input/event_source.rs @@ -13,6 +13,7 @@ use std::io::Read; use std::io::Write; use std::mem::size_of; use std::os::unix::io::{AsRawFd, RawFd}; +use sys_util::{error, warn}; #[derive(Copy, Clone, Debug, Default)] #[repr(C)] diff --git a/devices/src/virtio/input/mod.rs b/devices/src/virtio/input/mod.rs index 98dac60..b44ca86 100644 --- a/devices/src/virtio/input/mod.rs +++ b/devices/src/virtio/input/mod.rs @@ -13,7 +13,7 @@ use self::constants::*; use std::os::unix::io::{AsRawFd, RawFd}; use data_model::{DataInit, Le16, Le32}; -use sys_util::{EventFd, GuestMemory, PollContext, PollToken}; +use sys_util::{error, warn, EventFd, GuestMemory, PollContext, PollToken}; use self::event_source::{input_event, EvdevEventSource, EventSource, SocketEventSource}; use super::{Queue, VirtioDevice, INTERRUPT_STATUS_USED_RING, TYPE_INPUT}; diff --git a/devices/src/virtio/net.rs b/devices/src/virtio/net.rs index ab37cf0..a492561 100644 --- a/devices/src/virtio/net.rs +++ b/devices/src/virtio/net.rs @@ -15,7 +15,7 @@ use libc::EAGAIN; use net_sys; use net_util::{Error as TapError, MacAddress, TapT}; use sys_util::Error as SysError; -use sys_util::{EventFd, GuestMemory, PollContext, PollToken}; +use sys_util::{error, warn, EventFd, GuestMemory, PollContext, PollToken}; use virtio_sys::virtio_net::virtio_net_hdr_v1; use virtio_sys::{vhost, virtio_net}; diff --git a/devices/src/virtio/p9.rs b/devices/src/virtio/p9.rs index 636a1dc..6bfa41c 100644 --- a/devices/src/virtio/p9.rs +++ b/devices/src/virtio/p9.rs @@ -15,7 +15,9 @@ use std::sync::Arc; use std::thread; use p9; -use sys_util::{Error as SysError, EventFd, GuestAddress, GuestMemory, PollContext, PollToken}; +use sys_util::{ + error, warn, Error as SysError, EventFd, GuestAddress, GuestMemory, PollContext, PollToken, +}; use virtio_sys::vhost::VIRTIO_F_VERSION_1; use super::{DescriptorChain, Queue, VirtioDevice, INTERRUPT_STATUS_USED_RING, TYPE_9P}; diff --git a/devices/src/virtio/queue.rs b/devices/src/virtio/queue.rs index 0f596ba..7d00b34 100644 --- a/devices/src/virtio/queue.rs +++ b/devices/src/virtio/queue.rs @@ -6,7 +6,7 @@ use std::cmp::min; use std::num::Wrapping; use std::sync::atomic::{fence, Ordering}; -use sys_util::{GuestAddress, GuestMemory}; +use sys_util::{error, GuestAddress, GuestMemory}; const VIRTQ_DESC_F_NEXT: u16 = 0x1; const VIRTQ_DESC_F_WRITE: u16 = 0x2; diff --git a/devices/src/virtio/rng.rs b/devices/src/virtio/rng.rs index 7b3d9f7..b8e49f7 100644 --- a/devices/src/virtio/rng.rs +++ b/devices/src/virtio/rng.rs @@ -11,7 +11,7 @@ use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; use std::thread; -use sys_util::{EventFd, GuestMemory, PollContext, PollToken}; +use sys_util::{error, EventFd, GuestMemory, PollContext, PollToken}; use super::{Queue, VirtioDevice, INTERRUPT_STATUS_USED_RING, TYPE_RNG}; diff --git a/devices/src/virtio/tpm.rs b/devices/src/virtio/tpm.rs index 63e4d72..eea71c2 100644 --- a/devices/src/virtio/tpm.rs +++ b/devices/src/virtio/tpm.rs @@ -12,7 +12,7 @@ use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; use std::thread; -use sys_util::{EventFd, GuestMemory, GuestMemoryError, PollContext, PollToken}; +use sys_util::{error, EventFd, GuestMemory, GuestMemoryError, PollContext, PollToken}; use tpm2; use super::{DescriptorChain, Queue, VirtioDevice, INTERRUPT_STATUS_USED_RING, TYPE_TPM}; diff --git a/devices/src/virtio/vhost/net.rs b/devices/src/virtio/vhost/net.rs index 15907f2..d2e7e55 100644 --- a/devices/src/virtio/vhost/net.rs +++ b/devices/src/virtio/vhost/net.rs @@ -13,7 +13,7 @@ use net_sys; use net_util::{MacAddress, TapT}; use ::vhost::NetT as VhostNetT; -use sys_util::{EventFd, GuestMemory}; +use sys_util::{error, warn, EventFd, GuestMemory}; use virtio_sys::{vhost, virtio_net}; use super::worker::Worker; diff --git a/devices/src/virtio/vhost/vsock.rs b/devices/src/virtio/vhost/vsock.rs index 008d920..7f4c457 100644 --- a/devices/src/virtio/vhost/vsock.rs +++ b/devices/src/virtio/vhost/vsock.rs @@ -10,7 +10,7 @@ use std::thread; use byteorder::{ByteOrder, LittleEndian}; use ::vhost::Vsock as VhostVsockHandle; -use sys_util::{EventFd, GuestMemory}; +use sys_util::{error, warn, EventFd, GuestMemory}; use virtio_sys::vhost; use super::worker::Worker; diff --git a/devices/src/virtio/virtio_pci_common_config.rs b/devices/src/virtio/virtio_pci_common_config.rs index 59b2b0a..2fef26e 100644 --- a/devices/src/virtio/virtio_pci_common_config.rs +++ b/devices/src/virtio/virtio_pci_common_config.rs @@ -3,7 +3,7 @@ // found in the LICENSE file. use byteorder::{ByteOrder, LittleEndian}; -use sys_util::GuestAddress; +use sys_util::{warn, GuestAddress}; use super::*; diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs index 4a6d59d..2352998 100644 --- a/devices/src/virtio/wl.rs +++ b/devices/src/virtio/wl.rs @@ -59,8 +59,10 @@ use data_model::*; use msg_socket::{MsgError, MsgReceiver, MsgSender}; #[cfg(feature = "wl-dmabuf")] use resources::GpuMemoryDesc; +#[cfg(feature = "wl-dmabuf")] +use sys_util::ioctl_iow_nr; use sys_util::{ - pipe, round_up_to_page_size, Error, EventFd, FileFlags, GuestAddress, GuestMemory, + error, pipe, round_up_to_page_size, warn, Error, EventFd, FileFlags, GuestAddress, GuestMemory, GuestMemoryError, PollContext, PollToken, Result, ScmSocket, SharedMemory, }; -- cgit 1.4.1