kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

tpm: trim qualified paths

Browse Source 
Import the std modules used in the crate instead of spelling the full
paths at every use site, and drop the now-unnecessary crate-level
#![expect(clippy::absolute_paths)].

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-17 17:43:34 +02:00
committed by Bo Chen
parent 2a121b807e
commit 9c0bceceb1
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tpm/src/emulator.rs
View File

@@ -5,7 +5,7 @@
use std::os::unix::io::RawFd; use std::os::unix::io::RawFd;
use std::path::Path; use std::path::Path;
use std::{mem, ptr}; use std::{io, mem, ptr};
use anyhow::anyhow; use anyhow::anyhow;
use libc::{sockaddr_storage, socklen_t}; use libc::{sockaddr_storage, socklen_t};
@@ -150,7 +150,7 @@ impl Emulator {
if ret == -1 { if ret == -1 {
return Err(Error::PrepareDataFd(anyhow!( return Err(Error::PrepareDataFd(anyhow!(
"Failed to prepare data fd for tpm emulator. Error Code {:?}", "Failed to prepare data fd for tpm emulator. Error Code {:?}",
std::io::Error::last_os_error() io::Error::last_os_error()
))); )));
} }
} }
@@ -164,13 +164,13 @@ impl Emulator {
if libc::close(fds[0]) == -1 { if libc::close(fds[0]) == -1 {
error!( error!(
"Failed to close TPM data fd after CmdSetDatafd failure: {:?}", "Failed to close TPM data fd after CmdSetDatafd failure: {:?}",
std::io::Error::last_os_error() io::Error::last_os_error()
); );
} }
if libc::close(fds[1]) == -1 { if libc::close(fds[1]) == -1 {
error!( error!(
"Failed to close TPM swtpm fd after CmdSetDatafd failure: {:?}", "Failed to close TPM swtpm fd after CmdSetDatafd failure: {:?}",
std::io::Error::last_os_error() io::Error::last_os_error()
); );
} }
} }
@@ -181,7 +181,7 @@ impl Emulator {
if libc::close(fds[1]) == -1 { if libc::close(fds[1]) == -1 {
error!( error!(
"Failed to close local TPM swtpm fd: {:?}", "Failed to close local TPM swtpm fd: {:?}",
std::io::Error::last_os_error() io::Error::last_os_error()
); );
} }
} }
@@ -199,12 +199,12 @@ impl Emulator {
libc::SOL_SOCKET, libc::SOL_SOCKET,
libc::SO_RCVTIMEO, libc::SO_RCVTIMEO,
(&raw const tv).cast(), (&raw const tv).cast(),
std::mem::size_of::<libc::timeval>() as u32, mem::size_of::<libc::timeval>() as u32,
); );
if ret == -1 { if ret == -1 {
return Err(Error::PrepareDataFd(anyhow!( return Err(Error::PrepareDataFd(anyhow!(
"Failed to set receive timeout on data fd socket. Error Code {:?}", "Failed to set receive timeout on data fd socket. Error Code {:?}",
std::io::Error::last_os_error() io::Error::last_os_error()
))); )));
} }
} }
@@ -422,7 +422,7 @@ impl Emulator {
if ret == -1 { if ret == -1 {
return Err(Error::SendReceive(anyhow!( return Err(Error::SendReceive(anyhow!(
"Failed to send tpm command over Data FD. Error Code {:?}", "Failed to send tpm command over Data FD. Error Code {:?}",
std::io::Error::last_os_error() io::Error::last_os_error()
))); )));
} }
} }
@@ -441,7 +441,7 @@ impl Emulator {
if ret == -1 { if ret == -1 {
return Err(Error::SendReceive(anyhow!( return Err(Error::SendReceive(anyhow!(
"Failed to receive response for tpm command over Data FD. Error Code {:?}", "Failed to receive response for tpm command over Data FD. Error Code {:?}",
std::io::Error::last_os_error() io::Error::last_os_error()
))); )));
} }
output_len = ret as usize; output_len = ret as usize;
@@ -554,7 +554,7 @@ impl Drop for Emulator {
if libc::close(self.data_fd) == -1 { if libc::close(self.data_fd) == -1 {
error!( error!(
"Failed to close TPM data fd: {:?}", "Failed to close TPM data fd: {:?}",
std::io::Error::last_os_error() io::Error::last_os_error()
); );
} }
} }

3
tpm/src/lib.rs
View File

@@ -3,9 +3,6 @@
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// //
// TODO: Trim qualified paths in this crate, then drop this expectation.
#![expect(clippy::absolute_paths)]
pub mod emulator; pub mod emulator;
pub mod socket; pub mod socket;