feat: 更新Cargo.toml和Cargo.lock，添加新依赖项并调整现有依赖项配置

Author: ZR233

Cargo.lock

@@ -23,7 +23,6 @@ license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPubL-2.0 OR MulanPSL2"
 version = "0.1.0"
 
 [workspace.dependencies]
-axvm-types = "0.1"
 bitflags = "2.2"
 cfg-if = "1.0"
 cpumask = "0.1.0"
@@ -85,10 +84,11 @@ axdevice = {git = "https://github.com/arceos-hypervisor/axdevice.git"}
 axdevice_base = "0.1"
 axvisor_api = "0.1"
 driver = {path = "modules/driver"}
+axvm-types = {path = "modules/axvm-types"}
 
 # platform
 axplat-x86-qemu-q35 = {path = "platform/x86-qemu-q35"}
-axvmconfig = "0.1"
+axvmconfig = {version ="0.1", default-features = false }
 
 [patch.crates-io]
 arm_vcpu = {path = "modules/arm_vcpu"}
@@ -97,7 +97,6 @@ axaddrspace = {path = "modules/axaddrspace"}
 axdevice_base = {path = "modules/axdevice_base"}
 axvcpu = {path = "modules/axvcpu"}
 axvisor_api = {path = "modules/axvisor_api"}
-axvm-types = {path = "modules/axvm-types"}
 axvmconfig = {path = "modules/axvmconfig"}
 x86_vcpu = {path = "modules/x86_vcpu"}
 x86_vlapic = {path = "modules/x86_vlapic"}

Cargo.toml

@@ -7,11 +7,12 @@ name = "axvisor"
 [features]
 # Note: ept-level-4 support is now provided through dynamic page table selection in axaddrspace
 # The feature gate is no longer needed
+dyn-plat = ["axstd/myplat", "axstd/driver-dyn", "axruntime/driver-dyn"]
 ept-level-4 = ["axvm/4-level-ept"]
 fs = ["axstd/fs", "axruntime/fs"]
-dyn-plat = ["axstd/myplat", "axstd/driver-dyn", "axruntime/driver-dyn"]
 
 [dependencies]
+anyhow = {version = "1.0", default-features = false}
 bitflags.workspace = true
 cfg-if.workspace = true
 cpumask.workspace = true
@@ -22,7 +23,6 @@ lazyinit = "0.2"
 log = "0.4"
 spin = "0.9"
 timer_list = "0.1.0"
-anyhow = {version = "1.0", default-features = false}
 
 # System dependent modules provided by ArceOS.
 axstd = {workspace = true, features = [
@@ -39,6 +39,7 @@ axhvc.workspace = true
 axruntime = {workspace = true, features = ["alloc", "irq", "paging", "smp", "multitask"]}
 axvcpu.workspace = true
 axvm.workspace = true
+axvmconfig = {workspace = true}
 
 # System independent crates provided by ArceOS, these crates could be imported by remote url. 
 axerrno.workspace = true
@@ -58,16 +59,15 @@ axdevice.workspace = true
 axdevice_base = "0.1"
 # axvisor_api = "0.1"
 driver.workspace = true
-toml = { version= "0.9", default-features = false}
-
+toml = {version = "0.9", default-features = false}
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
 aarch64-cpu-ext = "0.1"
 arm-gic-driver = {version = "0.15.5", features = ["rdif"]}
 
 [build-dependencies]
+anyhow = "1.0"
 prettyplease = "0.2"
 quote = "1.0"
 syn = "2.0"
 toml.workspace = true
-anyhow = "1.0"

kernel/Cargo.toml

@@ -2,7 +2,10 @@ use std::string::ToString;
 
 use alloc::vec::Vec;
 use anyhow::bail;
-use axvm::{AxVMConfig, Vm, config::AxVMCrateConfig};
+use axvm::{
+    AxVMConfig, CpuId, GuestPhysAddr, Vm,
+    config::{AxVCpuConfig, AxVMCrateConfig, CpuNumType, VMImagesConfig},
+};
 
 use crate::vmm::vm_list::VMRef;
 
@@ -31,6 +34,35 @@ pub fn get_guest_prelude_vmconfig() -> anyhow::Result<Vec<AxVMCrateConfig>> {
     Ok(vm_configs)
 }
 
+pub fn build_vmconfig(cfg: AxVMCrateConfig) -> anyhow::Result<AxVMConfig> {
+    let mut cpu_num = CpuNumType::Alloc(1);
+    if let Some(num) = cfg.base.cpu_num {
+        cpu_num = CpuNumType::Alloc(num);
+    }
+    if let Some(ref ids) = cfg.base.cpu_ids {
+        cpu_num = CpuNumType::Fixed(ids.iter().map(|&id| CpuId::new(id)).collect());
+    }
+
+    let image_config = super::images::load_images(&cfg)?;
+
+    Ok(AxVMConfig {
+        id: cfg.base.id,
+        name: cfg.base.name,
+        cpu_num,
+        cpu_config: AxVCpuConfig {
+            bsp_entry: GuestPhysAddr::from(cfg.kernel.entry_point),
+            ap_entry: GuestPhysAddr::from(cfg.kernel.entry_point),
+        },
+        image_config,
+        emu_devices: cfg.devices.emu_devices,
+        pass_through_devices: cfg.devices.passthrough_devices,
+        excluded_devices: cfg.devices.excluded_devices,
+        pass_through_addresses: cfg.devices.passthrough_addresses,
+        spi_list: Vec::new(),
+        interrupt_mode: cfg.devices.interrupt_mode,
+    })
+}
+
 #[allow(clippy::module_inception, dead_code)]
 pub mod config {
     use alloc::string::String;