fmt

Author: ZR233

src/mem.rs

@@ -1,7 +1,7 @@
 use core::marker::PhantomData;
 
-use memory_addr::PAGE_SIZE_4K as PAGE_SIZE;
 use crate::{Hal, HostPhysAddr, Result, VmxError};
+use memory_addr::PAGE_SIZE_4K as PAGE_SIZE;
 
 /// A physical frame which will be automatically deallocated when dropped.
 ///
@@ -16,8 +16,7 @@ pub struct PhysFrame<H: Hal> {
 impl<H: Hal> PhysFrame<H> {
     /// Allocate a [`PhysFrame`].
     pub fn alloc() -> Result<Self> {
-        let start_paddr = H::alloc_frame()
-            .ok_or_else(|| VmxError::MemoryAllocationFailed)?;
+        let start_paddr = H::alloc_frame().ok_or_else(|| VmxError::MemoryAllocationFailed)?;
         assert_ne!(start_paddr, 0);
         Ok(Self {
             start_paddr: Some(start_paddr),

src/vmx/mod.rs

@@ -13,7 +13,7 @@ pub use self::vcpu::VmxVcpu as VmxArchVCpu;
 pub use self::vmcs::{VmxExitInfo, VmxInterruptInfo, VmxIoExitInfo};
 
 // 导出自定义错误类型
-pub use crate::{VmxError, Result};
+pub use crate::{Result, VmxError};
 
 /// Return if current platform support virtualization extension.
 pub fn has_hardware_support() -> bool {
@@ -31,9 +31,9 @@ pub fn read_vmcs_revision_id() -> u32 {
 fn as_axerr(err: x86::vmx::VmFail) -> VmxError {
     use x86::vmx::VmFail;
     match err {
-        VmFail::VmFailValid => {
-            VmxError::VmxInstructionError(alloc::string::String::from(vmcs::instruction_error().as_str()))
-        }
+        VmFail::VmFailValid => VmxError::VmxInstructionError(alloc::string::String::from(
+            vmcs::instruction_error().as_str(),
+        )),
         VmFail::VmFailInvalid => VmxError::InvalidVmcsPtr,
     }
 }

src/vmx/percpu.rs

@@ -4,10 +4,10 @@ use x86_64::registers::control::{Cr0, Cr4, Cr4Flags};
 use alloc::format;
 use memory_addr::PAGE_SIZE_4K as PAGE_SIZE;
 
-use crate::{Hal, Result, VmxError};
 use crate::msr::Msr;
 use crate::vmx::has_hardware_support;
 use crate::vmx::structs::{FeatureControl, FeatureControlFlags, VmxBasic, VmxRegion};
+use crate::{Hal, Result, VmxError};
 
 /// Represents the per-CPU state for Virtual Machine Extensions (VMX).
 ///
@@ -43,7 +43,9 @@ impl<H: Hal> VmxPerCpuState<H> {
 
     pub fn hardware_enable(&mut self) -> Result<()> {
         if !has_hardware_support() {
-            return Err(VmxError::UnsupportedFeature("CPU does not support feature VMX".into()));
+            return Err(VmxError::UnsupportedFeature(
+                "CPU does not support feature VMX".into(),
+            ));
         }
         if self.is_enabled() {
             return Err(VmxError::VmxAlreadyEnabled);
@@ -77,28 +79,42 @@ impl<H: Hal> VmxPerCpuState<H> {
             }};
         }
         if !cr_is_valid!(Cr0::read().bits(), CR0) {
-            return Err(VmxError::InvalidVmcsConfig("host CR0 is not valid in VMX operation".into()));
+            return Err(VmxError::InvalidVmcsConfig(
+                "host CR0 is not valid in VMX operation".into(),
+            ));
         }
         if !cr_is_valid!(Cr4::read().bits(), CR4) {
-            return Err(VmxError::InvalidVmcsConfig("host CR4 is not valid in VMX operation".into()));
+            return Err(VmxError::InvalidVmcsConfig(
+                "host CR4 is not valid in VMX operation".into(),
+            ));
         }
 
         // Get VMCS revision identifier in IA32_VMX_BASIC MSR.
         let vmx_basic = VmxBasic::read();
         if vmx_basic.region_size as usize != PAGE_SIZE {
-            return Err(VmxError::UnsupportedFeature("VMX region size is not 4K".into()));
+            return Err(VmxError::UnsupportedFeature(
+                "VMX region size is not 4K".into(),
+            ));
         }
         if vmx_basic.mem_type != VmxBasic::VMX_MEMORY_TYPE_WRITE_BACK {
-            return Err(VmxError::UnsupportedFeature("VMX memory type is not write-back".into()));
+            return Err(VmxError::UnsupportedFeature(
+                "VMX memory type is not write-back".into(),
+            ));
         }
         if vmx_basic.is_32bit_address {
-            return Err(VmxError::UnsupportedFeature("32-bit VMX not supported".into()));
+            return Err(VmxError::UnsupportedFeature(
+                "32-bit VMX not supported".into(),
+            ));
         }
         if !vmx_basic.io_exit_info {
-            return Err(VmxError::UnsupportedFeature("IO exit info not supported".into()));
+            return Err(VmxError::UnsupportedFeature(
+                "IO exit info not supported".into(),
+            ));
         }
         if !vmx_basic.vmx_flex_controls {
-            return Err(VmxError::UnsupportedFeature("VMX flex controls not supported".into()));
+            return Err(VmxError::UnsupportedFeature(
+                "VMX flex controls not supported".into(),
+            ));
         }
         self.vmcs_revision_id = vmx_basic.revision_id;
         self.vmx_region = VmxRegion::new(self.vmcs_revision_id, false)?;

src/vmx/vmcs.rs

@@ -11,9 +11,9 @@ use axaddrspace::{GuestPhysAddr, HostPhysAddr, NestedPageFaultInfo};
 use page_table_entry::MappingFlags;
 
 use super::as_axerr;
-use super::definitions::{VmxRawExitReason, VmxInstructionError, VmxInterruptionType};
-use crate::{Result, VmxError};
+use super::definitions::{VmxInstructionError, VmxInterruptionType, VmxRawExitReason};
 use crate::msr::Msr;
+use crate::{Result, VmxError};
 
 // HYGIENE: These macros are only used in this file, so we can use `as_axerr` directly.