Merge remote-tracking branch 'origin/next2' into rewrite2

Author: ZR233

.github/workflows/qemu-aarch64.toml

@@ -0,0 +1,17 @@
+args = [
+  "-nographic",
+  "-cpu",
+  "cortex-a72",
+  "-machine",
+  "virt,virtualization=on,gic-version=3",
+  "-smp",
+  "4",
+  "-append",
+  "root=/dev/vda rw init=/init",
+  "-m",
+  "8g",
+]
+fail_regex = []
+success_regex = ["Hello, world!"]
+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:
@@ -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
@@ -39,26 +39,22 @@ 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
         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

@@ -0,0 +1,58 @@
+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
+            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
+
+      - 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

@@ -7,11 +7,13 @@ 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:~#",
+    "Welcome to Phytium Buildroot",
+    "Last login: *",
 ]
 
 [net]

Cargo.lock

@@ -43,9 +43,6 @@ axstd = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.
   "irq",
   "multitask",
   "smp", # "page-alloc-64g",
-  "myplat",
-  "driver-dyn",
-  # "alloc-buddy"
 ]}
 
 axalloc = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}

Cargo.toml

@@ -1,13 +1,13 @@
 cargo_args = []
 features = [
-    # "ept-level-4",
-    "axstd/myplat",
-    "axstd/bus-mmio",
-    "driver/sdmmc",
-    "driver/rk3588-clk",
-    "fs",
+  # "ept-level-4",
+  "dyn-plat",
+  "axstd/bus-mmio",
+  "driver/sdmmc",
+  "driver/rk3588-clk",
+  "fs",
 ]
 log = "Info"
 target = "aarch64-unknown-none-softfloat"
 to_bin = true
-vm_configs = []
+vm_configs = []

configs/board/orangepi-5-plus.toml

@@ -1,7 +1,7 @@
 cargo_args = []
 features = [
     # "ept-level-4",
-    "axstd/myplat",
+    "dyn-plat",
     "axstd/bus-mmio",
 ]
 log = "Info"

configs/board/phytiumpi.toml

@@ -1,8 +1,8 @@
 cargo_args = []
 features = [
-    # "ept-level-4",
-    "axstd/myplat",
+    "ept-level-4",
     "axstd/bus-mmio",
+    "dyn-plat",
 ]
 log = "Info"
 target = "aarch64-unknown-none-softfloat"