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

arch: trim qualified paths in tdx

Browse Source 
Import std::io and std::mem instead of spelling the full paths at every
use site.

Signed-off-by: Henry Hrvoje Tonkovac <htonkovac@gmail.com>
Assisted-by: Claude:Opus-4.7
This commit is contained in:
Henry Hrvoje Tonkovac
2026-05-23 18:45:39 +00:00
committed by Rob Bradford
parent 003e878344
commit b415fbf5ac
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/src/x86_64/tdx/mod.rs
+17 -16
View File
@@ -2,7 +2,8 @@
// //
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
use std::fs::File; use std::fs::File;
use std::io::{Read, Seek, SeekFrom}; use std::io::{self, Read, Seek, SeekFrom};
use std::mem;
use std::str::FromStr; use std::str::FromStr;
use log::{debug, info}; use log::{debug, info};
@@ -15,11 +16,11 @@ use crate::GuestMemoryMmap;
#[derive(Error, Debug)] #[derive(Error, Debug)]
pub enum TdvfError { pub enum TdvfError {
#[error("Failed read TDVF descriptor")] #[error("Failed read TDVF descriptor")]
ReadDescriptor(#[source] std::io::Error), ReadDescriptor(#[source] io::Error),
#[error("Failed read TDVF descriptor offset")] #[error("Failed read TDVF descriptor offset")]
ReadDescriptorOffset(#[source] std::io::Error), ReadDescriptorOffset(#[source] io::Error),
#[error("Failed read GUID table")] #[error("Failed read GUID table")]
ReadGuidTable(#[source] std::io::Error), ReadGuidTable(#[source] io::Error),
#[error("Invalid descriptor signature")] #[error("Invalid descriptor signature")]
InvalidDescriptorSignature, InvalidDescriptorSignature,
#[error("Invalid descriptor size")] #[error("Invalid descriptor size")]
@@ -164,7 +165,7 @@ pub fn parse_tdvf_sections(file: &mut File) -> Result<(Vec<TdvfSection>, bool),
file.read_exact(unsafe { file.read_exact(unsafe {
std::slice::from_raw_parts_mut( std::slice::from_raw_parts_mut(
(&raw mut descriptor).cast(), (&raw mut descriptor).cast(),
std::mem::size_of::<TdvfDescriptor>(), mem::size_of::<TdvfDescriptor>(),
) )
}) })
.map_err(TdvfError::ReadDescriptor)?; .map_err(TdvfError::ReadDescriptor)?;
@@ -174,8 +175,8 @@ pub fn parse_tdvf_sections(file: &mut File) -> Result<(Vec<TdvfSection>, bool),
} }
if descriptor.length as usize if descriptor.length as usize
!= std::mem::size_of::<TdvfDescriptor>() != mem::size_of::<TdvfDescriptor>()
+ std::mem::size_of::<TdvfSection>() * descriptor.num_sections as usize + mem::size_of::<TdvfSection>() * descriptor.num_sections as usize
{ {
return Err(TdvfError::InvalidDescriptorSize); return Err(TdvfError::InvalidDescriptorSize);
} }
@@ -191,7 +192,7 @@ pub fn parse_tdvf_sections(file: &mut File) -> Result<(Vec<TdvfSection>, bool),
file.read_exact(unsafe { file.read_exact(unsafe {
std::slice::from_raw_parts_mut( std::slice::from_raw_parts_mut(
sections.as_mut_ptr().cast(), sections.as_mut_ptr().cast(),
descriptor.num_sections as usize * std::mem::size_of::<TdvfSection>(), descriptor.num_sections as usize * mem::size_of::<TdvfSection>(),
) )
}) })
.map_err(TdvfError::ReadDescriptor)?; .map_err(TdvfError::ReadDescriptor)?;
@@ -305,7 +306,7 @@ fn align_hob(v: u64) -> u64 {
impl TdHob { impl TdHob {
fn update_offset<T>(&mut self) { fn update_offset<T>(&mut self) {
self.current_offset = align_hob(self.current_offset + std::mem::size_of::<T>() as u64); self.current_offset = align_hob(self.current_offset + mem::size_of::<T>() as u64);
} }
pub fn start(offset: u64) -> TdHob { pub fn start(offset: u64) -> TdHob {
@@ -322,7 +323,7 @@ impl TdHob {
// Write end // Write end
let end = HobHeader { let end = HobHeader {
r#type: HobType::EndOfHobList, r#type: HobType::EndOfHobList,
length: std::mem::size_of::<HobHeader>() as u16, length: mem::size_of::<HobHeader>() as u16,
reserved: 0, reserved: 0,
}; };
info!("Writing HOB end {:x} {:x?}", self.current_offset, end); info!("Writing HOB end {:x} {:x?}", self.current_offset, end);
@@ -335,7 +336,7 @@ impl TdHob {
let handoff = HobHandoffInfoTable { let handoff = HobHandoffInfoTable {
header: HobHeader { header: HobHeader {
r#type: HobType::Handoff, r#type: HobType::Handoff,
length: std::mem::size_of::<HobHandoffInfoTable>() as u16, length: mem::size_of::<HobHandoffInfoTable>() as u16,
reserved: 0, reserved: 0,
}, },
version: 0x9, version: 0x9,
@@ -362,7 +363,7 @@ impl TdHob {
let resource_descriptor = HobResourceDescriptor { let resource_descriptor = HobResourceDescriptor {
header: HobHeader { header: HobHeader {
r#type: HobType::ResourceDescriptor, r#type: HobType::ResourceDescriptor,
length: std::mem::size_of::<HobResourceDescriptor>() as u16, length: mem::size_of::<HobResourceDescriptor>() as u16,
reserved: 0, reserved: 0,
}, },
owner: EfiGuid::default(), owner: EfiGuid::default(),
@@ -439,8 +440,8 @@ impl TdHob {
// We already know the HobGuidType size is 8 bytes multiple, but we // We already know the HobGuidType size is 8 bytes multiple, but we
// need the total size to be 8 bytes multiple. That is why the ACPI // need the total size to be 8 bytes multiple. That is why the ACPI
// table size must be 8 bytes multiple as well. // table size must be 8 bytes multiple as well.
let length = std::mem::size_of::<HobGuidType>() as u16 let length =
+ align_hob(table_content.len() as u64) as u16; mem::size_of::<HobGuidType>() as u16 + align_hob(table_content.len() as u64) as u16;
let hob_guid_type = HobGuidType { let hob_guid_type = HobGuidType {
header: HobHeader { header: HobHeader {
r#type: HobType::GuidExtension, r#type: HobType::GuidExtension,
@@ -462,7 +463,7 @@ impl TdHob {
); );
mem.write_obj(hob_guid_type, GuestAddress(self.current_offset)) mem.write_obj(hob_guid_type, GuestAddress(self.current_offset))
.map_err(TdvfError::GuestMemoryWriteHob)?; .map_err(TdvfError::GuestMemoryWriteHob)?;
let current_offset = self.current_offset + std::mem::size_of::<HobGuidType>() as u64; let current_offset = self.current_offset + mem::size_of::<HobGuidType>() as u64;
// In case the table is quite large, let's make sure we can handle // In case the table is quite large, let's make sure we can handle
// retrying until everything has been correctly copied. // retrying until everything has been correctly copied.
@@ -493,7 +494,7 @@ impl TdHob {
guid_type: HobGuidType { guid_type: HobGuidType {
header: HobHeader { header: HobHeader {
r#type: HobType::GuidExtension, r#type: HobType::GuidExtension,
length: std::mem::size_of::<TdPayload>() as u16, length: mem::size_of::<TdPayload>() as u16,
reserved: 0, reserved: 0,
}, },
// HOB_PAYLOAD_INFO_GUID // HOB_PAYLOAD_INFO_GUID