Merge branch 'arceos-hypervisor:next2' into next2

Author: YanLien

.github/workflows/qemu-aarch64.toml

@@ -6,12 +6,16 @@ args = [
   "virt,virtualization=on,gic-version=3",
   "-smp",
   "4",
+  "-device",
+  "virtio-blk-device,drive=disk0",
+  "-drive",
+  "id=disk0,if=none,format=raw,file=${ROOTFS_DIR}/rootfs.img",
   "-append",
   "root=/dev/vda rw init=/init",
   "-m",
   "8g",
 ]
 fail_regex = []
-success_regex = ["Hello, world!"]
+success_regex = []
 to_bin = true
 uefi = false

.github/workflows/test-qemu.yml

@@ -47,10 +47,18 @@ jobs:
             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"
+            
+            # Check if rootfs.img exists and export ROOTFS_DIR if it does
+            if [ -f "/tmp/axvisor/$img/rootfs.img" ]; then
+              ROOTFS_DIR="/tmp/axvisor/$img"
+              echo "ROOTFS_DIR=$ROOTFS_DIR" >> $GITHUB_ENV
+              echo "Found rootfs.img at /tmp/axvisor/$img/, exported ROOTFS_DIR=$ROOTFS_DIR"
+            fi
           done
 
       - name: Run tests
         run: |
+          export ROOTFS_DIR="${{ env.ROOTFS_DIR }}"
           export RUST_LOG=debug
           cargo xtask qemu \
             --build-config configs/board/qemu-${{ matrix.arch }}.toml \