Skip to content

Commit bc3d92f

Browse files
ZR233ZR233
committed
feat: update deps
1 parent 601cea6 commit bc3d92f

File tree

9 files changed

+143
-129
lines changed

9 files changed

+143
-129
lines changed

‎Cargo.lock‎

Lines changed: 109 additions & 89 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,31 +34,32 @@ log = "0.4"
3434
spin = "0.9"
3535
timer_list = "0.1"
3636
toml = "0.9"
37-
vm-allocator = {git = "https://github.com/rust-vmm/vm-allocator.git", ref = "c66cfac", default-features = false }
37+
vm-allocator = {git = "https://github.com/rust-vmm/vm-allocator.git", ref = "c66cfac", default-features = false}
3838

3939
# System dependent modules provided by ArceOS.
40-
axstd = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1", features = [
40+
axstd = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2", features = [
4141
"alloc-level-1",
4242
"paging",
4343
"irq",
4444
"multitask",
45+
"alloc",
46+
"myplat",
4547
"smp", # "page-alloc-64g",
4648
]}
4749

48-
axalloc = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
49-
axconfig = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
50-
axdisplay = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
51-
axdriver = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
52-
axfs = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
53-
axhal = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
54-
axipi = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
55-
axlog = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
56-
axmm = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
57-
axnet = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
58-
axtask = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
50+
axalloc = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2"}
51+
axconfig = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2"}
52+
axdisplay = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2"}
53+
axdriver = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2"}
54+
axfs = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2"}
55+
axhal = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2"}
56+
axipi = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2"}
57+
axlog = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2"}
58+
axmm = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2"}
59+
axnet = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2"}
60+
axtask = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.2"}
5961

6062
axplat = {git = "https://github.com/arceos-hypervisor/axplat_crates.git", tag = "vmm-v0.3.0"}
61-
6263
# System dependent modules provided by ArceOS-Hypervisor.
6364
axaddrspace = "0.2"
6465
axhvc = {git = "https://github.com/arceos-hypervisor/axhvc.git"}
@@ -82,13 +83,14 @@ vm-fdt = {git = "https://github.com/bullhh/vm-fdt.git", default-features = false
8283

8384
axdevice = {git = "https://github.com/arceos-hypervisor/axdevice.git"}
8485
axdevice_base = "0.1"
86+
axplat-aarch64-dyn = {path = "platform/axplat-aarch64-dyn", features = ["irq", "smp", "hv"]}
8587
axvisor_api = "0.1"
86-
driver = {path = "modules/driver"}
8788
axvm-types = {path = "modules/axvm-types"}
89+
driver = {path = "modules/driver"}
8890

8991
# platform
9092
axplat-x86-qemu-q35 = {path = "platform/x86-qemu-q35"}
91-
axvmconfig = {version ="0.1", default-features = false }
93+
axvmconfig = {version = "0.1", default-features = false}
9294

9395
[patch.crates-io]
9496
arm_vcpu = {path = "modules/arm_vcpu"}

‎arceos‎

‎kernel/Cargo.toml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ name = "axvisor"
77
[features]
88
# Note: ept-level-4 support is now provided through dynamic page table selection in axaddrspace
99
# The feature gate is no longer needed
10-
dyn-plat = ["axstd/myplat", "axstd/driver-dyn", "axruntime/driver-dyn"]
10+
dyn-plat = ["axstd/myplat", "axstd/driver-dyn"]
1111
ept-level-4 = ["axvm/4-level-ept"]
12-
fs = ["axstd/fs", "axruntime/fs"]
12+
fs = ["axstd/fs"]
1313

1414
[dependencies]
1515
anyhow = {version = "1.0", default-features = false}
@@ -25,18 +25,12 @@ spin = "0.9"
2525
timer_list = "0.1.0"
2626

2727
# System dependent modules provided by ArceOS.
28-
axstd = {workspace = true, features = [
29-
"alloc-level-1",
30-
"paging",
31-
"irq",
32-
"multitask",
33-
"smp",
34-
]}
28+
axstd.workspace = true
3529

3630
# System dependent modules provided by ArceOS-Hypervisor.
3731
axaddrspace.workspace = true
3832
axhvc.workspace = true
39-
axruntime = {workspace = true, features = ["alloc", "irq", "paging", "smp", "multitask"]}
33+
# axruntime = {workspace = true, features = ["alloc", "irq", "paging", "smp", "multitask"]}
4034
axvcpu.workspace = true
4135
axvm.workspace = true
4236
axvmconfig = {workspace = true}

‎kernel/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extern crate alloc;
99

1010
extern crate axstd as std;
1111

12-
extern crate axruntime;
12+
// extern crate axruntime;
1313
extern crate driver;
1414

1515
mod logo;

‎modules/axruntime/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@ chrono = {version = "0.4.38", default-features = false}
5454
axplat-x86-qemu-q35 = {workspace = true}
5555

5656
[target.'cfg(target_arch = "aarch64")'.dependencies]
57-
axplat-aarch64-dyn = {path = "../../platform/axplat-aarch64-dyn", features = ["irq", "smp", "hv"]}
57+
axplat-aarch64-dyn.workspace = true
5858
somehal = "0.4"

‎modules/axruntime/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ pub fn rust_main(cpu_id: usize, arg: usize) -> ! {
173173
axhal::init_later(cpu_id, arg);
174174

175175
#[cfg(feature = "multitask")]
176-
axtask::init_scheduler();
176+
axtask::init_scheduler_with_cpu_num(cpu_count());
177177

178178
#[cfg(any(feature = "fs", feature = "net", feature = "display"))]
179179
{

‎modules/axvm‎

‎xtask/Cargo.toml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,18 @@ version = "0.1.0"
66
[target.'cfg(any(windows, unix))'.dependencies]
77

88
anyhow = "1.0"
9+
axvmconfig = {workspace = true, features = ["std"]}
910
cargo_metadata = "0.23"
1011
chrono = "0.4"
11-
clap = { version = "4.4", features = ["derive"] }
12+
clap = {version = "4.4", features = ["derive"]}
1213
colored = "3"
13-
ostool = "0.8"
1414
jkconfig = "0.1"
15+
ostool = "0.8"
1516
reqwest = "0.12"
16-
schemars = { version = "1", features = ["derive"] }
17-
serde = { version = "1.0", features = ["derive"] }
17+
schemars = {version = "1", features = ["derive"]}
18+
serde = {version = "1.0", features = ["derive"]}
1819
serde_json = "1"
1920
sha2 = "0.10"
20-
tokio = { version = "1", features = ["full"] }
21+
tokio = {version = "1", features = ["full"]}
2122
toml.workspace = true
22-
23-
axvmconfig = { workspace = true, features = ["std"] }
24-
25-
23+
zerocopy = "=0.8.28"

0 commit comments

Comments
 (0)