Merge arceos-hypervisor/axvisor#377

Cargo.toml

@@ -229,6 +229,29 @@ scope-local = { path = "components/scope-local", version = "0.1.0" }
 
 axbuild = { path = "scripts/axbuild", version = "0.3.0-preview.3" }
 
+# === axvisor ===
+axvm = { path = "components/axvm", version = "0.3" }
+axvmconfig = { path = "components/axvmconfig", version = "0.2.2" }
+axvcpu = { path = "components/axvcpu", version = "0.3" }
+x86_vcpu = { path = "components/x86_vcpu", version = "0.3" }
+x86_vlapic = { path = "components/x86_vlapic", version = "0.2.2" }
+arm_vcpu = { path = "components/arm_vcpu", version = "0.3" }
+arm_vgic = { path = "components/arm_vgic", version = "0.2.2" }
+aarch64_sysreg = { path = "components/aarch64_sysreg", version = "0.1.1" }
+riscv_vcpu = { path = "components/riscv_vcpu", version = "0.3" }
+riscv_vplic = { path = "components/riscv_vplic", version = "0.2.2" }
+riscv-h = { path = "components/riscv-h", version = "0.2" }
+axaddrspace = { path = "components/axaddrspace", version = "0.3" }
+axdevice = { path = "components/axdevice", version = "0.2.2" }
+axdevice_base = { path = "components/axdevice_base", version = "0.2.2" }
+axvisor_api = { path = "components/axvisor_api", version = "0.3" }
+axhvc = { path = "components/axhvc", version = "0.2.0" }
+axklib = { path = "components/axklib", version = "0.3.0" }
+range-alloc-arceos = { path = "components/range-alloc-arceos", version = "0.1.4" }
+
+# === drivers ===
+fxmac_rs = { path = "components/fxmac_rs", version = "0.2.1" }
+
 [workspace.dependencies]
 # === os/arceos crates (0.3.0-preview.3) ===
 # ulib
@@ -307,7 +330,7 @@ bindgen = "0.72"
 buddy-slab-allocator = "0.2"
 cfg-if = "1.0"
 chrono = { version = "0.4", default-features = false }
-crate_interface = "0.1"
+crate_interface = "0.3"
 ctor_bare = "0.2"
 event-listener = { version = "5.4.0", default-features = false }
 kernel_guard = "0.1"

components/aarch64_sysreg/.github/config.json

@@ -0,0 +1,17 @@
+{
+  "component": {
+    "name": "aarch64_sysreg",
+    "crate_name": "aarch64_sysreg"
+  },
+  "targets": [
+    "aarch64-unknown-none-softfloat"
+  ],
+  "unit_test_targets": [
+    "x86_64-unknown-linux-gnu"
+  ],
+  "rust_components": [
+    "rust-src",
+    "clippy",
+    "rustfmt"
+  ]
+}

components/aarch64_sysreg/.github/workflows/check.yml

@@ -0,0 +1,15 @@
+# Quality Check Workflow
+# References shared workflow from axci
+
+name: Check
+
+on:
+  push:
+    branches: ['**']
+    tags-ignore: ['**']
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  check:
+    uses: arceos-hypervisor/axci/.github/workflows/check.yml@main

components/aarch64_sysreg/.github/workflows/deploy.yml

@@ -0,0 +1,16 @@
+# Deploy Workflow
+# References shared workflow from axci
+
+name: Deploy
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  deploy:
+    uses: arceos-hypervisor/axci/.github/workflows/deploy.yml@main
+    with:
+      verify_branch: true
+      verify_version: true

components/aarch64_sysreg/.github/workflows/push.yml

@@ -0,0 +1,16 @@
+name: Notify Parent Repository
+
+on:
+  push:
+    branches:
+      - main
+      - zcs
+  workflow_dispatch:
+
+jobs:
+  notify-parent:
+    name: Notify Parent Repository
+    # 调用 axci 仓库的可复用工作流
+    uses: arceos-hypervisor/axci/.github/workflows/push.yml@main
+    secrets:
+      PARENT_REPO_TOKEN: ${{ secrets.PARENT_REPO_TOKEN }}

components/aarch64_sysreg/.github/workflows/release.yml

@@ -0,0 +1,27 @@
+# Release Workflow
+# References shared workflow from axci
+# check + test must pass before release
+
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-pre.[0-9]+'
+
+jobs:
+  check:
+    uses: arceos-hypervisor/axci/.github/workflows/check.yml@main
+
+  test:
+    uses: arceos-hypervisor/axci/.github/workflows/test.yml@main
+
+  release:
+    needs: [check, test]
+    uses: arceos-hypervisor/axci/.github/workflows/release.yml@main
+    with:
+      verify_branch: true
+      verify_version: true
+    secrets:
+      CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

components/aarch64_sysreg/.github/workflows/test.yml

@@ -0,0 +1,17 @@
+# Integration Test Workflow
+# References shared workflow from axci
+
+name: Test
+
+on:
+  push:
+    branches:
+      - '**'
+    tags-ignore:
+      - '**'
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test:
+    uses: arceos-hypervisor/axci/.github/workflows/test.yml@main

components/aarch64_sysreg/.gitignore

@@ -1,4 +1,14 @@
 /target
 /.vscode
 .DS_Store
-Cargo.lock
+Cargo.lock
+
+# Test results (generated by shared test framework)
+/test-results/
+/test_repos/
+*.log
+
+# Downloaded test framework
+/scripts/.axci/
+
+.claude

components/aarch64_sysreg/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.1"
 edition = "2021"
 authors = ["Debin <luodeb@outlook.com>"]
 description = "Address translation of system registers"
-license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0"
+license = "Apache-2.0"
 homepage = "https://github.com/arceos-org/arceos"
 repository = "https://github.com/arceos-org/aarch64_sysreg"
 documentation = "https://docs.rs/aarch64_sysreg"