refactor: rewrite axvm

.cargo/config.toml

@@ -18,3 +18,28 @@ rustflags = [
 [alias]
 xtask = "run --package xtask --"
 
+# >>> devspace patches >>>
+# Managed by `cargo xtask devspace`
+[patch."crates-io"]
+axaddrspace = { path = "modules/axaddrspace" }
+axdevice_base = { path = "modules/axdevice_base" }
+axvisor_api = { path = "modules/axvisor_api" }
+x86_vcpu = { path = "modules/x86_vcpu" }
+x86_vlapic = { path = "modules/x86_vlapic" }
+
+[patch."https://github.com/arceos-hypervisor/arm_vcpu"]
+arm_vcpu = { path = "modules/arm_vcpu/" }
+
+[patch."https://github.com/arceos-hypervisor/arm_vgic"]
+arm_vgic = { path = "modules/arm_vgic/" }
+
+[patch."https://github.com/arceos-hypervisor/axdevice"]
+axdevice = { path = "modules/axdevice/" }
+
+[patch."https://github.com/arceos-hypervisor/axvcpu"]
+axvcpu = { path = "modules/axvcpu/" }
+
+[patch."https://github.com/arceos-hypervisor/axvmconfig"]
+axvmconfig = { path = "modules/axvmconfig/" }
+
+# <<< devspace patches <<<

.devspace/state.json

@@ -0,0 +1,86 @@
+{
+  "modules": {
+    "axvisor_api": {
+      "name": "axvisor_api",
+      "path": "modules/axvisor_api"
+    },
+    "x86_vlapic": {
+      "name": "x86_vlapic",
+      "path": "modules/x86_vlapic"
+    },
+    "axvmconfig": {
+      "name": "axvmconfig",
+      "path": "modules/axvmconfig"
+    },
+    "arm_vcpu": {
+      "name": "arm_vcpu",
+      "path": "modules/arm_vcpu"
+    },
+    "arm_vgic": {
+      "name": "arm_vgic",
+      "path": "modules/arm_vgic"
+    },
+    "x86_vcpu": {
+      "name": "x86_vcpu",
+      "path": "modules/x86_vcpu"
+    },
+    "axdevice_base": {
+      "name": "axdevice_base",
+      "path": "modules/axdevice_base"
+    },
+    "axaddrspace": {
+      "name": "axaddrspace",
+      "path": "modules/axaddrspace"
+    },
+    "axvcpu": {
+      "name": "axvcpu",
+      "path": "modules/axvcpu"
+    },
+    "axdevice": {
+      "name": "axdevice",
+      "path": "modules/axdevice"
+    }
+  },
+  "patches": [
+    {
+      "source": "crates-io",
+      "crate_name": "axaddrspace"
+    },
+    {
+      "source": "crates-io",
+      "crate_name": "axdevice_base"
+    },
+    {
+      "source": "crates-io",
+      "crate_name": "axvisor_api"
+    },
+    {
+      "source": "crates-io",
+      "crate_name": "x86_vcpu"
+    },
+    {
+      "source": "crates-io",
+      "crate_name": "x86_vlapic"
+    },
+    {
+      "source": "https://github.com/arceos-hypervisor/arm_vcpu",
+      "crate_name": "arm_vcpu"
+    },
+    {
+      "source": "https://github.com/arceos-hypervisor/arm_vgic",
+      "crate_name": "arm_vgic"
+    },
+    {
+      "source": "https://github.com/arceos-hypervisor/axdevice",
+      "crate_name": "axdevice"
+    },
+    {
+      "source": "https://github.com/arceos-hypervisor/axvcpu",
+      "crate_name": "axvcpu"
+    },
+    {
+      "source": "https://github.com/arceos-hypervisor/axvmconfig",
+      "crate_name": "axvmconfig"
+    }
+  ]
+}

.github/workflows/test-board.yml

@@ -27,10 +27,14 @@ jobs:
       - ${{ matrix.board }}
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v6
+        with:
+          submodules: "recursive"
 
-      - name: Install dependencies
+      - uses: cargo-bins/cargo-binstall@main
+
+      - name: Install ostool
+        # run: cargo binstall ostool
         run: cargo +stable install ostool --version ^0.8
 
       - name: Run tests

.github/workflows/test-qemu.yml

@@ -20,21 +20,25 @@ jobs:
           #   vmconfigs: configs/vms/arceos-riscv64-qemu-smp1.toml
           #   vmconfigs_name: ArceOS
           #   vmimage_name: qemu_arceos_riscv64
-          - arch: x86_64
-            vmconfigs: configs/vms/nimbos-x86_64-qemu-smp1.toml
-            vmconfigs_name: NimbOS
-            vmimage_name: qemu_x86_64_nimbos
+          # - arch: x86_64
+          #   vmconfigs: configs/vms/nimbos-x86_64-qemu-smp1.toml
+          #   vmconfigs_name: NimbOS
+          #   vmimage_name: qemu_x86_64_nimbos
       fail-fast: false
     runs-on:
       - self-hosted
       - linux
       - intel
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v6
+        with:
+          submodules: "recursive"
 
-      - name: Install dependencies
+      - uses: cargo-bins/cargo-binstall@main
+
+      - name: Install ostool
+        # run: cargo binstall ostool
         run: cargo +stable install ostool --version ^0.8
 
       - name: Download images and patch vm configs

.github/workflows/uboot.toml

@@ -10,6 +10,7 @@ success_regex = [
     "Welcome to AxVisor Shell!",
     "All tests passed!",
     "Hello World!",
+    "Hello, world!",
     "root@firefly:~#",
     "root@phytium-Ubuntu:~#",
     "Welcome to Phytium Buildroot",

.gitignore

@@ -30,7 +30,6 @@ __pycache__/
 /crates/*
 !/crates/nop/
 !/crates/nop/**
-.devspace/
 
 /Cargo.toml.bk
 

.gitmodules

@@ -0,0 +1,36 @@
+[submodule "modules/axvm"]
+	path = modules/axvm
+	url = https://github.com/arceos-hypervisor/axvm.git
+[submodule "modules/axvcpu"]
+	path = modules/axvcpu
+	url = https://github.com/arceos-hypervisor/axvcpu.git
+[submodule "modules/axdevice"]
+	path = modules/axdevice
+	url = https://github.com/arceos-hypervisor/axdevice.git
+[submodule "modules/arm_vcpu"]
+	path = modules/arm_vcpu
+	url = https://github.com/arceos-hypervisor/arm_vcpu
+[submodule "modules/arm_vgic"]
+	path = modules/arm_vgic
+	url = https://github.com/arceos-hypervisor/arm_vgic.git
+[submodule "modules/axaddrspace"]
+	path = modules/axaddrspace
+	url = https://github.com/arceos-hypervisor/axaddrspace
+[submodule "modules/axdevice_base"]
+	path = modules/axdevice_base
+	url = https://github.com/arceos-hypervisor/axdevice_base.git
+[submodule "modules/axvisor_api"]
+	path = modules/axvisor_api
+	url = https://github.com/arceos-hypervisor/axvisor_api
+[submodule "modules/x86_vcpu"]
+	path = modules/x86_vcpu
+	url = https://github.com/arceos-hypervisor/x86_vcpu
+[submodule "modules/x86_vlapic"]
+	path = modules/x86_vlapic
+	url = https://github.com/arceos-hypervisor/x86_vlapic
+[submodule "modules/axvmconfig"]
+	path = modules/axvmconfig
+	url = https://github.com/arceos-hypervisor/axvmconfig.git
+[submodule "platform/axplat-aarch64-dyn"]
+	path = platform/axplat-aarch64-dyn
+	url = https://github.com/arceos-hypervisor/axplat-aarch64-dyn

.rustfmt.toml

@@ -1 +1 @@
-force_explicit_abi = false
+# force_explicit_abi = false