更新 axcpu 依赖项的定义，移除分支指定；修复 axvcpu 的使用，简化 MMIO 读写操作

Author: ZR233

Cargo.toml

@@ -23,6 +23,7 @@ percpu = { version = "0.2.0", features = ["arm-el2"] }
 
 # System dependent modules provided by ArceOS-Hypervisor.
 axvcpu = "0.1"
+axcpu = { git = "https://github.com/arceos-hypervisor/axcpu", branch = "vmm", features = ["arm-el2"] }
 axaddrspace = "0.1"
 axdevice = { git = "https://github.com/arceos-hypervisor/axdevice.git" }
 axdevice_base = "0.1"
@@ -35,6 +36,6 @@ x86_vcpu = "0.1"
 riscv_vcpu = { git = "https://github.com/arceos-hypervisor/riscv_vcpu.git" }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
-arm_vcpu = { git = "https://github.com/arceos-hypervisor/arm_vcpu.git", branch = "dev-irq" }
+arm_vcpu = { path = "/home/zhourui/arceos/arm_vcpu" }
 arm_vgic = { git = "https://github.com/arceos-hypervisor/arm_vgic.git", features = ["vgicv3"] }
 

src/vm.rs

@@ -11,7 +11,7 @@ use spin::Mutex;
 
 use axaddrspace::{AddrSpace, GuestPhysAddr, HostPhysAddr, MappingFlags, device::AccessWidth};
 use axdevice::{AxVmDeviceConfig, AxVmDevices};
-use axvcpu::{AxArchVCpu, AxVCpu, AxVCpuExitReason, AxVCpuHal};
+use axvcpu::{AxVCpu, AxVCpuExitReason, AxVCpuHal};
 use cpumask::CpuMask;
 
 use crate::config::{AxVMConfig, VmMemMappingType};
@@ -83,6 +83,7 @@ impl<H: AxVMHal, U: AxVCpuHal> AxVM<H, U> {
                     .dtb_load_gpa
                     .unwrap_or_default()
                     .as_usize(),
+                entry_guest: axcpu::el2::enter_guest,
             };
             #[cfg(target_arch = "riscv64")]
             let arch_config = AxVCpuCreateConfig {
@@ -295,7 +296,7 @@ impl<H: AxVMHal, U: AxVCpuHal> AxVM<H, U> {
                 }
                 #[cfg(not(target_arch = "aarch64"))]
                 {
-                    <AxArchVCpuImpl<U> as AxArchVCpu>::SetupConfig::default()
+                    <AxArchVCpuImpl<U> as axvcpu::AxArchVCpu>::SetupConfig::default()
                 }
             };
 
@@ -435,15 +436,13 @@ impl<H: AxVMHal, U: AxVCpuHal> AxVM<H, U> {
                     reg_width: _,
                     signed_ext: _,
                 } => {
-                    let val = self
-                        .get_devices()
-                        .handle_mmio_read(*addr, (*width).into())?;
+                    let val = self.get_devices().handle_mmio_read(*addr, *width)?;
                     vcpu.set_gpr(*reg, val);
                     true
                 }
                 AxVCpuExitReason::MmioWrite { addr, width, data } => {
                     self.get_devices()
-                        .handle_mmio_write(*addr, (*width).into(), *data as usize)?;
+                        .handle_mmio_write(*addr, *width, *data as usize)?;
                     true
                 }
                 AxVCpuExitReason::IoRead { port, width } => {
@@ -591,7 +590,7 @@ impl<H: AxVMHal, U: AxVCpuHal> AxVM<H, U> {
                     )
                 };
                 let mut copied_bytes = 0;
-                for (_i, chunk) in buffer.iter_mut().enumerate() {
+                for chunk in buffer.iter_mut() {
                     let end = copied_bytes + chunk.len();
                     chunk.copy_from_slice(&bytes[copied_bytes..end]);
                     copied_bytes += chunk.len();