mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-12-24 22:55:19 +00:00
virtio-devices: Avoid clashing names in imports
Don't import via glob to avoid (unused) objects colliding in the
namespace. This fixes a beta clippy issue.
Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
(cherry picked from commit 036af673e6
)
This commit is contained in:
parent
beb353eab2
commit
e0b863ecfe
@ -41,19 +41,24 @@ pub mod vhost_user;
|
|||||||
pub mod vsock;
|
pub mod vsock;
|
||||||
pub mod watchdog;
|
pub mod watchdog;
|
||||||
|
|
||||||
pub use self::balloon::*;
|
pub use self::balloon::Balloon;
|
||||||
pub use self::block::*;
|
pub use self::block::{Block, BlockState};
|
||||||
pub use self::console::*;
|
pub use self::console::{Console, ConsoleResizer, Endpoint};
|
||||||
pub use self::device::*;
|
pub use self::device::{
|
||||||
pub use self::epoll_helper::*;
|
DmaRemapping, UserspaceMapping, VirtioCommon, VirtioDevice, VirtioInterrupt,
|
||||||
pub use self::iommu::*;
|
VirtioInterruptType, VirtioSharedMemoryList,
|
||||||
pub use self::mem::*;
|
};
|
||||||
pub use self::net::*;
|
pub use self::epoll_helper::{
|
||||||
pub use self::pmem::*;
|
EpollHelper, EpollHelperError, EpollHelperHandler, EPOLL_HELPER_EVENT_LAST,
|
||||||
pub use self::rng::*;
|
};
|
||||||
pub use self::vdpa::*;
|
pub use self::iommu::{AccessPlatformMapping, Iommu, IommuMapping};
|
||||||
pub use self::vsock::*;
|
pub use self::mem::{BlocksState, Mem, VirtioMemMappingSource, VIRTIO_MEM_ALIGN_SIZE};
|
||||||
pub use self::watchdog::*;
|
pub use self::net::{Net, NetCtrlEpollHandler};
|
||||||
|
pub use self::pmem::Pmem;
|
||||||
|
pub use self::rng::Rng;
|
||||||
|
pub use self::vdpa::{Vdpa, VdpaDmaMapping};
|
||||||
|
pub use self::vsock::Vsock;
|
||||||
|
pub use self::watchdog::Watchdog;
|
||||||
use vm_memory::{bitmap::AtomicBitmap, GuestAddress, GuestMemory};
|
use vm_memory::{bitmap::AtomicBitmap, GuestAddress, GuestMemory};
|
||||||
use vm_virtio::VirtioDeviceType;
|
use vm_virtio::VirtioDeviceType;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user