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: change typ to r#type in SMBIOS code

Browse Source 
Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu
2022-08-07 11:31:20 +00:00
committed by Rob Bradford
parent 2afd2f9f52
commit 62f1b6bc61
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/src/x86_64/smbios.rs
+6 -6
View File
@@ -96,7 +96,7 @@ struct Smbios30Entrypoint {
#[repr(packed)] #[repr(packed)]
#[derive(Default, Copy, Clone)] #[derive(Default, Copy, Clone)]
struct SmbiosBiosInfo { struct SmbiosBiosInfo {
typ: u8, r#type: u8,
length: u8, length: u8,
handle: u16, handle: u16,
vendor: u8, vendor: u8,
@@ -113,7 +113,7 @@ struct SmbiosBiosInfo {
#[repr(packed)] #[repr(packed)]
#[derive(Default, Copy, Clone)] #[derive(Default, Copy, Clone)]
struct SmbiosSysInfo { struct SmbiosSysInfo {
typ: u8, r#type: u8,
length: u8, length: u8,
handle: u16, handle: u16,
manufacturer: u8, manufacturer: u8,
@@ -140,7 +140,7 @@ struct SmbiosOemStrings {
#[repr(packed)] #[repr(packed)]
#[derive(Default, Copy, Clone)] #[derive(Default, Copy, Clone)]
struct SmbiosEndOfTable { struct SmbiosEndOfTable {
typ: u8, r#type: u8,
length: u8, length: u8,
handle: u16, handle: u16,
} }
@@ -191,7 +191,7 @@ pub fn setup_smbios(
{ {
handle += 1; handle += 1;
let smbios_biosinfo = SmbiosBiosInfo { let smbios_biosinfo = SmbiosBiosInfo {
typ: BIOS_INFORMATION, r#type: BIOS_INFORMATION,
length: mem::size_of::<SmbiosBiosInfo>() as u8, length: mem::size_of::<SmbiosBiosInfo>() as u8,
handle, handle,
vendor: 1, // First string written in this section vendor: 1, // First string written in this section
@@ -215,7 +215,7 @@ pub fn setup_smbios(
.map_err(Error::ParseUuid)? .map_err(Error::ParseUuid)?
.unwrap_or(Uuid::nil()); .unwrap_or(Uuid::nil());
let smbios_sysinfo = SmbiosSysInfo { let smbios_sysinfo = SmbiosSysInfo {
typ: SYSTEM_INFORMATION, r#type: SYSTEM_INFORMATION,
length: mem::size_of::<SmbiosSysInfo>() as u8, length: mem::size_of::<SmbiosSysInfo>() as u8,
handle, handle,
manufacturer: 1, // First string written in this section manufacturer: 1, // First string written in this section
@@ -255,7 +255,7 @@ pub fn setup_smbios(
{ {
handle += 1; handle += 1;
let smbios_end = SmbiosEndOfTable { let smbios_end = SmbiosEndOfTable {
typ: END_OF_TABLE, r#type: END_OF_TABLE,
length: mem::size_of::<SmbiosEndOfTable>() as u8, length: mem::size_of::<SmbiosEndOfTable>() as u8,
handle, handle,
}; };