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

Author: szy

.github/workflows/qemu-aarch64.toml

@@ -0,0 +1,17 @@
+args = [
+  "-nographic",
+  "-cpu",
+  "cortex-a72",
+  "-machine",
+  "virt,virtualization=on,gic-version=3",
+  "-smp",
+  "1",
+  "-append",
+  "root=/dev/vda rw init=/init",
+  "-m",
+  "8g",
+]
+fail_regex = []
+success_regex = []
+to_bin = true
+uefi = false

.github/workflows/test.yml renamed to .github/workflows/test-board.yml

@@ -1,10 +1,10 @@
-name: Test CI
+name: Test for BOARD
 
 on: [push, pull_request, workflow_dispatch]
 
 jobs:
-  board-test:
-    name: "Test ${{ matrix.board }} - ${{ matrix.vmconfigs_name }}"
+  test-board:
+    name: "Test board: ${{ matrix.board }} - ${{ matrix.vmconfigs_name }}"
     strategy:
       matrix:
         include:
@@ -19,16 +19,16 @@ jobs:
             vmconfigs: configs/vms/linux-aarch64-e2000-smp1.toml
             vmconfigs_name: Linux
             vmimage_name: phytiumpi_linux.tar.gz
-          - 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
-          - 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
+        #   - 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
+        #   - 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
       fail-fast: false
     runs-on:
       - self-hosted
@@ -39,7 +39,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install dependencies (${{ matrix.board_name }})
+      - name: Install dependencies
         run: cargo +stable install -f --git https://github.com/ZR233/ostool  ostool
 
       - name: Download images and patch VM configs

.github/workflows/test-qemu.yml

@@ -0,0 +1,57 @@
+name: Test for QEMU
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  test-qemu:
+    name: "Test qemu: ${{ matrix.arch }} - ${{ matrix.vmconfigs_name }}"
+    strategy:
+      matrix:
+        include:
+          - arch: aarch64
+            vmconfigs: configs/vms/arceos-aarch64-qemu-smp1.toml
+            vmconfigs_name: ArceOS
+            vmimage_name: qemu_arceos_aarch64
+          # - arch: riscv64
+          #   vmconfigs: configs/vms/arceos-riscv64-qemu-smp1.toml
+          #   vmconfigs_name: ArceOS
+          #   vmimage_name: qemu_arceos_riscv64
+          # - arch: x86_64
+          #   vmconfigs: configs/vms/arceos-x86_64-qemu-smp1.toml
+          #   vmconfigs_name: ArceOS
+          #   vmimage_name: qemu_arceos_x86_64
+      fail-fast: false
+    runs-on:
+      - self-hosted
+      - linux
+      - intel
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: cargo +stable install -f --git https://github.com/ZR233/ostool  ostool
+
+      - name: Download images and patch VM configs
+        run: |
+          echo "Downloading guest images and patching VM config files..."
+          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:]]*$//')
+            cargo xtask image download $img
+            sed -i 's|^kernel_path[[:space:]]*=.*|kernel_path = "/tmp/axvisor/'"$img"'/'"$img"'"|' "$config"
+            echo "Updated kernel_path in $config"
+          done
+
+      - name: Run tests
+        run: |
+          export RUST_LOG=debug
+          cargo xtask qemu \
+            --build-config configs/board/qemu-${{ matrix.arch }}.toml \
+            --qemu-config .github/workflows/qemu-${{ matrix.arch }}.toml \
+            --vmconfigs ${{ matrix.vmconfigs }}

.github/workflows/uboot.toml

@@ -12,6 +12,7 @@ success_regex = [
     "Hello World!",
     "root@firefly:~#",
     "root@phytium-Ubuntu:~#",
+    "Welcome to Phytium Buildroot",
 ]
 
 [net]