Next

.github/workflows/actions/setup-nimbos-guest-image/action.yml

@@ -34,7 +34,9 @@ runs:
   steps:
   - name: Make temporary directory
     shell: bash
-    run: mkdir -p temp
+    run: |
+      sudo rm -rf temp
+      mkdir -p temp
   - name: Download NimbOS
     uses: dsaltares/[email protected]
     with:
@@ -59,7 +61,7 @@ runs:
   - name: Create Image
     shell: bash
     run: |
-      make DISK_IMG=${{ inputs.disk-path }} disk_img
+      ./axvisor.sh disk_img --image ${{ inputs.disk-path }}
       sudo mkdir -p img
       sudo chown root:root temp/*
       sudo mount ${{ inputs.disk-path }} img

.github/workflows/build.yml

@@ -1,15 +1,14 @@
 name: Build, fmt, and clippy
 
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   clippy:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        arch: [x86_64, riscv64, aarch64]
-        rust-toolchain: [nightly-2024-12-25, nightly]
+        rust-toolchain: [nightly-2025-05-20, nightly]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
@@ -18,19 +17,19 @@ jobs:
       with:
         toolchain: ${{ matrix.rust-toolchain }}
         components: rust-src, clippy, rustfmt
-        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none, aarch64-unknown-none-softfloat
+        targets: x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat
     - name: Check rust version
       run: rustc --version --verbose
     - name: Clippy the repo
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make ARCH=${{ matrix.arch }} clippy
+      run: ./axvisor.sh clippy
 
   fmt:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        rust-toolchain: [nightly-2024-12-25, nightly]
+        rust-toolchain: [nightly-2025-05-20, nightly]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
@@ -51,8 +50,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        arch: [x86_64, riscv64, aarch64]
-        rust-toolchain: [nightly-2024-12-25, nightly]
+        plat: [aarch64-generic, x86-qemu-q35]
+        rust-toolchain: [nightly-2025-05-20, nightly]
     env:
       RUSTUP_TOOLCHAIN: ${{ matrix.rust-toolchain }}
     steps:
@@ -66,4 +65,5 @@ jobs:
     - run: cargo install cargo-binutils
     - name: Build the repo
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-      run: make ARCH=${{ matrix.arch }} build
+      run: | 
+        ./axvisor.sh build --plat ${{ matrix.plat }}

.github/workflows/test.yml

@@ -1,20 +1,19 @@
 name: Test CI
 
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 env:
   qemu-version: 8.2.0
   arceos-apps: '68054e8'
 
 jobs:
-  test_local:
-    runs-on: ${{ matrix.os }}
+  aarch64-generic-qemu:
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        arch: [riscv64, aarch64]
-        rust-toolchain: [nightly-2024-12-25, nightly]
+        plat: [aarch64-generic]
+        rust-toolchain: [nightly-2025-05-20, nightly]
     steps:
     - uses: actions/checkout@v4
     - uses: dtolnay/rust-toolchain@stable
@@ -26,124 +25,114 @@ jobs:
     - uses: arceos-org/[email protected]
       with:
         version: ${{ env.qemu-version }}
-        arch_list: ${{ matrix.arch }}
+        arch_list: aarch64
     - uses: ./.github/workflows/actions/setup-nimbos-guest-image
       with:
         nimbos-version: 'tags/v0.7'
-        arch: ${{ matrix.arch }}
-        disk-path: ${{ github.workspace }}/disk-${{ matrix.arch }}.img
-    - name: Enable KVM group perms
-      run: |
-        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-        sudo udevadm control --reload-rules
-        sudo udevadm trigger --name-match=kvm
+        arch: aarch64
+        disk-path: ${{ github.workspace }}/disk-aarch64.img
     - name: Update rust-toolchain.toml
       run: |
         sed -i "s/^channel = .*/channel = \"${{ matrix.rust-toolchain }}\"/" rust-toolchain.toml
     - name: Run guests
       continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
       run: |
+        chmod +x axvisor.sh
         cargo version
-        export DISK_IMG="${{ github.workspace }}/disk-${{ matrix.arch }}.img"
-        export VM_CONFIGS="$(pwd)/configs/vms/nimbos-${{ matrix.arch }}.toml"
-        make ARCH=${{ matrix.arch }} defconfig
-        make ARCH=${{ matrix.arch }} DISK_IMG=${DISK_IMG} LOG=info BLK=y ACCEL=n VM_CONFIGS=${VM_CONFIGS} APP_FEATURES=fs run
+        export DISK_IMG="${{ github.workspace }}/disk-aarch64.img"
+        export VM_CONFIGS="$(pwd)/configs/vms/nimbos-aarch64-qemu-smp1.toml"
+        ./scripts/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,LOG=info
 
