diff --git a/kernel/Cargo.lock b/kernel/Cargo.lock index 474fce23..9f9bc730 100644 --- a/kernel/Cargo.lock +++ b/kernel/Cargo.lock @@ -681,7 +681,7 @@ dependencies = [ [[package]] name = "rvm" version = "1.2.0" -source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=fa31039#fa310395b771590df3c6fc354798037c0ae0e9df" +source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=5cde71c#5cde71c7f4c1a691e12adbe542d28b381bc8e383" dependencies = [ "bit-set", "bit_field 0.10.1", @@ -701,7 +701,7 @@ dependencies = [ [[package]] name = "rvm_macros" version = "0.1.0" -source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=fa31039#fa310395b771590df3c6fc354798037c0ae0e9df" +source = "git+https://github.com/rcore-riscv-hypervisor-dev/RVM?rev=5cde71c#5cde71c7f4c1a691e12adbe542d28b381bc8e383" dependencies = [ "quote", "syn", diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 6e9469c4..cab9773b 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -77,7 +77,7 @@ virtio-drivers = { git = "https://github.com/rcore-riscv-hypervisor-dev/virtio-d volatile = "0.2" woke = "0.0.2" xmas-elf = "0.7" -rvm = { git = "https://github.com/rcore-riscv-hypervisor-dev/RVM", rev = "fa31039", optional = true } +rvm = { git = "https://github.com/rcore-riscv-hypervisor-dev/RVM", rev = "5cde71c", optional = true } [target.'cfg(target_arch = "x86_64")'.dependencies] apic = { git = "https://github.com/rcore-os/apic-rs", rev = "fb86bd7" } diff --git a/kernel/Makefile b/kernel/Makefile index 02521062..d3c18a67 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -141,13 +141,13 @@ qemu_opts += \ -cpu rv64,x-h=true \ -serial mon:stdio \ -bios ../tools/opensbi/fw_jump.elf \ - -m 2G\ + -m 1G\ -kernel $(kernel_img) else qemu_opts += \ -machine virt \ -cpu rv64,x-h=true \ - -m 1G \ + -m 2G \ -serial mon:stdio ifeq ($(UART2), on) qemu_opts += \ diff --git a/user b/user index 9251d3d5..b4a7bd80 160000 --- a/user +++ b/user @@ -1 +1 @@ -Subproject commit 9251d3d5535d9ceff6d4d36e3f203a190e9f708c +Subproject commit b4a7bd80a9dd34a9e4fe37fc623f0c33e6e23880