Merge remote-tracking branch 'upstream/next2' into next2

Author: szy

.github/workflows/qemu-aarch64.toml

@@ -5,13 +5,13 @@ args = [
   "-machine",
   "virt,virtualization=on,gic-version=3",
   "-smp",
-  "1",
+  "4",
   "-append",
   "root=/dev/vda rw init=/init",
   "-m",
   "8g",
 ]
 fail_regex = []
-success_regex = []
+success_regex = ["Hello, world!"]
 to_bin = true
 uefi = false

.github/workflows/test-board.yml

@@ -14,21 +14,21 @@ jobs:
           - board: phytiumpi
             vmconfigs: configs/vms/arceos-aarch64-e2000-smp1.toml
             vmconfigs_name: ArceOS
-            vmimage_name: phytiumpi_arceos.tar.gz
+            vmimage_name: phytiumpi_arceos
           - board: phytiumpi
             vmconfigs: configs/vms/linux-aarch64-e2000-smp1.toml
             vmconfigs_name: Linux
-            vmimage_name: phytiumpi_linux.tar.gz
+            vmimage_name: phytiumpi_linux
         #   - board: roc-rk3568-pc
         #     vmconfigs: configs/vms/arceos-aarch64-rk3568-smp1.toml
         #     vmconfigs_name: ArceOS
-        #     # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos.tar.gz,roc-rk3568-pc_linux.tar.gz[,...]
-        #     vmimage_name: roc-rk3568-pc_arceos.tar.gz
+        #     # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...]
+        #     vmimage_name: roc-rk3568-pc_arceos
         #   - board: roc-rk3568-pc
         #     vmconfigs: configs/vms/linux-aarch64-rk3568-smp1.toml
         #     vmconfigs_name: Linux
-        #     # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos.tar.gz,roc-rk3568-pc_linux.tar.gz[,...]
-        #     vmimage_name: roc-rk3568-pc_linux.tar.gz
+        #     # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...]
+        #     vmimage_name: roc-rk3568-pc_linux
       fail-fast: false
     runs-on:
       - self-hosted
@@ -45,20 +45,16 @@ jobs:
       - name: Download images and patch VM configs
         run: |
           echo "Downloading guest images and patching VM config files..."
-          mkdir -p /tmp/images
           IFS=',' read -ra CONFIGS <<< "${{ matrix.vmconfigs }}"
           IFS=',' read -ra IMAGES <<< "${{ matrix.vmimage_name }}"
           for i in "${!CONFIGS[@]}"; do
             img="${IMAGES[$i]}"
             img=$(echo "$img" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
             config="${CONFIGS[$i]}"
             config=$(echo "$config" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-            img_name="${img%.tar.gz}"
-
-            echo "Downloading $img and patching $config..."
-            wget -P /tmp/images https://github.com/arceos-hypervisor/axvisor-guest/releases/latest/download/$img
-            tar -xzf /tmp/images/$img -C /tmp/images
-            sed -i 's|^kernel_path[[:space:]]*=.*|kernel_path = "/tmp/images/'"$img_name"'"|' "$config"
+            cargo xtask image download $img
+            img_name="${{ matrix.board }}"
+            sed -i 's|^kernel_path[[:space:]]*=.*|kernel_path = "/tmp/axvisor/'"$img"'/'"$img_name"'"|' "$config"
             echo "Updated kernel_path in $config"
           done
 

.github/workflows/test-qemu.yml

@@ -44,7 +44,8 @@ jobs:
             config="${CONFIGS[$i]}"
             config=$(echo "$config" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
             cargo xtask image download $img
-            sed -i 's|^kernel_path[[:space:]]*=.*|kernel_path = "/tmp/axvisor/'"$img"'/'"$img"'"|' "$config"
+            img_name="qemu-${{ matrix.arch }}"
+            sed -i 's|^kernel_path[[:space:]]*=.*|kernel_path = "/tmp/axvisor/'"$img"'/'"$img_name"'"|' "$config"
             echo "Updated kernel_path in $config"
           done
 

.github/workflows/uboot.toml

@@ -7,8 +7,8 @@ fail_regex = [
 ]
 serial = "${env:BOARD_COMM_UART_DEV}"
 success_regex = [
-  "Welcome to AxVisor Shell!",
-  "All tests passed!",
+    "Welcome to AxVisor Shell!",
+    "All tests passed!",
     "Hello World!",
     "root@firefly:~#",
     "root@phytium-Ubuntu:~#",

scripts/ostool/qemu-aarch64.toml

@@ -5,7 +5,7 @@ args = [
   "-machine",
   "virt,virtualization=on,gic-version=3",
   "-smp",
-  "1",
+  "4",
   "-device",
   "virtio-blk-device,drive=disk0",
   "-drive",

xtask/Cargo.toml

@@ -11,7 +11,7 @@ clap = { version = "4.4", features = ["derive"] }
 colored = "3"
 ostool = "0.8"
 jkconfig = "0.1"
-reqwest = "0.11"
+reqwest = "0.12"
 schemars = { version = "1", features = ["derive"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"

xtask/src/cargo.rs

@@ -5,8 +5,9 @@ use ostool::run::cargo::CargoRunnerKind;
 use crate::ctx::Context;
 
 impl Context {
-    pub async fn run_qemu(&mut self) -> anyhow::Result<()> {
+    pub async fn run_qemu(&mut self, config_path: Option<PathBuf>) -> anyhow::Result<()> {
         let build_config = self.load_config()?;
+        
         let arch = if build_config.target.contains("aarch64") {
             Arch::Aarch64
         } else if build_config.target.contains("x86_64") {
@@ -17,9 +18,14 @@ impl Context {
                 build_config.target
             ));
         };
+        
+        let config_path = if let Some(path) = config_path {
+            path
+        } else {
+            PathBuf::from(format!(".qemu-{arch:?}.toml").to_lowercase())
+        };
 
-        let config_path = PathBuf::from(format!(".qemu-{arch:?}.toml").to_lowercase());
-
+        // 如果配置文件不存在，从默认位置复制
         if !config_path.exists() {
             fs::copy(
                 PathBuf::from("scripts")