External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-22 19:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

arch: x86_64: add safety comments for impl ByteValued

Browse Source 
Group impl clauses together to avoid repetition.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu 2021-11-17 13:24:13 +00:00 committed by Rob Bradford
parent 243b5bad65
commit 03862314eb
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/src/x86_64/mod.rs
View File

@ -118,17 +118,15 @@ impl SgxEpcRegion {
#[derive(Copy, Clone, Default)] #[derive(Copy, Clone, Default)]
struct StartInfoWrapper(hvm_start_info); struct StartInfoWrapper(hvm_start_info);
// It is safe to initialize StartInfoWrapper which is a wrapper over `hvm_start_info` (a series of ints).
unsafe impl ByteValued for StartInfoWrapper {}
#[derive(Copy, Clone, Default)] #[derive(Copy, Clone, Default)]
struct MemmapTableEntryWrapper(hvm_memmap_table_entry); struct MemmapTableEntryWrapper(hvm_memmap_table_entry);
unsafe impl ByteValued for MemmapTableEntryWrapper {}
#[derive(Copy, Clone, Default)] #[derive(Copy, Clone, Default)]
struct ModlistEntryWrapper(hvm_modlist_entry); struct ModlistEntryWrapper(hvm_modlist_entry);
// SAFETY: These data structures only contain a series of integers
unsafe impl ByteValued for StartInfoWrapper {}
unsafe impl ByteValued for MemmapTableEntryWrapper {}
unsafe impl ByteValued for ModlistEntryWrapper {} unsafe impl ByteValued for ModlistEntryWrapper {}
// This is a workaround to the Rust enforcement specifying that any implementation of a foreign // This is a workaround to the Rust enforcement specifying that any implementation of a foreign
@ -139,7 +137,7 @@ unsafe impl ByteValued for ModlistEntryWrapper {}
#[derive(Copy, Clone, Default)] #[derive(Copy, Clone, Default)]
struct BootParamsWrapper(boot_params); struct BootParamsWrapper(boot_params);
// It is safe to initialize BootParamsWrap which is a wrapper over `boot_params` (a series of ints). // SAFETY: BootParamsWrap is a wrapper over `boot_params` (a series of ints).
unsafe impl ByteValued for BootParamsWrapper {} unsafe impl ByteValued for BootParamsWrapper {}
#[derive(Debug)] #[derive(Debug)]

2
arch/src/x86_64/mptable.rs
View File

@ -35,7 +35,7 @@ struct MpcLintsrcWrapper(mpspec::mpc_lintsrc);
#[derive(Copy, Clone, Default)] #[derive(Copy, Clone, Default)]
struct MpfIntelWrapper(mpspec::mpf_intel); struct MpfIntelWrapper(mpspec::mpf_intel);
// These `mpspec` wrapper types are only data, reading them from data is a safe initialization. // SAFETY: These `mpspec` wrapper types are only data, reading them from data is a safe initialization.
unsafe impl ByteValued for MpcBusWrapper {} unsafe impl ByteValued for MpcBusWrapper {}
unsafe impl ByteValued for MpcCpuWrapper {} unsafe impl ByteValued for MpcCpuWrapper {}
unsafe impl ByteValued for MpcIntsrcWrapper {} unsafe impl ByteValued for MpcIntsrcWrapper {}

6
arch/src/x86_64/smbios.rs
View File

@ -82,7 +82,6 @@ pub struct Smbios30Entrypoint {
pub max_size: u32, pub max_size: u32,
pub physptr: u64, pub physptr: u64,
} }
unsafe impl ByteValued for Smbios30Entrypoint {}
impl Clone for Smbios30Entrypoint { impl Clone for Smbios30Entrypoint {
fn clone(&self) -> Self { fn clone(&self) -> Self {
@ -112,8 +111,6 @@ impl Clone for SmbiosBiosInfo {
} }
} }
unsafe impl ByteValued for SmbiosBiosInfo {}
#[repr(packed)] #[repr(packed)]
#[derive(Default, Copy)] #[derive(Default, Copy)]
pub struct SmbiosSysInfo { pub struct SmbiosSysInfo {
@ -136,6 +133,9 @@ impl Clone for SmbiosSysInfo {
} }
} }
// SAFETY: These data structures only contain a series of integers
unsafe impl ByteValued for Smbios30Entrypoint {}
unsafe impl ByteValued for SmbiosBiosInfo {}
unsafe impl ByteValued for SmbiosSysInfo {} unsafe impl ByteValued for SmbiosSysInfo {}
fn write_and_incr<T: ByteValued>( fn write_and_incr<T: ByteValued>(

13
arch/src/x86_64/tdx/mod.rs
View File

@ -69,8 +69,6 @@ pub struct TdVmmDataRegion {
pub region_type: TdVmmDataRegionType, pub region_type: TdVmmDataRegionType,
} }
unsafe impl ByteValued for TdVmmDataRegion {}
#[repr(u16)] #[repr(u16)]
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug)]
pub enum TdVmmDataRegionType { pub enum TdVmmDataRegionType {
@ -192,7 +190,6 @@ struct HobHeader {
length: u16, length: u16,
reserved: u32, reserved: u32,
} }
unsafe impl ByteValued for HobHeader {}
#[repr(C)] #[repr(C)]
#[derive(Copy, Clone, Default, Debug)] #[derive(Copy, Clone, Default, Debug)]
@ -206,7 +203,6 @@ struct HobHandoffInfoTable {
efi_free_memory_bottom: u64, efi_free_memory_bottom: u64,
efi_end_of_hob_list: u64, efi_end_of_hob_list: u64,
} }
unsafe impl ByteValued for HobHandoffInfoTable {}
#[repr(C)] #[repr(C)]
#[derive(Copy, Clone, Default, Debug)] #[derive(Copy, Clone, Default, Debug)]
@ -227,7 +223,6 @@ struct HobResourceDescriptor {
physical_start: u64, physical_start: u64,
resource_length: u64, resource_length: u64,
} }
unsafe impl ByteValued for HobResourceDescriptor {}
#[repr(C)] #[repr(C)]
#[derive(Copy, Clone, Default, Debug)] #[derive(Copy, Clone, Default, Debug)]
@ -235,7 +230,6 @@ struct HobGuidType {
header: HobHeader, header: HobHeader,
name: EfiGuid, name: EfiGuid,
} }
unsafe impl ByteValued for HobGuidType {}
#[repr(C)] #[repr(C)]
#[derive(Copy, Clone, Default, Debug)] #[derive(Copy, Clone, Default, Debug)]
@ -243,6 +237,13 @@ struct TdVmmData {
guid_type: HobGuidType, guid_type: HobGuidType,
region: TdVmmDataRegion, region: TdVmmDataRegion,
} }
// SAFETY: These data structures only contain a series of integers
unsafe impl ByteValued for TdVmmDataRegion {}
unsafe impl ByteValued for HobHeader {}
unsafe impl ByteValued for HobHandoffInfoTable {}
unsafe impl ByteValued for HobResourceDescriptor {}
unsafe impl ByteValued for HobGuidType {}
unsafe impl ByteValued for TdVmmData {} unsafe impl ByteValued for TdVmmData {}
pub struct TdHob { pub struct TdHob {