update

Author: ZR233

Cargo.lock

@@ -1,15 +1,15 @@
 [workspace]
+exclude = [
+  "modules/axvisor_api",
+  "arceos",
+]
 members = [
   "crates/*",
   "modules/*",
   "platform/*",
   "xtask",
   "kernel",
 ]
-exclude = [
-  "modules/axvisor_api",
-  "arceos",
-]
 resolver = "3"
 
 [profile.release]
@@ -23,6 +23,7 @@ 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"
@@ -34,7 +35,7 @@ log = "0.4"
 spin = "0.9"
 timer_list = "0.1"
 toml = "0.9"
-axvm-types = "0.1"
+vm-allocator = {git = "https://github.com/rust-vmm/vm-allocator.git", ref = "c66cfac", default-features = false }
 
 # System dependent modules provided by ArceOS.
 axstd = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1", features = [
@@ -57,8 +58,6 @@ axmm = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1
 axnet = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
 axtask = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
 
-
-
 axplat = {git = "https://github.com/arceos-hypervisor/axplat_crates.git", tag = "vmm-v0.3.0"}
 
 # System dependent modules provided by ArceOS-Hypervisor.
@@ -92,21 +91,21 @@ axplat-x86-qemu-q35 = {path = "platform/x86-qemu-q35"}
 axvmconfig = "0.1"
 
 [patch.crates-io]
-axvmconfig = { path = "modules/axvmconfig" }
-axvisor_api = { path = "modules/axvisor_api" }
-axdevice_base = { path = "modules/axdevice_base" }
-axaddrspace = { path = "modules/axaddrspace" }
 arm_vcpu = {path = "modules/arm_vcpu"}
 arm_vgic = {path = "modules/arm_vgic"}
+axaddrspace = {path = "modules/axaddrspace"}
+axdevice_base = {path = "modules/axdevice_base"}
 axvcpu = {path = "modules/axvcpu"}
-x86_vlapic = {path = "modules/x86_vlapic"}
-x86_vcpu = {path = "modules/x86_vcpu"}
+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"}
 
 [patch."https://github.com/arceos-hypervisor/axdevice".axdevice]
 path = "modules/axdevice"
 
 [patch."https://github.com/arceos-hypervisor/arceos"]
+axalloc = {path = "modules/axalloc"}
 axconfig = {path = "modules/axconfig"}
 axruntime = {path = "modules/axruntime"}
-axalloc = {path = "modules/axalloc"}

Cargo.toml

