diff --git a/kernel/src/device/misc/tdxguest.rs b/kernel/src/device/misc/tdxguest.rs index 32a46b446..214e6dc87 100644 --- a/kernel/src/device/misc/tdxguest.rs +++ b/kernel/src/device/misc/tdxguest.rs @@ -10,10 +10,7 @@ use aster_util::{field_ptr, safe_ptr::SafePtr}; use device_id::{DeviceId, MinorId}; use ostd::{ const_assert, - mm::{ - FrameAllocOptions, HasPaddr, HasSize, PAGE_SIZE, USegment, VmIo, dma::DmaCoherent, - io_util::HasVmReaderWriter, - }, + mm::{FrameAllocOptions, HasPaddr, HasSize, PAGE_SIZE, USegment, VmIo, dma::DmaCoherent}, sync::WaitQueue, }; use tdx_guest::{ diff --git a/kernel/src/fs/configfs/mod.rs b/kernel/src/fs/configfs/mod.rs index 76704dc9b..0240c8d8f 100644 --- a/kernel/src/fs/configfs/mod.rs +++ b/kernel/src/fs/configfs/mod.rs @@ -28,7 +28,7 @@ pub(super) fn init() { /// this function returns an error. /// /// [`ConfigFs`]: fs::ConfigFs -#[cfg_attr(not(ktest), expect(dead_code))] +#[cfg_attr(not(any(ktest, target_arch = "x86_64")), expect(dead_code))] pub fn register_subsystem(subsystem: Arc) -> Result<()> { ConfigRootNode::singleton().add_child(subsystem)?; diff --git a/kernel/src/security/tsm.rs b/kernel/src/security/tsm.rs index c06a5f6e2..0de98bed1 100644 --- a/kernel/src/security/tsm.rs +++ b/kernel/src/security/tsm.rs @@ -86,7 +86,7 @@ const TSM_INBLOB_MAX: usize = 64; /// /// The states and their transitions are summarized in the table below. /// -/// ``` +/// ```text /// ┌────────────────┐ /// │InblobNeeded │ /// │(initial) │ @@ -216,7 +216,7 @@ inherit_sys_leaf_node!(ReportNode, fields, { "provider" => { let data = self.data.read(); let mut printer = VmPrinter::new_skip(writer, offset); - write!(printer, "{}\n", data.provider)?; + writeln!(printer, "{}", data.provider)?; Ok(printer.bytes_written()) } @@ -256,7 +256,7 @@ inherit_sys_leaf_node!(ReportNode, fields, { TsmProviderState::InblobProvided { generation, .. } => generation, TsmProviderState::OutblobGenerated { generation, .. } => generation, }; - write!(printer, "{}\n", generation)?; + writeln!(printer, "{}", generation)?; Ok(printer.bytes_written()) }