External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

arch: simplify MP table signature generation code

Browse Source 
Clippy complained one use of the char_array macro.

Instead of fixing that use case, the observation is that the macro was
needed only because MP table types mixed c_char and c_uchar for no
particular reason.

Only use c_uchar in those types, and drop char_array.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu 2024-04-29 04:12:08 +00:00 committed by Rob Bradford
parent f6cd3bd86d
commit fe704bd44a
2 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/src/x86_64/mpspec.rs
View File

@ -17,7 +17,7 @@ pub const MP_IRQDIR_DEFAULT: ::std::os::raw::c_uint = 0;
#[repr(C)] #[repr(C)]
#[derive(Debug, Default, Copy, Clone)] #[derive(Debug, Default, Copy, Clone)]
pub struct mpf_intel { pub struct mpf_intel {
pub signature: [::std::os::raw::c_char; 4usize], pub signature: [::std::os::raw::c_uchar; 4usize],
pub physptr: ::std::os::raw::c_uint, pub physptr: ::std::os::raw::c_uint,
pub length: ::std::os::raw::c_uchar, pub length: ::std::os::raw::c_uchar,
pub specification: ::std::os::raw::c_uchar, pub specification: ::std::os::raw::c_uchar,
@ -32,12 +32,12 @@ pub struct mpf_intel {
#[repr(C)] #[repr(C)]
#[derive(Debug, Default, Copy, Clone)] #[derive(Debug, Default, Copy, Clone)]
pub struct mpc_table { pub struct mpc_table {
pub signature: [::std::os::raw::c_char; 4usize], pub signature: [::std::os::raw::c_uchar; 4usize],
pub length: ::std::os::raw::c_ushort, pub length: ::std::os::raw::c_ushort,
pub spec: ::std::os::raw::c_char, pub spec: ::std::os::raw::c_uchar,
pub checksum: ::std::os::raw::c_char, pub checksum: ::std::os::raw::c_uchar,
pub oem: [::std::os::raw::c_char; 8usize], pub oem: [::std::os::raw::c_uchar; 8usize],
pub productid: [::std::os::raw::c_char; 12usize], pub productid: [::std::os::raw::c_uchar; 12usize],
pub oemptr: ::std::os::raw::c_uint, pub oemptr: ::std::os::raw::c_uint,
pub oemsize: ::std::os::raw::c_ushort, pub oemsize: ::std::os::raw::c_ushort,
pub oemcount: ::std::os::raw::c_ushort, pub oemcount: ::std::os::raw::c_ushort,
@ -106,9 +106,9 @@ pub struct mpc_lintsrc {
#[repr(C)] #[repr(C)]
#[derive(Debug, Default, Copy, Clone)] #[derive(Debug, Default, Copy, Clone)]
pub struct mpc_oemtable { pub struct mpc_oemtable {
pub signature: [::std::os::raw::c_char; 4usize], pub signature: [::std::os::raw::c_uchar; 4usize],
pub length: ::std::os::raw::c_ushort, pub length: ::std::os::raw::c_ushort,
pub rev: ::std::os::raw::c_char, pub rev: ::std::os::raw::c_uchar,
pub checksum: ::std::os::raw::c_char, pub checksum: ::std::os::raw::c_uchar,
pub mpc: [::std::os::raw::c_char; 8usize], pub mpc: [::std::os::raw::c_uchar; 8usize],
} }

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

@ -8,7 +8,7 @@
use crate::layout::{APIC_START, HIGH_RAM_START, IOAPIC_START}; use crate::layout::{APIC_START, HIGH_RAM_START, IOAPIC_START};
use crate::x86_64::{get_x2apic_id, mpspec}; use crate::x86_64::{get_x2apic_id, mpspec};
use crate::GuestMemoryMmap; use crate::GuestMemoryMmap;
use libc::c_char; use libc::c_uchar;
use std::mem; use std::mem;
use std::result; use std::result;
use std::slice; use std::slice;
@ -82,18 +82,13 @@ pub type Result<T> = result::Result<T, Error>;
// a large number for FC usecases. // a large number for FC usecases.
pub const MAX_SUPPORTED_CPUS: u32 = 254; pub const MAX_SUPPORTED_CPUS: u32 = 254;
// Convenience macro for making arrays of diverse character types.
macro_rules! char_array {
($t:ty; $( $c:expr ),*) => ( [ $( $c as $t ),* ] )
}
// Most of these variables are sourced from the Intel MP Spec 1.4. // Most of these variables are sourced from the Intel MP Spec 1.4.
const SMP_MAGIC_IDENT: [c_char; 4] = char_array!(c_char; '_', 'M', 'P', '_'); const SMP_MAGIC_IDENT: &[c_uchar; 4] = b"_MP_";
const MPC_SIGNATURE: [c_char; 4] = char_array!(c_char; 'P', 'C', 'M', 'P'); const MPC_SIGNATURE: &[c_uchar; 4] = b"PCMP";
const MPC_SPEC: i8 = 4; const MPC_SPEC: u8 = 4;
const MPC_OEM: [c_char; 8] = char_array!(c_char; 'F', 'C', ' ', ' ', ' ', ' ', ' ', ' '); const MPC_OEM: &[c_uchar; 8] = b"FC ";
const MPC_PRODUCT_ID: [c_char; 12] = ['0' as c_char; 12]; const MPC_PRODUCT_ID: &[c_uchar; 12] = &[b'0'; 12];
const BUS_TYPE_ISA: [u8; 6] = char_array!(u8; 'I', 'S', 'A', ' ', ' ', ' '); const BUS_TYPE_ISA: &[c_uchar; 6] = b"ISA ";
const APIC_VERSION: u8 = 0x14; const APIC_VERSION: u8 = 0x14;
const CPU_STEPPING: u32 = 0x600; const CPU_STEPPING: u32 = 0x600;
const CPU_FEATURE_APIC: u32 = 0x200; const CPU_FEATURE_APIC: u32 = 0x200;
@ -168,7 +163,7 @@ pub fn setup_mptable(
{ {
let mut mpf_intel = MpfIntelWrapper(mpspec::mpf_intel::default()); let mut mpf_intel = MpfIntelWrapper(mpspec::mpf_intel::default());
let size = mem::size_of::<MpfIntelWrapper>() as u64; let size = mem::size_of::<MpfIntelWrapper>() as u64;
mpf_intel.0.signature = SMP_MAGIC_IDENT; mpf_intel.0.signature = *SMP_MAGIC_IDENT;
mpf_intel.0.length = 1; mpf_intel.0.length = 1;
mpf_intel.0.specification = 4; mpf_intel.0.specification = 4;
mpf_intel.0.physptr = (base_mp.raw_value() + size) as u32; mpf_intel.0.physptr = (base_mp.raw_value() + size) as u32;
@ -209,7 +204,7 @@ pub fn setup_mptable(
let mut mpc_bus = MpcBusWrapper(mpspec::mpc_bus::default()); let mut mpc_bus = MpcBusWrapper(mpspec::mpc_bus::default());
mpc_bus.0.type_ = mpspec::MP_BUS as u8; mpc_bus.0.type_ = mpspec::MP_BUS as u8;
mpc_bus.0.busid = 0; mpc_bus.0.busid = 0;
mpc_bus.0.bustype = BUS_TYPE_ISA; mpc_bus.0.bustype = *BUS_TYPE_ISA;
mem.write_obj(mpc_bus, base_mp) mem.write_obj(mpc_bus, base_mp)
.map_err(Error::WriteMpcBus)?; .map_err(Error::WriteMpcBus)?;
base_mp = base_mp.unchecked_add(size as u64); base_mp = base_mp.unchecked_add(size as u64);
@ -280,14 +275,14 @@ pub fn setup_mptable(
{ {
let mut mpc_table = MpcTableWrapper(mpspec::mpc_table::default()); let mut mpc_table = MpcTableWrapper(mpspec::mpc_table::default());
mpc_table.0.signature = MPC_SIGNATURE; mpc_table.0.signature = *MPC_SIGNATURE;
mpc_table.0.length = table_end.unchecked_offset_from(table_base) as u16; mpc_table.0.length = table_end.unchecked_offset_from(table_base) as u16;
mpc_table.0.spec = MPC_SPEC; mpc_table.0.spec = MPC_SPEC;
mpc_table.0.oem = MPC_OEM; mpc_table.0.oem = *MPC_OEM;
mpc_table.0.productid = MPC_PRODUCT_ID; mpc_table.0.productid = *MPC_PRODUCT_ID;
mpc_table.0.lapic = APIC_START.0 as u32; mpc_table.0.lapic = APIC_START.0 as u32;
checksum = checksum.wrapping_add(compute_checksum(&mpc_table.0)); checksum = checksum.wrapping_add(compute_checksum(&mpc_table.0));
mpc_table.0.checksum = (!checksum).wrapping_add(1) as i8; mpc_table.0.checksum = (!checksum).wrapping_add(1);
mem.write_obj(mpc_table, table_base) mem.write_obj(mpc_table, table_base)
.map_err(Error::WriteMpcTable)?; .map_err(Error::WriteMpcTable)?;
} }