From 6f4b5253b4b3234d37b33c64f2dcc13ed8365c55 Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Fri, 5 Sep 2025 09:20:46 +0200 Subject: [PATCH] misc: pci: drop `extern crate`, use modern rust This commit is part of a series of similar commits. Signed-off-by: Philipp Schuster On-behalf-of: SAP philipp.schuster@sap.com --- pci/src/bus.rs | 1 + pci/src/configuration.rs | 1 + pci/src/lib.rs | 2 -- pci/src/msi.rs | 1 + pci/src/msix.rs | 1 + pci/src/vfio.rs | 1 + pci/src/vfio_user.rs | 1 + 7 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pci/src/bus.rs b/pci/src/bus.rs index fd19321de..3ba2c056b 100644 --- a/pci/src/bus.rs +++ b/pci/src/bus.rs @@ -10,6 +10,7 @@ use std::ops::DerefMut; use std::sync::{Arc, Barrier, Mutex}; use byteorder::{ByteOrder, LittleEndian}; +use log::error; use thiserror::Error; use vm_device::{Bus, BusDevice, BusDeviceSync}; diff --git a/pci/src/configuration.rs b/pci/src/configuration.rs index 0e45b1c4c..b97c46c0b 100644 --- a/pci/src/configuration.rs +++ b/pci/src/configuration.rs @@ -7,6 +7,7 @@ use std::sync::{Arc, Mutex}; use byteorder::{ByteOrder, LittleEndian}; +use log::{info, warn}; use serde::{Deserialize, Serialize}; use thiserror::Error; use vm_device::PciBarType; diff --git a/pci/src/lib.rs b/pci/src/lib.rs index 8c1532491..5ab87cf19 100644 --- a/pci/src/lib.rs +++ b/pci/src/lib.rs @@ -5,8 +5,6 @@ // SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause //! Implements pci devices and busses. -#[macro_use] -extern crate log; mod bus; mod configuration; diff --git a/pci/src/msi.rs b/pci/src/msi.rs index e0d07cec2..ace134752 100644 --- a/pci/src/msi.rs +++ b/pci/src/msi.rs @@ -7,6 +7,7 @@ use std::io; use std::sync::Arc; use byteorder::{ByteOrder, LittleEndian}; +use log::error; use serde::{Deserialize, Serialize}; use thiserror::Error; use vm_device::interrupt::{ diff --git a/pci/src/msix.rs b/pci/src/msix.rs index efd0e7b67..9bc5e63f3 100644 --- a/pci/src/msix.rs +++ b/pci/src/msix.rs @@ -7,6 +7,7 @@ use std::sync::Arc; use std::{io, result}; use byteorder::{ByteOrder, LittleEndian}; +use log::{debug, error}; use serde::{Deserialize, Serialize}; use thiserror::Error; use vm_device::interrupt::{ diff --git a/pci/src/vfio.rs b/pci/src/vfio.rs index 23efa8c3d..87adf08d8 100644 --- a/pci/src/vfio.rs +++ b/pci/src/vfio.rs @@ -15,6 +15,7 @@ use anyhow::anyhow; use byteorder::{ByteOrder, LittleEndian}; use hypervisor::HypervisorVmError; use libc::{_SC_PAGESIZE, sysconf}; +use log::{error, info}; use serde::{Deserialize, Serialize}; use thiserror::Error; use vfio_bindings::bindings::vfio::*; diff --git a/pci/src/vfio_user.rs b/pci/src/vfio_user.rs index 3ce9ebdb0..5aa2266ca 100644 --- a/pci/src/vfio_user.rs +++ b/pci/src/vfio_user.rs @@ -9,6 +9,7 @@ use std::os::unix::prelude::AsRawFd; use std::sync::{Arc, Barrier, Mutex}; use hypervisor::HypervisorVmError; +use log::{error, info}; use thiserror::Error; use vfio_bindings::bindings::vfio::*; use vfio_ioctls::VfioIrq;