feat: Add interactive shell support and improve VM management

Author: YanLien

.github/workflows/test.yml

@@ -41,7 +41,7 @@ jobs:
         cargo version
         export DISK_IMG="${{ github.workspace }}/disk-aarch64.img"
         export VM_CONFIGS="$(pwd)/configs/vms/nimbos-aarch64-qemu-smp1.toml"
-        ./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs,ept-level-4 --arceos-args DISK_IMG=$DISK_IMG,BUS=mmio,BLK=y,MEM=8g
+        ./auto_interrupt.sh ./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs,ept-level-4 --arceos-args DISK_IMG=$DISK_IMG,BUS=mmio,BLK=y,MEM=8g
 
   aarch64-generic-phytiumpi:
     runs-on: [self-hosted, linux, phytiumpi]
@@ -135,4 +135,4 @@ jobs:
         cargo version
         export DISK_IMG="${{ github.workspace }}/disk-x86_64.img"
         export VM_CONFIGS="$(pwd)/configs/vms/nimbos-x86_64-qemu-smp1.toml"
-        ./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs --arceos-args DISK_IMG=$DISK_IMG,BLK=y
+        ./auto_interrupt.sh ./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs --arceos-args DISK_IMG=$DISK_IMG,BLK=y

Cargo.lock

@@ -28,6 +28,7 @@ lazyinit = "0.2"
 log = "=0.4.21"
 spin = "0.9"
 timer_list = "0.1.0"
+lazy_static = { version = "1.5", default-features = false, features = ["spin_no_std"] }
 
 # System dependent modules provided by ArceOS.
 axstd = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.3.1", features = [

Cargo.toml

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]; then
+    echo "用法: $0 <命令> [参数...]"
+    echo "示例: $0 ostool run uboot"
+    exit 1
+fi
+
+COMMAND=("$@")
+echo "执行命令: ${COMMAND[*]}"
+
+"${COMMAND[@]}" 2>&1 | while IFS= read -r line; do
+    echo "输出: $line"
+
+    if [[ "$line" == *"[OK] Default guest initialized"* ]]; then
+        echo "检测到Shell就绪信号！发送中断信号..."
+        
+        PROCESS_NAME=$(basename "${COMMAND[0]}")
+        PIDS=$(pgrep -f "${COMMAND[0]}")
+        
+        for PID in $PIDS; do
+            echo "发送 SIGINT 到进程 $PID"
+            kill -INT "$PID" 2>/dev/null
+        done
+        
+        break
+    fi
+done
+
+echo "完成"

auto_interrupt.sh

@@ -23,7 +23,7 @@ image_location = "memory"
 # The load address of the kernel image.
 kernel_load_addr = 0x20_2008_0000
 ## The file path of the kernel image.
-kernel_path = "/path/to/arceos_aarch64-dyn_smp1.bin"
+kernel_path = "/guest/arceos/arceos_aarch64-dyn_smp2.bin"
 ## The file path of the device tree blob (DTB).
 dtb_load_addr = 0x20_2000_0000
 #dtb_path = "/path/to/axvisor/configs/vms/arceos-aarch64-e2000_smp2.dtb"

configs/vms/arceos-aarch64-e2000-smp2.toml

@@ -20,9 +20,9 @@ phys_cpu_sets = [2]
 entry_point = 0x4020_0000
 # The location of image: "memory" | "fs".
 # Load from file system.
-image_location = "memory"
+image_location = "fs"
 # The file path of the kernel image.
-kernel_path = "path/to/kernel"
+kernel_path = "helloworld_aarch64-qemu-virt.bin"
 # The load address of the kernel image.
 kernel_load_addr = 0x4020_0000
 ## Load from memory

configs/vms_bkp/arceos-aarch64.toml

@@ -1,8 +1,11 @@
 #![no_std]
 #![no_main]
 
+use std::println;
+
 #[macro_use]
 extern crate log;
+
 #[macro_use]
 extern crate alloc;
 
@@ -17,6 +20,9 @@ extern crate axplat_aarch64_roc_rk3568_pc;
 #[cfg(feature = "plat-x86-qemu-q35")]
 extern crate axplat_x86_qemu_q35;
 
+#[cfg(feature = "fs")]
+mod shell;
+
 mod hal;
 mod logo;
 mod task;
@@ -33,5 +39,8 @@ fn main() {
     vmm::init();
     vmm::start();
 
-    info!("VMM shutdown");
+    println!("[OK] Default guest initialized");
+
+    #[cfg(feature = "fs")]
+    shell::console_init();
 }