Refactor project structure

.licenserc.yaml

@@ -14,7 +14,7 @@ header:
       - '**/Dockerfile.*'
     paths-ignore:
       # These directories are licensed under licenses other than MPL-2.0.
-      - 'services/libs/comp-sys/cargo-component'
+      - 'kernel/libs/comp-sys/cargo-component'
       - 'framework/libs/tdx-guest'
     license:
       content: |
@@ -40,7 +40,7 @@ header:
 
   # Files under cargo-component are licensed under Apache-2.0 or MIT license.
   - paths:
-      - 'services/libs/comp-sys/cargo-component/**'
+      - 'kernel/libs/comp-sys/cargo-component/**'
     paths-ignore:
       - '**/*.md'
       - '**/*.toml'

Cargo.toml

@@ -1,30 +1,3 @@
-[package]
-name = "asterinas"
-version = "0.4.0"
-edition = "2021"
-
-[dependencies]
-aster-frame = { path = "framework/aster-frame" }
-aster-nix = { path = "services/aster-nix" }
-component = { path = "services/libs/comp-sys/component" }
-
-[dev-dependencies]
-x86_64 = "0.14.2"
-aster-time = { path = "services/comps/time" }
-aster-framebuffer = { path = "services/comps/framebuffer" }
-
-[profile.dev]
-opt-level = 0
-debug = true
-lto = false
-panic = "unwind"
-
-[profile.release]
-opt-level = 3
-debug = false
-lto = false
-panic = "unwind"
-
 [workspace]
 
 members = [
@@ -36,33 +9,31 @@ members = [
     "framework/libs/linux-bzimage/setup",
     "framework/libs/ktest",
     "framework/libs/tdx-guest",
-    "services/aster-nix",
-    "services/comps/block",
-    "services/comps/console",
-    "services/comps/framebuffer",
-    "services/comps/input",
-    "services/comps/network",
-    "services/comps/time",
-    "services/comps/virtio",
-    "services/libs/cpio-decoder",
-    "services/libs/int-to-c-enum",
-    "services/libs/int-to-c-enum/derive",
-    "services/libs/aster-rights",
-    "services/libs/aster-rights-proc",
-    "services/libs/aster-util",
-    "services/libs/keyable-arc",
-    "services/libs/typeflags",
-    "services/libs/typeflags-util",
+    "kernel",
+    "kernel/aster-nix",
+    "kernel/comps/block",
+    "kernel/comps/console",
+    "kernel/comps/framebuffer",
+    "kernel/comps/input",
+    "kernel/comps/network",
+    "kernel/comps/time",
+    "kernel/comps/virtio",
+    "kernel/libs/cpio-decoder",
+    "kernel/libs/int-to-c-enum",
+    "kernel/libs/int-to-c-enum/derive",
+    "kernel/libs/aster-rights",
+    "kernel/libs/aster-rights-proc",
+    "kernel/libs/aster-util",
+    "kernel/libs/keyable-arc",
+    "kernel/libs/typeflags",
+    "kernel/libs/typeflags-util",
 ]
 
 exclude = [
     "osdk",
     "target/osdk/base",
-    "services/libs/comp-sys/cargo-component",
-    "services/libs/comp-sys/component",
-    "services/libs/comp-sys/component-macro",
-    "services/libs/comp-sys/controlled",
+    "kernel/libs/comp-sys/cargo-component",
+    "kernel/libs/comp-sys/component",
+    "kernel/libs/comp-sys/component-macro",
+    "kernel/libs/comp-sys/controlled",
 ]
-
-[features]
-intel_tdx = ["aster-frame/intel_tdx", "aster-nix/intel_tdx"]

Makefile

@@ -71,26 +71,26 @@ USERMODE_TESTABLE := \
 	framework/libs/linux-bzimage/boot-params \
     framework/libs/ktest \
     framework/libs/ktest-proc-macro \
-    services/libs/cpio-decoder \
-    services/libs/int-to-c-enum \
-    services/libs/int-to-c-enum/derive \
-    services/libs/aster-rights \
-    services/libs/aster-rights-proc \
-    services/libs/keyable-arc \
-    services/libs/typeflags \
-    services/libs/typeflags-util
+    kernel/libs/cpio-decoder \
+    kernel/libs/int-to-c-enum \
+    kernel/libs/int-to-c-enum/derive \
+    kernel/libs/aster-rights \
+    kernel/libs/aster-rights-proc \
+    kernel/libs/keyable-arc \
+    kernel/libs/typeflags \
+    kernel/libs/typeflags-util
 
 # Maintain a list of kernel crates that can be tested with `cargo osdk test`
 # The framework is tested independently, thus not included here
 KTEST_TESTABLE := \
-    "services/aster-nix" \
-    "services/comps/block" \
-    "services/comps/console" \
-    "services/comps/framebuffer" \
-    "services/comps/input" \
-    "services/comps/network" \
-    "services/comps/time" \
-    "services/comps/virtio"
+    "kernel/aster-nix" \
+    "kernel/comps/block" \
+    "kernel/comps/console" \
+    "kernel/comps/framebuffer" \
+    "kernel/comps/input" \
+    "kernel/comps/network" \
+    "kernel/comps/time" \
+    "kernel/comps/virtio"
 
 .PHONY: all install_osdk build tools run test docs check clean update_initramfs
 
@@ -101,13 +101,13 @@ install_osdk:
 
 build:
 	@make --no-print-directory -C regression
-	@cargo osdk build $(CARGO_OSDK_ARGS)
+	@cd kernel && cargo osdk build $(CARGO_OSDK_ARGS)
 
 tools:
-	@cd services/libs/comp-sys && cargo install --path cargo-component
+	@cd kernel/libs/comp-sys && cargo install --path cargo-component
 
 run: build
-	@cargo osdk run $(CARGO_OSDK_ARGS)
+	@cd kernel && cargo osdk run $(CARGO_OSDK_ARGS)
 
 test:
 	@for dir in $(USERMODE_TESTABLE); do \

README.md

@@ -65,8 +65,8 @@ make install_osdk
 4. Inside the container, go to the project folder to build and run Asterinas.
 
 ```bash
-cargo osdk build
-cargo osdk run
+make build
+make run
 ```
 
 If everything goes well, Asterinas is now up and running inside a VM.

README_CN.md

@@ -59,8 +59,8 @@ make install_osdk
 4. 在容器内，进入项目文件夹构建并运行星绽。
 
 ```bash
-cargo osdk build
-cargo osdk run
+make build
+make run
 ```
 
 如果一切顺利，星绽现在应该在一个虚拟机内运行起来了。

framework/aster-frame/Cargo.toml

@@ -16,7 +16,7 @@ buddy_system_allocator = "0.9.0"
 cfg-if = "1.0"
 gimli = { version = "0.28", default-features = false, features = ["read-core"] }
 inherit-methods-macro = { git = "https://github.com/asterinas/inherit-methods-macro", rev = "98f7e3e" }
-int-to-c-enum = { path = "../../services/libs/int-to-c-enum" }
+int-to-c-enum = { path = "../../kernel/libs/int-to-c-enum" }
 intrusive-collections = "0.9.5"
 ktest = { path = "../libs/ktest" }
 lazy_static = { version = "1.0", features = ["spin_no_std"] }

kernel/Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "asterinas"
+version = "0.4.0"
+edition = "2021"
+
+[dependencies]
+aster-frame = { path = "../framework/aster-frame" }
+aster-nix = { path = "aster-nix" }
+component = { path = "libs/comp-sys/component" }
+
+[dev-dependencies]
+x86_64 = "0.14.2"
+aster-time = { path = "comps/time" }
+aster-framebuffer = { path = "comps/framebuffer" }
+
+[profile.dev]
+opt-level = 0
+debug = true
+lto = false
+panic = "unwind"
+
+[profile.release]
+opt-level = 3
+debug = false
+lto = false
+panic = "unwind"
+
+[features]
+intel_tdx = ["aster-frame/intel_tdx", "aster-nix/intel_tdx"]