refactor: 清理未使用的导入和结构，优化代码可读性

Author: ZR233

src/arch/aarch64/cpu.rs

@@ -1,5 +1,4 @@
-use core::{fmt::Display, ops::Deref, sync::atomic::AtomicBool};
-use std::sync::Arc;
+use core::{fmt::Display, ops::Deref};
 
 use aarch64_cpu::registers::*;
 use arm_vcpu::{Aarch64PerCpu, Aarch64VCpuCreateConfig};
@@ -11,7 +10,7 @@ use crate::{
     vcpu::{VCpuCommon, VCpuOp},
     vhal::{
         ArchCpuData,
-        cpu::{CpuHardId, CpuId, HCpuExclusive},
+        cpu::{CpuHardId, CpuId},
     },
 };
 
@@ -82,28 +81,6 @@ impl arm_vcpu::CpuHal for VCpuHal {
     }
 }
 
-#[derive(Clone)]
-pub struct VCpuHandle {
-    is_active: Arc<AtomicBool>,
-}
-
-impl VCpuHandle {
-    pub fn new() -> Self {
-        VCpuHandle {
-            is_active: Arc::new(AtomicBool::new(true)),
-        }
-    }
-
-    pub fn stop(&self) {
-        self.is_active
-            .store(false, core::sync::atomic::Ordering::Release);
-    }
-
-    pub fn is_active(&self) -> bool {
-        self.is_active.load(core::sync::atomic::Ordering::Acquire)
-    }
-}
-
 pub struct VCpu {
     pub vcpu: arm_vcpu::Aarch64VCpu,
     common: VCpuCommon,

src/arch/aarch64/mod.rs

@@ -1,11 +1,7 @@
-use aarch64_cpu_ext::cache::{CacheOp, dcache_range};
-
 pub mod cpu;
 mod hal;
 mod vm;
 
 pub use cpu::HCpu;
 pub use hal::Hal;
 pub use vm::*;
-
-type AddrSpace = axaddrspace::AddrSpace<axhal::paging::PagingHandlerImpl>;

src/arch/aarch64/vm/inited.rs

@@ -1,16 +1,8 @@
-use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
-use std::{
-    os::arceos::{api::task::AxCpuMask, modules::axtask::set_current_affinity},
-    string::String,
-    vec::Vec,
-};
-
-use arm_vcpu::Aarch64VCpuSetupConfig;
+use std::{string::String, vec::Vec};
 
 use crate::{
-    GuestPhysAddr, TASK_STACK_SIZE, VmAddrSpace, VmMachineInitedOps, VmMachineRunningCommon,
+    GuestPhysAddr, VmAddrSpace, VmMachineInitedOps, VmMachineRunningCommon,
     arch::{VmMachineRunning, cpu::VCpu},
-    config::AxVMConfig,
     data::VmDataWeak,
     vm::VmId,
 };

src/arch/aarch64/vm/unint.rs

@@ -1,4 +1,4 @@
-use core::{ops::Deref, sync::atomic::Ordering};
+use core::ops::Deref;
 
 use alloc::vec::Vec;
 use arm_vcpu::Aarch64VCpuSetupConfig;
@@ -99,7 +99,7 @@ impl VmMachineUninit {
             self.config.id, self.config.name
         );
         for memory_cfg in &self.config.memory_regions {
-            let m = vmspace.new_memory(memory_cfg);
+            vmspace.new_memory(memory_cfg)?;
         }
 
         vmspace.load_kernel_image(&self.config)?;

src/fdt/mod.rs

@@ -82,9 +82,6 @@ impl FdtBuilder {
             self.fdt.remove_node(&path).unwrap();
         }
 
-        let root_address_cells = self.fdt.root().address_cells().unwrap_or(2);
-        let root_size_cells = self.fdt.root().size_cells().unwrap_or(2);
-
         for (i, m) in memories.enumerate() {
             let mut node = Node::new(&format!("memory@{i}"));
             let mut prop = Property::new("device_type", vec![]);

src/vhal/cpu.rs

@@ -39,7 +39,7 @@ impl HCpuExclusive {
     where
         F: FnOnce(&HCpu) -> R,
     {
-        for (id, cpu) in PRE_CPU.iter() {
+        for (_id, cpu) in PRE_CPU.iter() {
             if cpu.id == self.0 {
                 return f(cpu);
             }

src/vhal/mod.rs

@@ -5,7 +5,6 @@ use axstd::{
 };
 use bitmap_allocator::BitAlloc;
 use core::sync::atomic::{AtomicUsize, Ordering};
-use spin::Mutex;
 
 use crate::{
     HostPhysAddr, HostVirtAddr, TASK_STACK_SIZE,

src/vm/data.rs

@@ -11,8 +11,7 @@ use spin::RwLock;
 
 use crate::{
     AxVMConfig, RunError, VmId, VmMachineInitedOps, VmMachineRunningOps, VmMachineUninitOps,
-    arch::{VmMachineInited, VmMachineRunning, VmMachineUninit},
-    config::AxVCpuConfig,
+    arch::{VmMachineRunning, VmMachineUninit},
     vm::machine::{AtomicState, VMStatus, VmMachineState},
 };
 
@@ -75,7 +74,7 @@ impl VmDataInner {
     }
 
     pub(crate) fn run_result(&self) -> anyhow::Result<()> {
-        let mut guard = self.error.write();
+        let guard = self.error.read();
         let res = guard.clone();
         match res {
             Some(err) => match err {

src/vm/machine/mod.rs

@@ -19,6 +19,7 @@ pub trait VmMachineUninitOps {
         Self: Sized;
 }
 
+#[allow(unused)]
 pub trait VmMachineInitedOps {
     type Running: VmMachineRunningOps;
     fn id(&self) -> VmId;
@@ -49,6 +50,7 @@ pub enum VmMachineState {
     Inited(VmMachineInited),
     Running(VmMachineRunning),
     Switching,
+    #[allow(unused)]
     Stopping(VmStatusStopping),
     Stopped,
 }

src/vm/mod.rs

@@ -1,10 +1,4 @@
-use core::fmt;
-
-use alloc::sync::Arc;
-use spin::{Mutex, RwLock};
-use std::thread;
-
-use crate::{AxVMConfig, arch::VmMachineInited, data::VmData, vm::data::VmDataWeak};
+use crate::{AxVMConfig, data::VmData};
 
 mod addrspace;
 pub(crate) mod data;