-  test_remote:
-    runs-on: ubuntu-latest
+  aarch64-generic-phytiumpi:
+    runs-on: [self-hosted, linux, phytiumpi]
     strategy:
       fail-fast: false
       matrix:
-        arch: [x86_64]
-        rust-toolchain: [nightly-2024-12-25, nightly]
-        remote: [remote_aarkegz, remote_x10dri]
-        include:
-        - remote: remote_aarkegz
-          host_key: HOST
-          username_key: USERNAME
-          password_key: PASSWORD
-          port_key: PORT
-        - remote: remote_x10dri
-          host_key: HOST2
-          username_key: USERNAME2
-          password_key: PASSWORD2
-          port_key: PORT2
+        plat: [aarch64-generic]
+        rust-toolchain: [nightly-2025-05-20]
     steps:
-      - uses: actions/checkout@v4
-      - name: Update rust-toolchain.toml
-        run: |
-          sed -i "s/^channel = .*/channel = \"${{ matrix.rust-toolchain }}\"/" rust-toolchain.toml
-      - name: Compress source code
-        run: tar -czf ~/source.tar.gz -C ${{ github.workspace }} .
-      - name: Copy files to current directory
-        run: |
-          cp ~/source.tar.gz .
-      - uses: ./.github/workflows/actions/setup-nimbos-guest-image
-        with:
-          nimbos-version: 'tags/v0.7'
-          arch: ${{ matrix.arch }}
-          disk-path: ${{ github.workspace }}/disk-${{ matrix.arch }}.img
-      - name: Copy x86_64 files to remote runner
-        uses: appleboy/[email protected]
-        with:
-          host: ${{ secrets[matrix.host_key] }}
-          username: ${{ secrets[matrix.username_key] }}
-          password: ${{ secrets[matrix.password_key] }}
-          port: ${{ secrets[matrix.port_key] }}
-          source: './disk-x86_64.img,./source.tar.gz'
-          target: '~/runner/remote_test-${{ github.run_id }}-${{ matrix.arch }}-${{ matrix.rust-toolchain }}'
-      - name: Running on remote runner
-        uses: appleboy/[email protected]
-        continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
-        with:
-          host: ${{ secrets[matrix.host_key] }}
-          username: ${{ secrets[matrix.username_key] }}
-          password: ${{ secrets[matrix.password_key] }}
-          port: ${{ secrets[matrix.port_key] }}
-          script: |
-            set -e                        # Exit quickly on error
-            set -o pipefail               # Exit if any command in a pipeline fails
-            . ~/.profile                  # Load ~/.profile manually, as it turns out that sometimes it is not loaded automatically
-
-            # Set the working directory
-            WORKDIR=~/runner/remote_test-${{ github.run_id }}-${{ matrix.arch }}-${{ matrix.rust-toolchain }}
-
-            # Set up colors for output
-            COLOR_BOLD=$'\033[1m'
-            COLOR_RED=$'\033[91;1m'
-            COLOR_GREEN=$'\033[92;1m'
-            COLOR_YELLOW=$'\033[93;1m'
-            COLOR_CLEAR=$'\033[0m'
-
-            # Echo the environment info
-            function echo_env_info() {
-              PREVIOUS_DIR=$(pwd)
-              cd $WORKDIR
-              echo "shell               : ${COLOR_BOLD}${SHELL}${COLOR_CLEAR}"
-              echo "rust-toolchain      : ${COLOR_BOLD}${{ matrix.rust-toolchain }}${COLOR_CLEAR}"
-              echo "cargo version       : ${COLOR_BOLD}$(cargo --version)${COLOR_CLEAR}"
-              echo "workdir             : ${COLOR_BOLD}${WORKDIR}${COLOR_CLEAR}"
-              cd $PREVIOUS_DIR
-            }
-
-            # Print the environment info
-            echo_env_info
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
+      with:
+        toolchain: ${{ matrix.rust-toolchain }}
+        components: rust-src
+    # - uses: Swatinem/rust-cache@v2
+    - run: cargo install cargo-binutils
+    - name: Update rust-toolchain.toml
+      run: |
+        sed -i "s/^channel = .*/channel = \"${{ matrix.rust-toolchain }}\"/" rust-toolchain.toml
+    - name: Run guests on phytiumpi
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: |
+        cargo install ostool --force
+        git clone https://github.com/arceos-hypervisor/axboard_test
+        cd axboard_test
+        ./run.sh phytiumpi-arceos
+        cd ..
 
