From 5f66a26b2e62a174ecfa28b6b3d245d745acfbe1 Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Fri, 5 Sep 2025 09:20:14 +0200 Subject: [PATCH] misc: block: 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 --- block/src/lib.rs | 4 +--- block/src/qcow/mod.rs | 1 + block/src/raw_async.rs | 1 + block/src/raw_async_aio.rs | 1 + block/src/raw_sync.rs | 1 + block/src/vhdx/vhdx_header.rs | 2 -- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block/src/lib.rs b/block/src/lib.rs index a6ed32bc6..8871cebd0 100644 --- a/block/src/lib.rs +++ b/block/src/lib.rs @@ -8,9 +8,6 @@ // // SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause -#[macro_use] -extern crate log; - pub mod async_io; pub mod fcntl; pub mod fixed_vhd; @@ -45,6 +42,7 @@ use std::{cmp, result}; #[cfg(feature = "io_uring")] use io_uring::{IoUring, Probe, opcode}; use libc::{S_IFBLK, S_IFMT, ioctl}; +use log::{error, info, warn}; use serde::{Deserialize, Serialize}; use smallvec::SmallVec; use thiserror::Error; diff --git a/block/src/qcow/mod.rs b/block/src/qcow/mod.rs index 0e0c972ab..d713d5693 100644 --- a/block/src/qcow/mod.rs +++ b/block/src/qcow/mod.rs @@ -19,6 +19,7 @@ use std::str; use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; use libc::{EINVAL, EIO, ENOSPC}; +use log::error; use remain::sorted; use thiserror::Error; use vmm_sys_util::file_traits::{FileSetLen, FileSync}; diff --git a/block/src/raw_async.rs b/block/src/raw_async.rs index cd786033e..0018b5029 100644 --- a/block/src/raw_async.rs +++ b/block/src/raw_async.rs @@ -7,6 +7,7 @@ use std::io::{Error, Seek, SeekFrom}; use std::os::unix::io::{AsRawFd, RawFd}; use io_uring::{IoUring, opcode, types}; +use log::warn; use vmm_sys_util::eventfd::EventFd; use crate::async_io::{ diff --git a/block/src/raw_async_aio.rs b/block/src/raw_async_aio.rs index 9a74fa41d..f2f070b43 100644 --- a/block/src/raw_async_aio.rs +++ b/block/src/raw_async_aio.rs @@ -9,6 +9,7 @@ use std::fs::File; use std::io::{Seek, SeekFrom}; use std::os::unix::io::{AsRawFd, RawFd}; +use log::warn; use vmm_sys_util::aio; use vmm_sys_util::eventfd::EventFd; diff --git a/block/src/raw_sync.rs b/block/src/raw_sync.rs index 6b98147e1..b17018f72 100644 --- a/block/src/raw_sync.rs +++ b/block/src/raw_sync.rs @@ -7,6 +7,7 @@ use std::fs::File; use std::io::{Seek, SeekFrom}; use std::os::unix::io::{AsRawFd, RawFd}; +use log::warn; use vmm_sys_util::eventfd::EventFd; use crate::DiskTopology; diff --git a/block/src/vhdx/vhdx_header.rs b/block/src/vhdx/vhdx_header.rs index bed5418d8..73ecbc8f8 100644 --- a/block/src/vhdx/vhdx_header.rs +++ b/block/src/vhdx/vhdx_header.rs @@ -2,8 +2,6 @@ // // SPDX-License-Identifier: Apache-2.0 -extern crate log; - use std::collections::btree_map::BTreeMap; use std::fs::File; use std::io::{self, Read, Seek, SeekFrom, Write};