@@ -25,7 +25,7 @@ fn main() {
     // info!("Hardware support: {:?}", axvm::has_hardware_support());
 
     vmm::init();
-    vmm::start();
+    vmm::start_preconfigured_vms().unwrap();
 
     info!("[OK] Default guest initialized");
 

kernel/src/main.rs

@@ -2,19 +2,11 @@ use std::string::ToString;
 
 use alloc::vec::Vec;
 use anyhow::bail;
-use axvm::config::AxVMCrateConfig;
+use axvm::{AxVMConfig, Vm, config::AxVMCrateConfig};
 
-pub fn init_guest_vms() -> anyhow::Result<()> {
-    let vm_configs = get_guest_prelude_vmconfig()?;
+use crate::vmm::vm_list::VMRef;
 
-    for config in vm_configs.iter() {
-        init_guest_vm(config)?;
-    }
-
-    Ok(())
-}
-
-fn get_guest_prelude_vmconfig() -> anyhow::Result<Vec<AxVMCrateConfig>> {
+pub fn get_guest_prelude_vmconfig() -> anyhow::Result<Vec<AxVMCrateConfig>> {
     let mut vm_configs = Vec::new();
     // First try to get configs from filesystem if fs feature is enabled
     let mut gvm_raw_configs = config::filesystem_vm_configs();
@@ -39,12 +31,6 @@ fn get_guest_prelude_vmconfig() -> anyhow::Result<Vec<AxVMCrateConfig>> {
     Ok(vm_configs)
 }
 
-fn init_guest_vm(config: &AxVMCrateConfig) -> anyhow::Result<()> {
-    debug!("Initializing guest VM `{}`", config.base.name);
-
-    Ok(())
-}
-
 #[allow(clippy::module_inception, dead_code)]
 pub mod config {
     use alloc::string::String;

kernel/src/vmm/config.rs

@@ -4,14 +4,16 @@
 pub mod config;
 // pub mod images;
 // pub mod timer;
-// pub mod vm_list;
+pub mod vm_list;
 
 // #[cfg(target_arch = "aarch64")]
 // pub mod fdt;
 
 use core::sync::atomic::{AtomicUsize, Ordering};
 use std::os::arceos::api::task::AxWaitQueueHandle;
 
+use axvm::AxVMConfig;
+
 // pub use timer::init_percpu as init_timer_percpu;
 
 static VMM: AxWaitQueueHandle = AxWaitQueueHandle::new();
@@ -26,41 +28,6 @@ pub fn init() {
     info!("Initializing VMM...");
 
     axvm::enable_viretualization().unwrap();
-
-    // Initialize guest VM according to config file.
-    config::init_guest_vms().unwrap();
-
-    // Setup vcpus, spawn axtask for primary VCpu.
-    info!("Setting up vcpus...");
-    // for vm in vm_list::get_vm_list() {
-    // vcpus::setup_vm_primary_vcpu(vm);
-    // }
-}
-
-/// Start the VMM.
-pub fn start() {
-    info!("VMM starting, booting VMs...");
-    // for vm in vm_list::get_vm_list() {
-    //     match vm.boot() {
-    //         Ok(_) => {
-    //             // vcpus::notify_primary_vcpu(vm.id());
-    //             RUNNING_VM_COUNT.fetch_add(1, Ordering::Release);
-    //             info!("VM[{}] boot success", vm.id())
-    //         }
-    //         Err(err) => warn!("VM[{}] boot failed, error {:?}", vm.id(), err),
-    //     }
-    // }
-
-    // // Do not exit until all VMs are stopped.
-    // task::ax_wait_queue_wait_until(
-    //     &VMM,
-    //     || {
-    //         let vm_count = RUNNING_VM_COUNT.load(Ordering::Acquire);
-    //         info!("a VM exited, current running VM count: {vm_count}");
-    //         vm_count == 0
-    //     },
-    //     None,
-    // );
 }
 
 pub fn get_running_vm_count() -> usize {
@@ -74,3 +41,20 @@ pub fn add_running_vm_count(count: usize) {
 pub fn sub_running_vm_count(count: usize) {
     RUNNING_VM_COUNT.fetch_sub(count, Ordering::Release);
 }
+
+pub fn start_preconfigured_vms() -> anyhow::Result<()> {
+    // Initialize guest VM according to config file.
+    for config in config::get_guest_prelude_vmconfig()? {
+        let vm_config = AxVMConfig::from(config);
+        start_vm(vm_config)?;
+    }
+    Ok(())
+}
+
+pub fn start_vm(config: AxVMConfig) -> anyhow::Result<()> {
+    debug!("Starting guest VM `{}`", config.name());
+    let vm = axvm::Vm::new(config)?;
+    let vm = vm_list::push_vm(vm);
+    vm.boot()?;
+    Ok(())
+}

kernel/src/vmm/mod.rs

@@ -1,9 +1,8 @@
-use alloc::collections::BTreeMap;
-use alloc::vec::Vec;
+use alloc::{collections::BTreeMap, sync::Arc, vec::Vec};
 
 use spin::Mutex;
 
-use crate::vmm::VMRef;
+pub type VMRef = Arc<axvm::Vm>;
 
 /// Represents a list of VMs,
 /// stored in a BTreeMap where the key is the VM ID and the value is a reference to the VM.
@@ -71,8 +70,10 @@ static GLOBAL_VM_LIST: Mutex<VMList> = Mutex::new(VMList::new());
 /// # Arguments
 ///
 /// * `vm` - A reference to the VM instance.
-pub fn push_vm(vm: VMRef) {
-    GLOBAL_VM_LIST.lock().push_vm(vm.id(), vm)
+pub fn push_vm(vm: axvm::Vm) -> VMRef {
+    let vm = Arc::new(vm);
+    GLOBAL_VM_LIST.lock().push_vm(vm.id().into(), vm.clone());
+    vm
 }
 
 /// Removes a VM from the global VM list by its ID.