提交所有：cherry-pick main to vgic-dev

arceos-hypervisor · Sep 12, 2024 · 21798a4 · 21798a4
1 parent 45fd77d
commit 21798a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,13 +6,14 @@ edition = "2021"
 [features]
 
 [dependencies]
-log = "=0.4.19"
+log = "0.4.22"
+
 cfg-if = "1.0"
 serde = { version = "1.0.204", default-features = false, features = ["derive", "alloc"] }
 # System independent crates provided by ArceOS.
 axerrno = "0.1.0"
 memory_addr = "0.3.0"
 axaddrspace  = { path = "../axaddrspace" }
 axdevice_base = { path = "../axdevice_crates/axdevice_base" }
-
-vgic = { path = "../axdevice_crates/vgic" }
+spin = "0.9"
+arm_vgic = { path = "../arm_vgic" }
diff --git a/src/device.rs b/src/device.rs
@@ -2,14 +2,15 @@ use crate::AxVmDeviceConfig;
 
 use alloc::sync::Arc;
 use alloc::vec::Vec;
+use spin::Mutex;
 
 use axaddrspace::GuestPhysAddr;
 use axdevice_base::EmulatedDeviceConfig;
 use axdevice_base::{BaseDeviceOps, EmuDeviceType};
 use axerrno::AxResult;
 
 /* Devs */
-use vgic::Vgic;
+use arm_vgic::Vgic;
 
 /// represent A vm own devices
 pub struct AxVmDevices {