Update url

arceos-hypervisor · Dec 24, 2024 · d6253ed · d6253ed
1 parent 272fa1c
commit d6253ed
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,20 +7,8 @@ members = ["arceos-vmm"]
 lto = true
 
 [workspace.dependencies]
-axstd = { git = "https://github.com/arceos-hypervisor/arceos.git", branch = "vmm_alloc_at" }
+axstd = { git = "https://github.com/arceos-hypervisor/arceos.git", branch = "vmm" }
 
-axvm = { git = "https://github.com/arceos-hypervisor/axvm.git", branch = "passthrough_device" }
+axvm = { git = "https://github.com/arceos-hypervisor/axvm.git" }
 axvcpu = { git = "https://github.com/arceos-hypervisor/axvcpu.git" }
 axaddrspace = { git = "https://github.com/arceos-hypervisor/axaddrspace.git" }
-
-# [patch."https://github.com/arceos-hypervisor/arceos.git"]
-# axstd = { path = "../arceos/ulib/axstd" }
-
-# [patch."https://github.com/arceos-hypervisor/axvm.git"]
-# axvm = { path = "../arceos-crates/axvm" }
-
-# [patch."https://github.com/arceos-hypervisor/arm_vcpu.git"]
-# arm_vcpu = { path = "../arceos-crates/arm_vcpu" }
-
-# [patch."https://github.com/arceos-hypervisor/axdevice.git"]
-# axdevice = { path = "../arceos-crates/axdevice" }
diff --git a/arceos-vmm/Cargo.toml b/arceos-vmm/Cargo.toml
@@ -33,8 +33,8 @@ axaddrspace = { workspace = true }
 crate_interface = "0.1"
 axerrno = "0.1.0"
 memory_addr = "0.3"
-page_table_entry = { version = "0.4.1", features = ["arm-el2"] }
-page_table_multiarch = "0.4.1"
+page_table_entry = { version = "0.4.2", features = ["arm-el2"] }
+page_table_multiarch = "0.4.2"
 percpu = { version = "0.1.4", features = ["arm-el2"] }
 
 [build-dependencies]

diff --git a/arceos-vmm/configs/linux-qemu-aarch64-smp2.toml b/arceos-vmm/configs/linux-qemu-aarch64-smp2.toml
@@ -11,7 +11,6 @@ dtb_load_addr = 0x8000_0000
 # load from memory
 image_location = "memory"
 kernel_path = "linux-6.6.62.bin"
-# kernel_path = "/home/hky/workspace/hypervisors/shyper/rtshyper/image/Image_vanilla"
 dtb_path = "linux-qemu-smp2.dtb"
 
 # load from file system

diff --git a/arceos-vmm/configs/linux-qemu-aarch64.toml b/arceos-vmm/configs/linux-qemu-aarch64.toml
@@ -11,7 +11,6 @@ dtb_load_addr = 0x8000_0000
 # load from memory
 image_location = "memory"
 kernel_path = "linux-6.6.62.bin"
-# kernel_path = "/home/hky/workspace/hypervisors/shyper/rtshyper/image/Image_vanilla"
 dtb_path = "linux-qemu.dtb"
 
 # load from file system