vm-device: trim qualified paths

Import the std modules used in the crate instead of spelling the full
paths at every use site.

Signed-off-by: Henry Hrvoje Tonkovac <htonkovac@gmail.com>
Assisted-by: Claude:Opus-4.8
This commit is contained in:
Henry Hrvoje Tonkovac
2026-06-16 12:14:03 +02:00
committed by Rob Bradford
parent 11bacdee46
commit 88baef1449
3 changed files with 8 additions and 6 deletions

View File

@@ -10,7 +10,7 @@
use std::cmp::Ordering; use std::cmp::Ordering;
use std::collections::btree_map::BTreeMap; use std::collections::btree_map::BTreeMap;
use std::sync::{Arc, Barrier, Mutex, RwLock, Weak}; use std::sync::{Arc, Barrier, Mutex, RwLock, Weak};
use std::{convert, io, result}; use std::{convert, io, ptr, result};
use thiserror::Error; use thiserror::Error;
@@ -201,7 +201,7 @@ impl Bus {
for (key, value) in device_list.iter() { for (key, value) in device_list.iter() {
let value = value.upgrade().unwrap(); let value = value.upgrade().unwrap();
if core::ptr::eq(Arc::as_ptr(&value), device) { if ptr::eq(Arc::as_ptr(&value), device) {
remove_key_list.push(*key); remove_key_list.push(*key);
} }
} }

View File

@@ -2,6 +2,8 @@
// //
// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause // SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
use std::io;
/// Trait to trigger DMA mapping updates for devices managed by virtio-iommu /// Trait to trigger DMA mapping updates for devices managed by virtio-iommu
/// ///
/// Trait meant for triggering the DMA mapping update related to an external /// Trait meant for triggering the DMA mapping update related to an external
@@ -10,8 +12,8 @@
/// guest. /// guest.
pub trait ExternalDmaMapping: Send + Sync { pub trait ExternalDmaMapping: Send + Sync {
/// Map a memory range /// Map a memory range
fn map(&self, iova: u64, gpa: u64, size: u64) -> std::result::Result<(), std::io::Error>; fn map(&self, iova: u64, gpa: u64, size: u64) -> io::Result<()>;
/// Unmap a memory range /// Unmap a memory range
fn unmap(&self, iova: u64, size: u64) -> std::result::Result<(), std::io::Error>; fn unmap(&self, iova: u64, size: u64) -> io::Result<()>;
} }

View File

@@ -57,14 +57,14 @@
//! * The virtual device backend requests the interrupt manager to create an interrupt group //! * The virtual device backend requests the interrupt manager to create an interrupt group
//! according to guest configuration information //! according to guest configuration information
use std::io::{Error, ErrorKind}; use std::io::{self, Error, ErrorKind};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
pub use hypervisor::{InterruptSourceConfig, LegacyIrqSourceConfig, MsiIrqSourceConfig}; pub use hypervisor::{InterruptSourceConfig, LegacyIrqSourceConfig, MsiIrqSourceConfig};
use vmm_sys_util::eventfd::EventFd; use vmm_sys_util::eventfd::EventFd;
/// Reuse std::io::Result to simplify interoperability among crates. /// Reuse std::io::Result to simplify interoperability among crates.
pub type Result<T> = std::io::Result<T>; pub type Result<T> = io::Result<T>;
/// Data type to store an interrupt source identifier. /// Data type to store an interrupt source identifier.
pub type InterruptIndex = u32; pub type InterruptIndex = u32;