feat: add submodules

ZR233 · ZR233 · commit e26456c18c50 · 2025-12-01T09:37:17.000+08:00
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -18,3 +18,31 @@ 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/axvm"]
+axvm = { path = "modules/axvm/" }
+
+[patch."https://github.com/arceos-hypervisor/axvmconfig"]
+axvmconfig = { path = "modules/axvmconfig/" }
+
+# <<< devspace patches <<<
diff --git a/.devspace/state.json b/.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"
+    }
+  ]
+}
diff --git a/.gitignore b/.gitignore
@@ -30,7 +30,6 @@ __pycache__/
 /crates/*
 !/crates/nop/
 !/crates/nop/**
-.devspace/
 
 /Cargo.toml.bk
 
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,33 @@
+[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
diff --git a/modules/arm_vcpu b/modules/arm_vcpu
@@ -0,0 +1 @@
+Subproject commit b93a5b0949ae2ff65eb71489670281038068697c
diff --git a/modules/arm_vgic b/modules/arm_vgic
@@ -0,0 +1 @@
+Subproject commit 81338d6dd8a9dab04b91c9c0da3d6d84e7768be6
diff --git a/modules/axaddrspace b/modules/axaddrspace
@@ -0,0 +1 @@
+Subproject commit 21ab84bc1ba194641879182d4efac2535dff32d4
diff --git a/modules/axdevice b/modules/axdevice
@@ -0,0 +1 @@
+Subproject commit 60558bb25214c2030651726beddae088d8a1cd8e
diff --git a/modules/axdevice_base b/modules/axdevice_base
@@ -0,0 +1 @@
+Subproject commit 35da6c7b5a29d01410df6ca31300bbfc50eb4603
diff --git a/modules/axvcpu b/modules/axvcpu
@@ -0,0 +1 @@
+Subproject commit a51c24118f6888ea652c61dc64f6a4de26bbe455
diff --git a/modules/axvisor_api b/modules/axvisor_api
@@ -0,0 +1 @@
+Subproject commit feb16efe1c384d91ac9f1cbf787c1c28571190f1
diff --git a/modules/axvm b/modules/axvm
@@ -0,0 +1 @@
+Subproject commit cb1415b6c11c011bf8488303b74f944857fca6a9
diff --git a/modules/axvmconfig b/modules/axvmconfig
@@ -0,0 +1 @@
+Subproject commit 2df01b3b8a9e9a82389e96b938a42527b8c3ed25
diff --git a/modules/x86_vcpu b/modules/x86_vcpu
@@ -0,0 +1 @@
+Subproject commit d0cb6fdebfb9040c9fcaa5683774f5c373dc7cf9
diff --git a/modules/x86_vlapic b/modules/x86_vlapic
@@ -0,0 +1 @@
+Subproject commit dc1e65bbff047dad115bfaa8ad3c9e10ecafe700
diff --git a/xtask/src/devspace.rs b/xtask/src/devspace.rs
@@ -14,12 +14,17 @@ const PATCH_END_MARKER: &str = "# <<< devspace patches <<<";
 const CRATES_IO_SOURCE_KEY: &str = "crates-io";
 
 const DEVSPACE_REPOS: &[&str] = &[
+    "axvm",
+    "axvcpu",
+    "axdevice",
     "arm_vcpu",
     "arm_vgic",
     "axaddrspace",
     "axdevice_base",
+    "axvisor_api",
     "x86_vcpu",
     "x86_vlapic",
+    "axvmconfig",
 ];
 
 const DEVSPACE_REPO_OVERRIDES: &[(&str, &str)] = &[(