-            tar -xzf $WORKDIR/source.tar.gz -C $WORKDIR
-            make -C $WORKDIR ARCH=x86_64 defconfig
-            make -C $WORKDIR ARCH=x86_64 DISK_IMG=$WORKDIR/disk-x86_64.img LOG=info BLK=y ACCEL=y VM_CONFIGS=$WORKDIR/configs/vms/nimbos-x86_64.toml APP_FEATURES=fs run | tee $WORKDIR/make_output.log
-
-            # Re-echo the environment info
-            echo_env_info
-
-            if grep -q "panic" $WORKDIR/make_output.log; then
-              echo "test result         : ${COLOR_RED}FAIL${COLOR_CLEAR}"
-              echo "                      ${COLOR_RED}'panic' found in output msg${COLOR_CLEAR}"
-              echo "                      ${COLOR_YELLOW}Check the log file: $WORKDIR/make_output.log${COLOR_CLEAR}"
-              exit 1
-            else
-              echo "test result         : ${COLOR_GREEN}PASS${COLOR_CLEAR}"
-            fi
+  aarch64-generic-rk3568:
+    runs-on: [self-hosted, linux, roc-rk3568-pc]
+    strategy:
+      fail-fast: false
+      matrix:
+        plat: [aarch64-generic]
+        rust-toolchain: [nightly-2025-05-20]
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
+      with:
+        toolchain: ${{ matrix.rust-toolchain }}
+        components: rust-src
+    # - uses: Swatinem/rust-cache@v2
+    - run: cargo install cargo-binutils
+    - name: Update rust-toolchain.toml
+      run: |
+        sed -i "s/^channel = .*/channel = \"${{ matrix.rust-toolchain }}\"/" rust-toolchain.toml
+    - name: Run guests on rk3568
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: |
+        cargo install ostool --force
+        git clone https://github.com/arceos-hypervisor/axboard_test
+        cd axboard_test
+        ./run.sh rk3568-arceos
+        cd ..
 
-            # Clean up
-            cd ~ && rm -rf $WORKDIR
+  x86-qemu-q35:
+    runs-on:  [self-hosted, linux, intel]
+    strategy:
+      fail-fast: false
+      matrix:
+        plat: [x86-qemu-q35]
+        rust-toolchain: [nightly-2025-05-20, nightly]
+    steps:
+    - uses: actions/checkout@v4
+    - uses: dtolnay/rust-toolchain@stable
+      with:
+        toolchain: ${{ matrix.rust-toolchain }}
+        components: rust-src
+    # - uses: Swatinem/rust-cache@v2
+    - run: cargo install cargo-binutils
+    # - uses: arceos-org/[email protected]
+    #   with:
+    #     version: ${{ env.qemu-version }}
+    #     arch_list: x86_64
+    - uses: ./.github/workflows/actions/setup-nimbos-guest-image
+      with:
+        nimbos-version: 'tags/v0.7'
+        arch: x86_64
+        disk-path: ${{ github.workspace }}/disk-x86_64.img
+    # - name: Enable KVM group perms
+    #   run: |
+    #     echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+    #     sudo udevadm control --reload-rules
+    #     sudo udevadm trigger --name-match=kvm
+    - name: Update rust-toolchain.toml
+      run: |
+        sed -i "s/^channel = .*/channel = \"${{ matrix.rust-toolchain }}\"/" rust-toolchain.toml
+    - name: Run guests
+      continue-on-error: ${{ matrix.rust-toolchain == 'nightly' }}
+      run: |
+        cargo version
+        export DISK_IMG="${{ github.workspace }}/disk-x86_64.img"
+        export VM_CONFIGS="$(pwd)/configs/vms/nimbos-x86_64-qemu-smp1.toml"
+        ./scripts/auto_interrupt.sh ./axvisor.sh run --plat ${{ matrix.plat }} --vmconfigs $VM_CONFIGS --features fs --arceos-args DISK_IMG=$DISK_IMG,BLK=y,LOG=info

.gitignore

@@ -2,6 +2,8 @@
 /target
 /.vscode
 /tmp
+/.arceos
+/.cargo
 .DS_Store
 *.asm
 *.img
@@ -14,11 +16,46 @@ actual.out
 qemu.log
 rusty-tags.vi
 
+# Python virtual environment
+venv/
+__pycache__/
+*.pyc
+*.pyo
+
 /**/.axconfig.*
+/**/.hvconfig.*
+/**/.project.*
+/**/.board.*
 
 # dev env
 /crates
 /Cargo.toml.bk
 
 # tools should be downloaded from github
 tools/*
+
+# initramfs
+*.cpio.gz
+
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST

.rustfmt.toml

@@ -0,0 +1 @@
+force_explicit_abi = false