From f3a1017f3a7d12bacb501efbfa3027b3f9f4b8e6 Mon Sep 17 00:00:00 2001 From: YanLien Date: Wed, 19 Nov 2025 17:41:50 +0800 Subject: [PATCH 1/2] fix: update test configurations and dependencies --- .github/workflows/test-board.yml | 20 +++++++-------- .github/workflows/uboot.toml | 1 + Cargo.lock | 28 +++------------------ configs/vms/arceos-aarch64-rk3568-smp1.toml | 2 +- 4 files changed, 15 insertions(+), 36 deletions(-) diff --git a/.github/workflows/test-board.yml b/.github/workflows/test-board.yml index 8e2b3d83..fe0c2350 100644 --- a/.github/workflows/test-board.yml +++ b/.github/workflows/test-board.yml @@ -19,16 +19,16 @@ jobs: vmconfigs: configs/vms/linux-aarch64-e2000-smp1.toml vmconfigs_name: Linux vmimage_name: phytiumpi_linux - # - board: roc-rk3568-pc - # vmconfigs: configs/vms/arceos-aarch64-rk3568-smp1.toml - # vmconfigs_name: ArceOS - # # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...] - # vmimage_name: roc-rk3568-pc_arceos - # - board: roc-rk3568-pc - # vmconfigs: configs/vms/linux-aarch64-rk3568-smp1.toml - # vmconfigs_name: Linux - # # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...] - # vmimage_name: roc-rk3568-pc_linux + - board: roc-rk3568-pc + vmconfigs: configs/vms/arceos-aarch64-rk3568-smp1.toml + vmconfigs_name: ArceOS + # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...] + vmimage_name: roc-rk3568-pc_arceos + - board: roc-rk3568-pc + vmconfigs: configs/vms/linux-aarch64-rk3568-smp1.toml + vmconfigs_name: Linux + # Multiple image archive names separated by commas, for example, roc-rk3568-pc_arceos,roc-rk3568-pc_linux[,...] + vmimage_name: roc-rk3568-pc_linux fail-fast: false runs-on: - self-hosted diff --git a/.github/workflows/uboot.toml b/.github/workflows/uboot.toml index 0d55d169..d7f7b0be 100644 --- a/.github/workflows/uboot.toml +++ b/.github/workflows/uboot.toml @@ -13,6 +13,7 @@ success_regex = [ "root@firefly:~#", "root@phytium-Ubuntu:~#", "Welcome to Phytium Buildroot", + "Last login: Fri Sep 12 15:17:20 UTC 2025 on ttyFIQ0", ] [net] diff --git a/Cargo.lock b/Cargo.lock index 4b6440ae..b71a7915 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1074,7 +1074,7 @@ dependencies = [ "axstd", "axvcpu", "axvisor_api", - "axvm 0.1.0 (git+https://github.com/arceos-hypervisor/axvm.git?branch=next)", + "axvm", "bitflags 2.10.0", "byte-unit", "cfg-if", @@ -1126,30 +1126,6 @@ dependencies = [ "syn 2.0.110", ] -[[package]] -name = "axvm" -version = "0.1.0" -dependencies = [ - "arm_vcpu", - "arm_vgic 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "axaddrspace", - "axdevice", - "axdevice_base", - "axerrno", - "axvcpu", - "axvmconfig", - "cfg-if", - "cpumask", - "log", - "memory_addr", - "page_table_entry", - "page_table_multiarch", - "percpu", - "riscv_vcpu", - "spin 0.9.8", - "x86_vcpu", -] - [[package]] name = "axvm" version = "0.1.0" @@ -6608,9 +6584,11 @@ dependencies = [ "colored", "jkconfig", "ostool", + "reqwest 0.12.24", "schemars", "serde", "serde_json", + "sha2", "tokio", "toml 0.9.8", ] diff --git a/configs/vms/arceos-aarch64-rk3568-smp1.toml b/configs/vms/arceos-aarch64-rk3568-smp1.toml index 9ab0d636..eb2648c3 100644 --- a/configs/vms/arceos-aarch64-rk3568-smp1.toml +++ b/configs/vms/arceos-aarch64-rk3568-smp1.toml @@ -31,7 +31,7 @@ dtb_load_addr = 0x7000_0000 # Memory regions with format (`base_paddr`, `size`, `flags`, `map_type`). # For `map_type`, 0 means `MAP_ALLOC`, 1 means `MAP_IDENTICAL`. memory_regions = [ - [0x7000_0000, 0x1000_0000, 0x7, 0], # System RAM 1G MAP_IDENTICAL + [0x7000_0000, 0x1000_0000, 0x7, 1], # System RAM 1G MAP_IDENTICAL ] # From 4ba741ab487f86dbc33d74356e42cc47afe4588b Mon Sep 17 00:00:00 2001 From: YanLien Date: Thu, 20 Nov 2025 14:00:53 +0800 Subject: [PATCH 2/2] fix: update success regex for last login message --- .github/workflows/uboot.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/uboot.toml b/.github/workflows/uboot.toml index d7f7b0be..1b4ec0a0 100644 --- a/.github/workflows/uboot.toml +++ b/.github/workflows/uboot.toml @@ -13,7 +13,7 @@ success_regex = [ "root@firefly:~#", "root@phytium-Ubuntu:~#", "Welcome to Phytium Buildroot", - "Last login: Fri Sep 12 15:17:20 UTC 2025 on ttyFIQ0", + "Last login: *", ] [net]