change arceos ref; add do_register_lower_aarch64_irq_handler(todo)

modify some code format; change arceos ref

change arceos ref

Author: 915604903T

Cargo.lock

@@ -13,9 +13,9 @@ lazy_static = { version = "1.4", features = ["spin_no_std"] }
 cfg-if = "1.0"
 
 # System dependent modules provided by ArceOS.
-axalloc = { git = "https://github.com/arceos-hypervisor/arceos.git", rev = "fc85e16" }
-axhal = { git = "https://github.com/arceos-hypervisor/arceos.git", rev = "fc85e16", features = ["paging"] }
-axstd = { git = "https://github.com/arceos-hypervisor/arceos.git", rev = "fc85e16", features = [
+axalloc = { git = "https://github.com/arceos-hypervisor/arceos.git", rev = "5c9ee79" }
+axhal = { git = "https://github.com/arceos-hypervisor/arceos.git", rev = "5c9ee79", features = ["paging"] }
+axstd = { git = "https://github.com/arceos-hypervisor/arceos.git", rev = "5c9ee79", features = [
     "alloc",
     "paging",
     "fs",

arceos-vmm/Cargo.toml

@@ -42,7 +42,7 @@ tock-registers = "0.8.1"
 memoffset = { version = ">=0.6.5", features = ["unstable_const"] }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
-axhal = { git = "https://github.com/arceos-hypervisor/arceos.git", rev = "fc85e16", features = ["hv"] }
+axhal = { git = "https://github.com/arceos-hypervisor/arceos.git", rev = "5c9ee79", features = ["hv"] }
 cortex-a = "8.1.1"
 aarch64-cpu = "9.3"
 smccc = "0.1.1"

crates/axvm/Cargo.toml

@@ -10,7 +10,7 @@ mod vcpu;
 use core::arch::asm;
 use spin::once::Once;
 
-use axhal::arch::register_lower_aarch64_synchronous_handler;
+use axhal::arch::{register_lower_aarch64_irq_handler, register_lower_aarch64_synchronous_handler};
 
 pub use self::device_list::AxArchDeviceList;
 pub use self::pcpu::PerCpu as AxVMArchPerCpuImpl;
@@ -36,3 +36,8 @@ pub fn do_register_lower_aarch64_synchronous_handler() -> AxResult {
     }
     return Ok(());
 }
+
+pub fn do_register_lower_aarch64_irq_handler() -> AxResult {
+    // TODO
+    Ok(())
+}

crates/axvm/src/arch/aarch64/mod.rs

@@ -8,10 +8,10 @@ use aarch64_cpu::registers::*;
 use tock_registers::interfaces::*;
 
 use super::context_frame::VmContext;
-use super::do_register_lower_aarch64_synchronous_handler;
 use super::exception_utils::*;
 use super::sync::{data_abort_handler, hvc_handler};
 use super::ContextFrame;
+use super::{do_register_lower_aarch64_irq_handler, do_register_lower_aarch64_synchronous_handler};
 use axerrno::{AxError, AxResult};
 
 use crate::AxVMHal;
@@ -78,6 +78,7 @@ impl<H: AxVMHal> axvcpu::AxArchVCpu for VCpu<H> {
 
     fn setup(&mut self, _config: Self::SetupConfig) -> AxResult {
         do_register_lower_aarch64_synchronous_handler()?;
+        do_register_lower_aarch64_irq_handler()?;
         self.init_hv();
         Ok(())
     }

crates/axvm/src/arch/aarch64/vcpu.rs

@@ -177,7 +177,7 @@ pub struct AxVMCrateConfig {
     pub dtb_load_addr: Option<usize>,
     pub ramdisk_path: Option<String>,
     pub ramdisk_load_addr: Option<usize>,
-    
+
     disk_path: Option<String>,
 
     /// Memory Information