fixes

Author: aarkegz

Cargo.toml

@@ -118,19 +118,12 @@ rdrive = "0.20"
 rd-block = "0.1"
 pcie = "0.5.0"
 
-# platform
-axplat-riscv64-qemu-virt = {path = "platform/riscv64-qemu-virt"}
-
 # Optional driver dependencies
 sdmmc = { version = "0.1", default-features = false, features = ["pio"], optional = true }
 rk3588-clk = { version = "0.1", optional = true }
 rockchip-pm = { version = "0.4", optional = true }
 phytium-mci = { version = "0.1", default-features = false, features = ["pio"], optional = true }
 
-[target.'cfg(target_arch = "aarch64")'.dependencies]
-aarch64-cpu-ext = "0.1"
-arm-gic-driver = {version = "0.17", features = ["rdif"]}
-
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 axplat-x86-qemu-q35 = { version = "0.2.0", default-features = false, features = [
     "reboot-on-system-off",
@@ -139,6 +132,13 @@ axplat-x86-qemu-q35 = { version = "0.2.0", default-features = false, features =
 ] }
 axconfig = { version = "=0.3.0-preview.3", features = ["plat-dyn"] }
 
+[target.'cfg(target_arch = "aarch64")'.dependencies]
+aarch64-cpu-ext = "0.1"
+arm-gic-driver = {version = "0.17", features = ["rdif"]}
+
+[target.'cfg(target_arch = "riscv64")'.dependencies]
+axplat-riscv64-qemu-virt = "0.3.1-pre.6"
+
 # xtask dependencies (only used when xtask feature is enabled)
 [target.'cfg(any(windows, unix))'.dependencies]
 anyhow = { version = "1.0", optional = true }

src/hal/arch/aarch64/api.rs

@@ -95,10 +95,10 @@ impl ArchIf for ArchImpl {
             .lock()
             .unwrap();
         if let Some(gic) = gic.typed_mut::<arm_gic_driver::v2::Gic>() {
-            return u32::from(gic.cpu_interface().ack()) as _
+            return u32::from(gic.cpu_interface().ack()) as _;
         }
         if let Some(gic) = gic.typed_mut::<arm_gic_driver::v3::Gic>() {
-            return gic.cpu_interface().ack1().to_u32() as _
+            return gic.cpu_interface().ack1().to_u32() as _;
         }
         panic!("No GIC driver found");
     }

src/hal/impl_host.rs

@@ -5,7 +5,6 @@ struct HostImpl;
 #[axvisor_api::api_impl]
 impl HostIf for HostImpl {
     fn get_host_cpu_num() -> usize {
-        // std::os::arceos::modules::axconfig::plat::CPU_NUM
-        axruntime::cpu_count()
+        std::os::arceos::modules::axhal::cpu_num()
     }
 }

src/hal/impl_vmm.rs

@@ -3,7 +3,6 @@ use std::os::arceos::modules::{axhal, axtask};
 use axaddrspace::{HostPhysAddr, HostVirtAddr};
 use axerrno::{AxResult, ax_err_type};
 use axvisor_api::vmm::{InterruptVector, VCpuId, VCpuSet, VMId, VmmIf};
-use axvm::AxVMHal;
 
 use crate::{task::AsVCpuTask, vmm};
 

src/hal/mod.rs

@@ -12,15 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::os::arceos::{
-    self,
-    modules::{axhal::percpu::this_cpu_id},
-};
+use std::os::arceos::{self, modules::axhal::percpu::this_cpu_id};
 
-use page_table_multiarch::PagingHandler;
 use arceos::modules::axhal;
 use axaddrspace::{AxMmHal, HostPhysAddr, HostVirtAddr};
 use axvm::AxVMPerCpu;
+use page_table_multiarch::PagingHandler;
 
 #[cfg_attr(target_arch = "aarch64", path = "arch/aarch64/mod.rs")]
 #[cfg_attr(target_arch = "x86_64", path = "arch/x86_64/mod.rs")]